diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-10-28 16:52:59 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-10-28 16:52:59 -0700 |
| commit | 22d2e7911d832213b61eed8ce7d72e2bac5011e2 (patch) | |
| tree | 9a8efd6989bd128f83a107c44dff765f975faef4 /tests/040-miranda | |
| parent | c00db68d2b255399b71ebbda44ded9d57a8170ee (diff) | |
| download | android_dalvik-22d2e7911d832213b61eed8ce7d72e2bac5011e2.tar.gz android_dalvik-22d2e7911d832213b61eed8ce7d72e2bac5011e2.tar.bz2 android_dalvik-22d2e7911d832213b61eed8ce7d72e2bac5011e2.zip | |
Remove dalvik/tests in favor of art/test which is a superset
Change-Id: Id2c666797ec328c935d637755def2380523583a7
Diffstat (limited to 'tests/040-miranda')
| -rw-r--r-- | tests/040-miranda/expected.txt | 12 | ||||
| -rw-r--r-- | tests/040-miranda/info.txt | 6 | ||||
| -rw-r--r-- | tests/040-miranda/src/Main.java | 27 | ||||
| -rw-r--r-- | tests/040-miranda/src/MirandaAbstract.java | 16 | ||||
| -rw-r--r-- | tests/040-miranda/src/MirandaClass.java | 24 | ||||
| -rw-r--r-- | tests/040-miranda/src/MirandaClass2.java | 9 | ||||
| -rw-r--r-- | tests/040-miranda/src/MirandaInterface.java | 10 | ||||
| -rw-r--r-- | tests/040-miranda/src/MirandaInterface2.java | 12 |
8 files changed, 0 insertions, 116 deletions
diff --git a/tests/040-miranda/expected.txt b/tests/040-miranda/expected.txt deleted file mode 100644 index e22bbd974..000000000 --- a/tests/040-miranda/expected.txt +++ /dev/null @@ -1,12 +0,0 @@ -MirandaClass: - inInterface: true - inInterface2: 27 - inAbstract: false -MirandaAbstract / MirandaClass: - inInterface: true - inInterface2: 27 - inAbstract: false -MirandaAbstract / MirandaClass2: - inInterface: true - inInterface2: 28 - inAbstract: true diff --git a/tests/040-miranda/info.txt b/tests/040-miranda/info.txt deleted file mode 100644 index 08127da23..000000000 --- a/tests/040-miranda/info.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is a miscellaneous test that was imported into the new-at-the-time -runtime test framework. The test is intended to exercise basic features, -and as such cannot be build on top of junit, since failure of such basic -features might disrupt junit. - -TODO: Real description goes here. diff --git a/tests/040-miranda/src/Main.java b/tests/040-miranda/src/Main.java deleted file mode 100644 index 558806ac7..000000000 --- a/tests/040-miranda/src/Main.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2006 The Android Open Source Project - -/** - * Miranda testing. - */ -public class Main { - public static void main(String[] args) { - MirandaClass mir = new MirandaClass(); - System.out.println("MirandaClass:"); - System.out.println(" inInterface: " + mir.inInterface()); - System.out.println(" inInterface2: " + mir.inInterface2()); - System.out.println(" inAbstract: " + mir.inAbstract()); - - /* try again through abstract class; results should be identical */ - MirandaAbstract mira = mir; - System.out.println("MirandaAbstract / MirandaClass:"); - System.out.println(" inInterface: " + mira.inInterface()); - System.out.println(" inInterface2: " + mira.inInterface2()); - System.out.println(" inAbstract: " + mira.inAbstract()); - - MirandaAbstract mira2 = new MirandaClass2(); - System.out.println("MirandaAbstract / MirandaClass2:"); - System.out.println(" inInterface: " + mira2.inInterface()); - System.out.println(" inInterface2: " + mira2.inInterface2()); - System.out.println(" inAbstract: " + mira2.inAbstract()); - } -} diff --git a/tests/040-miranda/src/MirandaAbstract.java b/tests/040-miranda/src/MirandaAbstract.java deleted file mode 100644 index b603ce67a..000000000 --- a/tests/040-miranda/src/MirandaAbstract.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2006 The Android Open Source Project - -/** - * Miranda testing. - */ -public abstract class MirandaAbstract implements MirandaInterface, MirandaInterface2 -{ - protected MirandaAbstract() { } - - //public abstract boolean inInterface(); - //public abstract int inInterface2(); - - public boolean inAbstract() { - return true; - } -} diff --git a/tests/040-miranda/src/MirandaClass.java b/tests/040-miranda/src/MirandaClass.java deleted file mode 100644 index 3bf670464..000000000 --- a/tests/040-miranda/src/MirandaClass.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2006 The Android Open Source Project - -/** - * Miranda testing. - */ -public class MirandaClass extends MirandaAbstract { - - public MirandaClass() {} - - public boolean inInterface() { - //System.out.println(" MirandaClass inInterface"); - return true; - } - - public int inInterface2() { - //System.out.println(" MirandaClass inInterface2"); - return 27; - } - - public boolean inAbstract() { - //System.out.println(" MirandaClass inAbstract"); - return false; - } -} diff --git a/tests/040-miranda/src/MirandaClass2.java b/tests/040-miranda/src/MirandaClass2.java deleted file mode 100644 index e9bdf2b9a..000000000 --- a/tests/040-miranda/src/MirandaClass2.java +++ /dev/null @@ -1,9 +0,0 @@ -class MirandaClass2 extends MirandaAbstract { - public boolean inInterface() { - return true; - } - - public int inInterface2() { - return 28; - } -} diff --git a/tests/040-miranda/src/MirandaInterface.java b/tests/040-miranda/src/MirandaInterface.java deleted file mode 100644 index 2c0a59a77..000000000 --- a/tests/040-miranda/src/MirandaInterface.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2006 The Android Open Source Project - -/** - * Miranda testing. - */ -public interface MirandaInterface { - - public boolean inInterface(); - -} diff --git a/tests/040-miranda/src/MirandaInterface2.java b/tests/040-miranda/src/MirandaInterface2.java deleted file mode 100644 index 83b6af80f..000000000 --- a/tests/040-miranda/src/MirandaInterface2.java +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2006 The Android Open Source Project - -/** - * Miranda testing. - */ -public interface MirandaInterface2 { - - public boolean inInterface(); - - public int inInterface2(); - -} |
