OSDN Git Service

Remove dx's copy of JUnit.
authorJesse Wilson <jessewilson@google.com>
Fri, 9 Dec 2011 19:33:21 +0000 (14:33 -0500)
committerJesse Wilson <jessewilson@google.com>
Fri, 9 Dec 2011 19:38:00 +0000 (14:38 -0500)
commit4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba
tree0e3e558fbb0be5a50885a8256dca4451d7455ee2
parent541a4c1b24ebd73e2ecd5f3e010ac4a902a7661b
Remove dx's copy of JUnit.

Instead, use JUnit the same way other code uses JUnit: by depending
on the copy in external. There is no longer a top-level option in
dx to run JUnit tests on itself.

There are two failing tests in dx/junit-tests. Both of these are in
the recently created DexGeneratorTest; I intend to fix these in another
change.

Bug: http://b/2286423
Change-Id: I3a173a0302c7ccc81be3b5a2a4d766000d1c242b
42 files changed:
dx/Android.mk
dx/junit-tests/Android.mk [new file with mode: 0644]
dx/junit-tests/com/android/dx/gen/TypeTest.java
dx/junit-tests/com/android/dx/util/BitIntSetTest.java [moved from dx/src/com/android/dx/util/_tests/_BitIntSet.java with 96% similarity]
dx/junit-tests/com/android/dx/util/BitsTest.java [moved from dx/src/com/android/dx/util/_tests/_Bits.java with 98% similarity]
dx/junit-tests/com/android/dx/util/IntListTest.java [moved from dx/src/com/android/dx/util/_tests/_IntList.java with 88% similarity]
dx/junit-tests/com/android/dx/util/ListIntSetTest.java [moved from dx/src/com/android/dx/util/_tests/_ListIntSet.java with 95% similarity]
dx/src/com/android/dx/command/Main.java
dx/src/com/android/dx/ssa/_tests/_DomFront.java [deleted file]
dx/src/junit/extensions/ActiveTestSuite.java [deleted file]
dx/src/junit/extensions/ExceptionTestCase.java [deleted file]
dx/src/junit/extensions/RepeatedTest.java [deleted file]
dx/src/junit/extensions/TestDecorator.java [deleted file]
dx/src/junit/extensions/TestSetup.java [deleted file]
dx/src/junit/framework/Assert.java [deleted file]
dx/src/junit/framework/AssertionFailedError.java [deleted file]
dx/src/junit/framework/ComparisonFailure.java [deleted file]
dx/src/junit/framework/Protectable.java [deleted file]
dx/src/junit/framework/Test.java [deleted file]
dx/src/junit/framework/TestCase.java [deleted file]
dx/src/junit/framework/TestFailure.java [deleted file]
dx/src/junit/framework/TestListener.java [deleted file]
dx/src/junit/framework/TestResult.java [deleted file]
dx/src/junit/framework/TestSuite.java [deleted file]
dx/src/junit/runner/BaseTestRunner.java [deleted file]
dx/src/junit/runner/ClassPathTestCollector.java [deleted file]
dx/src/junit/runner/FailureDetailView.java [deleted file]
dx/src/junit/runner/LoadingTestCollector.java [deleted file]
dx/src/junit/runner/ReloadingTestSuiteLoader.java [deleted file]
dx/src/junit/runner/SimpleTestCollector.java [deleted file]
dx/src/junit/runner/Sorter.java [deleted file]
dx/src/junit/runner/StandardTestSuiteLoader.java [deleted file]
dx/src/junit/runner/TestCaseClassLoader.java [deleted file]
dx/src/junit/runner/TestCollector.java [deleted file]
dx/src/junit/runner/TestRunListener.java [deleted file]
dx/src/junit/runner/TestSuiteLoader.java [deleted file]
dx/src/junit/runner/Version.java [deleted file]
dx/src/junit/runner/excluded.properties [deleted file]
dx/src/junit/runner/logo.gif [deleted file]
dx/src/junit/runner/smalllogo.gif [deleted file]
dx/src/junit/textui/ResultPrinter.java [deleted file]
dx/src/junit/textui/TestRunner.java [deleted file]