aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk6
-rw-r--r--src/main/java/junit/extensions/ActiveTestSuite.java (renamed from src/junit/extensions/ActiveTestSuite.java)0
-rw-r--r--src/main/java/junit/extensions/RepeatedTest.java (renamed from src/junit/extensions/RepeatedTest.java)0
-rw-r--r--src/main/java/junit/extensions/TestDecorator.java (renamed from src/junit/extensions/TestDecorator.java)0
-rw-r--r--src/main/java/junit/extensions/TestSetup.java (renamed from src/junit/extensions/TestSetup.java)0
-rw-r--r--src/main/java/junit/extensions/package-info.java (renamed from src/junit/extensions/package-info.java)0
-rw-r--r--src/main/java/junit/framework/Assert.java (renamed from src/junit/framework/Assert.java)0
-rw-r--r--src/main/java/junit/framework/AssertionFailedError.java (renamed from src/junit/framework/AssertionFailedError.java)0
-rw-r--r--src/main/java/junit/framework/ComparisonCompactor.java (renamed from src/junit/framework/ComparisonCompactor.java)0
-rw-r--r--src/main/java/junit/framework/ComparisonFailure.java (renamed from src/junit/framework/ComparisonFailure.java)0
-rw-r--r--src/main/java/junit/framework/JUnit4TestAdapter.java (renamed from src/junit/framework/JUnit4TestAdapter.java)0
-rw-r--r--src/main/java/junit/framework/JUnit4TestAdapterCache.java (renamed from src/junit/framework/JUnit4TestAdapterCache.java)0
-rw-r--r--src/main/java/junit/framework/JUnit4TestCaseFacade.java (renamed from src/junit/framework/JUnit4TestCaseFacade.java)0
-rw-r--r--src/main/java/junit/framework/Protectable.java (renamed from src/junit/framework/Protectable.java)0
-rw-r--r--src/main/java/junit/framework/Test.java (renamed from src/junit/framework/Test.java)0
-rw-r--r--src/main/java/junit/framework/TestCase.java (renamed from src/junit/framework/TestCase.java)0
-rw-r--r--src/main/java/junit/framework/TestFailure.java (renamed from src/junit/framework/TestFailure.java)0
-rw-r--r--src/main/java/junit/framework/TestListener.java (renamed from src/junit/framework/TestListener.java)0
-rw-r--r--src/main/java/junit/framework/TestResult.java (renamed from src/junit/framework/TestResult.java)0
-rw-r--r--src/main/java/junit/framework/TestSuite.java (renamed from src/junit/framework/TestSuite.java)0
-rw-r--r--src/main/java/junit/framework/package-info.java (renamed from src/junit/framework/package-info.java)0
-rw-r--r--src/main/java/junit/runner/BaseTestRunner.java (renamed from src/junit/runner/BaseTestRunner.java)0
-rw-r--r--src/main/java/junit/runner/TestRunListener.java (renamed from src/junit/runner/TestRunListener.java)0
-rw-r--r--src/main/java/junit/runner/Version.java (renamed from src/junit/runner/Version.java)0
-rw-r--r--src/main/java/junit/runner/Version.java.template (renamed from src/junit/runner/Version.java.template)0
-rw-r--r--src/main/java/junit/runner/logo.gif (renamed from src/junit/runner/logo.gif)bin964 -> 964 bytes
-rw-r--r--src/main/java/junit/runner/package-info.java (renamed from src/junit/runner/package-info.java)0
-rw-r--r--src/main/java/junit/runner/smalllogo.gif (renamed from src/junit/runner/smalllogo.gif)bin883 -> 883 bytes
-rw-r--r--src/main/java/junit/textui/ResultPrinter.java (renamed from src/junit/textui/ResultPrinter.java)0
-rw-r--r--src/main/java/junit/textui/TestRunner.java (renamed from src/junit/textui/TestRunner.java)0
-rw-r--r--src/main/java/junit/textui/package-info.java (renamed from src/junit/textui/package-info.java)0
-rw-r--r--src/main/java/org/junit/After.java (renamed from src/org/junit/After.java)0
-rw-r--r--src/main/java/org/junit/AfterClass.java (renamed from src/org/junit/AfterClass.java)0
-rw-r--r--src/main/java/org/junit/Assert.java (renamed from src/org/junit/Assert.java)0
-rw-r--r--src/main/java/org/junit/Assume.java (renamed from src/org/junit/Assume.java)0
-rw-r--r--src/main/java/org/junit/Before.java (renamed from src/org/junit/Before.java)0
-rw-r--r--src/main/java/org/junit/BeforeClass.java (renamed from src/org/junit/BeforeClass.java)0
-rw-r--r--src/main/java/org/junit/ClassRule.java (renamed from src/org/junit/ClassRule.java)0
-rw-r--r--src/main/java/org/junit/ComparisonFailure.java (renamed from src/org/junit/ComparisonFailure.java)0
-rw-r--r--src/main/java/org/junit/Ignore.java (renamed from src/org/junit/Ignore.java)0
-rw-r--r--src/main/java/org/junit/Rule.java (renamed from src/org/junit/Rule.java)0
-rw-r--r--src/main/java/org/junit/Test.java (renamed from src/org/junit/Test.java)0
-rw-r--r--src/main/java/org/junit/experimental/ParallelComputer.java (renamed from src/org/junit/experimental/ParallelComputer.java)0
-rw-r--r--src/main/java/org/junit/experimental/categories/Categories.java (renamed from src/org/junit/experimental/categories/Categories.java)0
-rw-r--r--src/main/java/org/junit/experimental/categories/Category.java (renamed from src/org/junit/experimental/categories/Category.java)0
-rw-r--r--src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java (renamed from src/org/junit/experimental/max/CouldNotReadCoreException.java)0
-rw-r--r--src/main/java/org/junit/experimental/max/MaxCore.java (renamed from src/org/junit/experimental/max/MaxCore.java)0
-rw-r--r--src/main/java/org/junit/experimental/max/MaxHistory.java (renamed from src/org/junit/experimental/max/MaxHistory.java)0
-rw-r--r--src/main/java/org/junit/experimental/results/FailureList.java (renamed from src/org/junit/experimental/results/FailureList.java)0
-rw-r--r--src/main/java/org/junit/experimental/results/PrintableResult.java (renamed from src/org/junit/experimental/results/PrintableResult.java)0
-rw-r--r--src/main/java/org/junit/experimental/results/ResultMatchers.java (renamed from src/org/junit/experimental/results/ResultMatchers.java)0
-rw-r--r--src/main/java/org/junit/experimental/runners/Enclosed.java (renamed from src/org/junit/experimental/runners/Enclosed.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/DataPoint.java (renamed from src/org/junit/experimental/theories/DataPoint.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/DataPoints.java (renamed from src/org/junit/experimental/theories/DataPoints.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/ParameterSignature.java (renamed from src/org/junit/experimental/theories/ParameterSignature.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/ParameterSupplier.java (renamed from src/org/junit/experimental/theories/ParameterSupplier.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java (renamed from src/org/junit/experimental/theories/ParametersSuppliedBy.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/PotentialAssignment.java (renamed from src/org/junit/experimental/theories/PotentialAssignment.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/Theories.java (renamed from src/org/junit/experimental/theories/Theories.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/Theory.java (renamed from src/org/junit/experimental/theories/Theory.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java (renamed from src/org/junit/experimental/theories/internal/AllMembersSupplier.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/internal/Assignments.java (renamed from src/org/junit/experimental/theories/internal/Assignments.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java (renamed from src/org/junit/experimental/theories/internal/ParameterizedAssertionError.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java (renamed from src/org/junit/experimental/theories/suppliers/TestedOn.java)0
-rw-r--r--src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java (renamed from src/org/junit/experimental/theories/suppliers/TestedOnSupplier.java)0
-rw-r--r--src/main/java/org/junit/internal/ArrayComparisonFailure.java (renamed from src/org/junit/internal/ArrayComparisonFailure.java)0
-rw-r--r--src/main/java/org/junit/internal/AssumptionViolatedException.java (renamed from src/org/junit/internal/AssumptionViolatedException.java)0
-rw-r--r--src/main/java/org/junit/internal/ComparisonCriteria.java (renamed from src/org/junit/internal/ComparisonCriteria.java)0
-rw-r--r--src/main/java/org/junit/internal/ExactComparisonCriteria.java (renamed from src/org/junit/internal/ExactComparisonCriteria.java)0
-rw-r--r--src/main/java/org/junit/internal/InexactComparisonCriteria.java (renamed from src/org/junit/internal/InexactComparisonCriteria.java)0
-rw-r--r--src/main/java/org/junit/internal/JUnitSystem.java (renamed from src/org/junit/internal/JUnitSystem.java)0
-rw-r--r--src/main/java/org/junit/internal/RealSystem.java (renamed from src/org/junit/internal/RealSystem.java)0
-rw-r--r--src/main/java/org/junit/internal/TextListener.java (renamed from src/org/junit/internal/TextListener.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java (renamed from src/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/AnnotatedBuilder.java (renamed from src/org/junit/internal/builders/AnnotatedBuilder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/IgnoredBuilder.java (renamed from src/org/junit/internal/builders/IgnoredBuilder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/IgnoredClassRunner.java (renamed from src/org/junit/internal/builders/IgnoredClassRunner.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/JUnit3Builder.java (renamed from src/org/junit/internal/builders/JUnit3Builder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/JUnit4Builder.java (renamed from src/org/junit/internal/builders/JUnit4Builder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/NullBuilder.java (renamed from src/org/junit/internal/builders/NullBuilder.java)0
-rw-r--r--src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java (renamed from src/org/junit/internal/builders/SuiteMethodBuilder.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/CombinableMatcher.java (renamed from src/org/junit/internal/matchers/CombinableMatcher.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/Each.java (renamed from src/org/junit/internal/matchers/Each.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/IsCollectionContaining.java (renamed from src/org/junit/internal/matchers/IsCollectionContaining.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/StringContains.java (renamed from src/org/junit/internal/matchers/StringContains.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/SubstringMatcher.java (renamed from src/org/junit/internal/matchers/SubstringMatcher.java)0
-rw-r--r--src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java (renamed from src/org/junit/internal/matchers/TypeSafeMatcher.java)0
-rw-r--r--src/main/java/org/junit/internal/requests/ClassRequest.java (renamed from src/org/junit/internal/requests/ClassRequest.java)0
-rw-r--r--src/main/java/org/junit/internal/requests/FilterRequest.java (renamed from src/org/junit/internal/requests/FilterRequest.java)0
-rw-r--r--src/main/java/org/junit/internal/requests/SortingRequest.java (renamed from src/org/junit/internal/requests/SortingRequest.java)0
-rw-r--r--src/main/java/org/junit/internal/requests/package-info.java (renamed from src/org/junit/internal/requests/package-info.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/ClassRoadie.java (renamed from src/org/junit/internal/runners/ClassRoadie.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/ErrorReportingRunner.java (renamed from src/org/junit/internal/runners/ErrorReportingRunner.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/FailedBefore.java (renamed from src/org/junit/internal/runners/FailedBefore.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/InitializationError.java (renamed from src/org/junit/internal/runners/InitializationError.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java (renamed from src/org/junit/internal/runners/JUnit38ClassRunner.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/JUnit4ClassRunner.java (renamed from src/org/junit/internal/runners/JUnit4ClassRunner.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/MethodRoadie.java (renamed from src/org/junit/internal/runners/MethodRoadie.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/MethodValidator.java (renamed from src/org/junit/internal/runners/MethodValidator.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/SuiteMethod.java (renamed from src/org/junit/internal/runners/SuiteMethod.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/TestClass.java (renamed from src/org/junit/internal/runners/TestClass.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/TestMethod.java (renamed from src/org/junit/internal/runners/TestMethod.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/model/EachTestNotifier.java (renamed from src/org/junit/internal/runners/model/EachTestNotifier.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/model/MultipleFailureException.java (renamed from src/org/junit/internal/runners/model/MultipleFailureException.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java (renamed from src/org/junit/internal/runners/model/ReflectiveCallable.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/package-info.java (renamed from src/org/junit/internal/runners/package-info.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java (renamed from src/org/junit/internal/runners/rules/RuleFieldValidator.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/ExpectException.java (renamed from src/org/junit/internal/runners/statements/ExpectException.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/Fail.java (renamed from src/org/junit/internal/runners/statements/Fail.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java (renamed from src/org/junit/internal/runners/statements/FailOnTimeout.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/InvokeMethod.java (renamed from src/org/junit/internal/runners/statements/InvokeMethod.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/RunAfters.java (renamed from src/org/junit/internal/runners/statements/RunAfters.java)0
-rw-r--r--src/main/java/org/junit/internal/runners/statements/RunBefores.java (renamed from src/org/junit/internal/runners/statements/RunBefores.java)0
-rw-r--r--src/main/java/org/junit/matchers/JUnitMatchers.java (renamed from src/org/junit/matchers/JUnitMatchers.java)0
-rw-r--r--src/main/java/org/junit/matchers/package-info.java (renamed from src/org/junit/matchers/package-info.java)0
-rw-r--r--src/main/java/org/junit/package-info.java (renamed from src/org/junit/package-info.java)0
-rw-r--r--src/main/java/org/junit/rules/ErrorCollector.java (renamed from src/org/junit/rules/ErrorCollector.java)0
-rw-r--r--src/main/java/org/junit/rules/ExpectedException.java (renamed from src/org/junit/rules/ExpectedException.java)0
-rw-r--r--src/main/java/org/junit/rules/ExternalResource.java (renamed from src/org/junit/rules/ExternalResource.java)0
-rw-r--r--src/main/java/org/junit/rules/MethodRule.java (renamed from src/org/junit/rules/MethodRule.java)0
-rw-r--r--src/main/java/org/junit/rules/RuleChain.java (renamed from src/org/junit/rules/RuleChain.java)0
-rw-r--r--src/main/java/org/junit/rules/RunRules.java (renamed from src/org/junit/rules/RunRules.java)0
-rw-r--r--src/main/java/org/junit/rules/TemporaryFolder.java (renamed from src/org/junit/rules/TemporaryFolder.java)0
-rw-r--r--src/main/java/org/junit/rules/TestName.java (renamed from src/org/junit/rules/TestName.java)0
-rw-r--r--src/main/java/org/junit/rules/TestRule.java (renamed from src/org/junit/rules/TestRule.java)0
-rw-r--r--src/main/java/org/junit/rules/TestWatcher.java (renamed from src/org/junit/rules/TestWatcher.java)0
-rw-r--r--src/main/java/org/junit/rules/TestWatchman.java (renamed from src/org/junit/rules/TestWatchman.java)0
-rw-r--r--src/main/java/org/junit/rules/Timeout.java (renamed from src/org/junit/rules/Timeout.java)0
-rw-r--r--src/main/java/org/junit/rules/Verifier.java (renamed from src/org/junit/rules/Verifier.java)0
-rw-r--r--src/main/java/org/junit/runner/Computer.java (renamed from src/org/junit/runner/Computer.java)0
-rw-r--r--src/main/java/org/junit/runner/Describable.java (renamed from src/org/junit/runner/Describable.java)0
-rw-r--r--src/main/java/org/junit/runner/Description.java (renamed from src/org/junit/runner/Description.java)0
-rw-r--r--src/main/java/org/junit/runner/JUnitCore.java (renamed from src/org/junit/runner/JUnitCore.java)0
-rw-r--r--src/main/java/org/junit/runner/Request.java (renamed from src/org/junit/runner/Request.java)0
-rw-r--r--src/main/java/org/junit/runner/Result.java (renamed from src/org/junit/runner/Result.java)0
-rw-r--r--src/main/java/org/junit/runner/RunWith.java (renamed from src/org/junit/runner/RunWith.java)0
-rw-r--r--src/main/java/org/junit/runner/Runner.java (renamed from src/org/junit/runner/Runner.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/Filter.java (renamed from src/org/junit/runner/manipulation/Filter.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/Filterable.java (renamed from src/org/junit/runner/manipulation/Filterable.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/NoTestsRemainException.java (renamed from src/org/junit/runner/manipulation/NoTestsRemainException.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/Sortable.java (renamed from src/org/junit/runner/manipulation/Sortable.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/Sorter.java (renamed from src/org/junit/runner/manipulation/Sorter.java)0
-rw-r--r--src/main/java/org/junit/runner/manipulation/package-info.java (renamed from src/org/junit/runner/manipulation/package-info.java)0
-rw-r--r--src/main/java/org/junit/runner/notification/Failure.java (renamed from src/org/junit/runner/notification/Failure.java)0
-rw-r--r--src/main/java/org/junit/runner/notification/RunListener.java (renamed from src/org/junit/runner/notification/RunListener.java)0
-rw-r--r--src/main/java/org/junit/runner/notification/RunNotifier.java (renamed from src/org/junit/runner/notification/RunNotifier.java)0
-rw-r--r--src/main/java/org/junit/runner/notification/StoppedByUserException.java (renamed from src/org/junit/runner/notification/StoppedByUserException.java)0
-rw-r--r--src/main/java/org/junit/runner/notification/package-info.java (renamed from src/org/junit/runner/notification/package-info.java)0
-rw-r--r--src/main/java/org/junit/runner/package-info.java (renamed from src/org/junit/runner/package-info.java)0
-rw-r--r--src/main/java/org/junit/runners/AllTests.java (renamed from src/org/junit/runners/AllTests.java)0
-rw-r--r--src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (renamed from src/org/junit/runners/BlockJUnit4ClassRunner.java)0
-rw-r--r--src/main/java/org/junit/runners/JUnit4.java (renamed from src/org/junit/runners/JUnit4.java)0
-rw-r--r--src/main/java/org/junit/runners/Parameterized.java (renamed from src/org/junit/runners/Parameterized.java)0
-rw-r--r--src/main/java/org/junit/runners/ParentRunner.java (renamed from src/org/junit/runners/ParentRunner.java)0
-rw-r--r--src/main/java/org/junit/runners/Suite.java (renamed from src/org/junit/runners/Suite.java)0
-rw-r--r--src/main/java/org/junit/runners/model/FrameworkField.java (renamed from src/org/junit/runners/model/FrameworkField.java)0
-rw-r--r--src/main/java/org/junit/runners/model/FrameworkMember.java (renamed from src/org/junit/runners/model/FrameworkMember.java)0
-rw-r--r--src/main/java/org/junit/runners/model/FrameworkMethod.java (renamed from src/org/junit/runners/model/FrameworkMethod.java)0
-rw-r--r--src/main/java/org/junit/runners/model/InitializationError.java (renamed from src/org/junit/runners/model/InitializationError.java)0
-rw-r--r--src/main/java/org/junit/runners/model/MultipleFailureException.java (renamed from src/org/junit/runners/model/MultipleFailureException.java)0
-rw-r--r--src/main/java/org/junit/runners/model/NoGenericTypeParametersValidator.java (renamed from src/org/junit/runners/model/NoGenericTypeParametersValidator.java)0
-rw-r--r--src/main/java/org/junit/runners/model/RunnerBuilder.java (renamed from src/org/junit/runners/model/RunnerBuilder.java)0
-rw-r--r--src/main/java/org/junit/runners/model/RunnerScheduler.java (renamed from src/org/junit/runners/model/RunnerScheduler.java)0
-rw-r--r--src/main/java/org/junit/runners/model/Statement.java (renamed from src/org/junit/runners/model/Statement.java)0
-rw-r--r--src/main/java/org/junit/runners/model/TestClass.java (renamed from src/org/junit/runners/model/TestClass.java)0
-rw-r--r--src/main/java/org/junit/runners/package-info.java (renamed from src/org/junit/runners/package-info.java)0
166 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 043a8ba..1ecb3e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
# build a junit jar
# ----------------------
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := 25
@@ -33,7 +33,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
# ----------------------
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit-host
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host
@@ -45,7 +45,7 @@ include $(BUILD_HOST_JAVA_LIBRARY)
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit-hostdex
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
diff --git a/src/junit/extensions/ActiveTestSuite.java b/src/main/java/junit/extensions/ActiveTestSuite.java
index 0623565..0623565 100644
--- a/src/junit/extensions/ActiveTestSuite.java
+++ b/src/main/java/junit/extensions/ActiveTestSuite.java
diff --git a/src/junit/extensions/RepeatedTest.java b/src/main/java/junit/extensions/RepeatedTest.java
index 3b687a5..3b687a5 100644
--- a/src/junit/extensions/RepeatedTest.java
+++ b/src/main/java/junit/extensions/RepeatedTest.java
diff --git a/src/junit/extensions/TestDecorator.java b/src/main/java/junit/extensions/TestDecorator.java
index d9ae474..d9ae474 100644
--- a/src/junit/extensions/TestDecorator.java
+++ b/src/main/java/junit/extensions/TestDecorator.java
diff --git a/src/junit/extensions/TestSetup.java b/src/main/java/junit/extensions/TestSetup.java
index 00dcd21..00dcd21 100644
--- a/src/junit/extensions/TestSetup.java
+++ b/src/main/java/junit/extensions/TestSetup.java
diff --git a/src/junit/extensions/package-info.java b/src/main/java/junit/extensions/package-info.java
index a1c5bb4..a1c5bb4 100644
--- a/src/junit/extensions/package-info.java
+++ b/src/main/java/junit/extensions/package-info.java
diff --git a/src/junit/framework/Assert.java b/src/main/java/junit/framework/Assert.java
index 3dcc23d..3dcc23d 100644
--- a/src/junit/framework/Assert.java
+++ b/src/main/java/junit/framework/Assert.java
diff --git a/src/junit/framework/AssertionFailedError.java b/src/main/java/junit/framework/AssertionFailedError.java
index 0d7802c..0d7802c 100644
--- a/src/junit/framework/AssertionFailedError.java
+++ b/src/main/java/junit/framework/AssertionFailedError.java
diff --git a/src/junit/framework/ComparisonCompactor.java b/src/main/java/junit/framework/ComparisonCompactor.java
index bbc3ba1..bbc3ba1 100644
--- a/src/junit/framework/ComparisonCompactor.java
+++ b/src/main/java/junit/framework/ComparisonCompactor.java
diff --git a/src/junit/framework/ComparisonFailure.java b/src/main/java/junit/framework/ComparisonFailure.java
index 5077993..5077993 100644
--- a/src/junit/framework/ComparisonFailure.java
+++ b/src/main/java/junit/framework/ComparisonFailure.java
diff --git a/src/junit/framework/JUnit4TestAdapter.java b/src/main/java/junit/framework/JUnit4TestAdapter.java
index a05a313..a05a313 100644
--- a/src/junit/framework/JUnit4TestAdapter.java
+++ b/src/main/java/junit/framework/JUnit4TestAdapter.java
diff --git a/src/junit/framework/JUnit4TestAdapterCache.java b/src/main/java/junit/framework/JUnit4TestAdapterCache.java
index 26175c5..26175c5 100644
--- a/src/junit/framework/JUnit4TestAdapterCache.java
+++ b/src/main/java/junit/framework/JUnit4TestAdapterCache.java
diff --git a/src/junit/framework/JUnit4TestCaseFacade.java b/src/main/java/junit/framework/JUnit4TestCaseFacade.java
index fd43822..fd43822 100644
--- a/src/junit/framework/JUnit4TestCaseFacade.java
+++ b/src/main/java/junit/framework/JUnit4TestCaseFacade.java
diff --git a/src/junit/framework/Protectable.java b/src/main/java/junit/framework/Protectable.java
index e143237..e143237 100644
--- a/src/junit/framework/Protectable.java
+++ b/src/main/java/junit/framework/Protectable.java
diff --git a/src/junit/framework/Test.java b/src/main/java/junit/framework/Test.java
index a016ee8..a016ee8 100644
--- a/src/junit/framework/Test.java
+++ b/src/main/java/junit/framework/Test.java
diff --git a/src/junit/framework/TestCase.java b/src/main/java/junit/framework/TestCase.java
index b047ec9..b047ec9 100644
--- a/src/junit/framework/TestCase.java
+++ b/src/main/java/junit/framework/TestCase.java
diff --git a/src/junit/framework/TestFailure.java b/src/main/java/junit/framework/TestFailure.java
index 6662b1f..6662b1f 100644
--- a/src/junit/framework/TestFailure.java
+++ b/src/main/java/junit/framework/TestFailure.java
diff --git a/src/junit/framework/TestListener.java b/src/main/java/junit/framework/TestListener.java
index 9b69443..9b69443 100644
--- a/src/junit/framework/TestListener.java
+++ b/src/main/java/junit/framework/TestListener.java
diff --git a/src/junit/framework/TestResult.java b/src/main/java/junit/framework/TestResult.java
index 5768e9a..5768e9a 100644
--- a/src/junit/framework/TestResult.java
+++ b/src/main/java/junit/framework/TestResult.java
diff --git a/src/junit/framework/TestSuite.java b/src/main/java/junit/framework/TestSuite.java
index 336efd1..336efd1 100644
--- a/src/junit/framework/TestSuite.java
+++ b/src/main/java/junit/framework/TestSuite.java
diff --git a/src/junit/framework/package-info.java b/src/main/java/junit/framework/package-info.java
index 153a1c8..153a1c8 100644
--- a/src/junit/framework/package-info.java
+++ b/src/main/java/junit/framework/package-info.java
diff --git a/src/junit/runner/BaseTestRunner.java b/src/main/java/junit/runner/BaseTestRunner.java
index 6a4b090..6a4b090 100644
--- a/src/junit/runner/BaseTestRunner.java
+++ b/src/main/java/junit/runner/BaseTestRunner.java
diff --git a/src/junit/runner/TestRunListener.java b/src/main/java/junit/runner/TestRunListener.java
index b11ef07..b11ef07 100644
--- a/src/junit/runner/TestRunListener.java
+++ b/src/main/java/junit/runner/TestRunListener.java
diff --git a/src/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
index 21aabfa..21aabfa 100644
--- a/src/junit/runner/Version.java
+++ b/src/main/java/junit/runner/Version.java
diff --git a/src/junit/runner/Version.java.template b/src/main/java/junit/runner/Version.java.template
index 3182cfd..3182cfd 100644
--- a/src/junit/runner/Version.java.template
+++ b/src/main/java/junit/runner/Version.java.template
diff --git a/src/junit/runner/logo.gif b/src/main/java/junit/runner/logo.gif
index d0e1547..d0e1547 100644
--- a/src/junit/runner/logo.gif
+++ b/src/main/java/junit/runner/logo.gif
Binary files differ
diff --git a/src/junit/runner/package-info.java b/src/main/java/junit/runner/package-info.java
index b746185..b746185 100644
--- a/src/junit/runner/package-info.java
+++ b/src/main/java/junit/runner/package-info.java
diff --git a/src/junit/runner/smalllogo.gif b/src/main/java/junit/runner/smalllogo.gif
index 7b25eaf..7b25eaf 100644
--- a/src/junit/runner/smalllogo.gif
+++ b/src/main/java/junit/runner/smalllogo.gif
Binary files differ
diff --git a/src/junit/textui/ResultPrinter.java b/src/main/java/junit/textui/ResultPrinter.java
index f2f01f5..f2f01f5 100644
--- a/src/junit/textui/ResultPrinter.java
+++ b/src/main/java/junit/textui/ResultPrinter.java
diff --git a/src/junit/textui/TestRunner.java b/src/main/java/junit/textui/TestRunner.java
index 046448e..046448e 100644
--- a/src/junit/textui/TestRunner.java
+++ b/src/main/java/junit/textui/TestRunner.java
diff --git a/src/junit/textui/package-info.java b/src/main/java/junit/textui/package-info.java
index 2aa5176..2aa5176 100644
--- a/src/junit/textui/package-info.java
+++ b/src/main/java/junit/textui/package-info.java
diff --git a/src/org/junit/After.java b/src/main/java/org/junit/After.java
index 39aa6e5..39aa6e5 100644
--- a/src/org/junit/After.java
+++ b/src/main/java/org/junit/After.java
diff --git a/src/org/junit/AfterClass.java b/src/main/java/org/junit/AfterClass.java
index 2d6bc80..2d6bc80 100644
--- a/src/org/junit/AfterClass.java
+++ b/src/main/java/org/junit/AfterClass.java
diff --git a/src/org/junit/Assert.java b/src/main/java/org/junit/Assert.java
index b585b87..b585b87 100644
--- a/src/org/junit/Assert.java
+++ b/src/main/java/org/junit/Assert.java
diff --git a/src/org/junit/Assume.java b/src/main/java/org/junit/Assume.java
index 7b6c21a..7b6c21a 100644
--- a/src/org/junit/Assume.java
+++ b/src/main/java/org/junit/Assume.java
diff --git a/src/org/junit/Before.java b/src/main/java/org/junit/Before.java
index 66b34ee..66b34ee 100644
--- a/src/org/junit/Before.java
+++ b/src/main/java/org/junit/Before.java
diff --git a/src/org/junit/BeforeClass.java b/src/main/java/org/junit/BeforeClass.java
index 35b7854..35b7854 100644
--- a/src/org/junit/BeforeClass.java
+++ b/src/main/java/org/junit/BeforeClass.java
diff --git a/src/org/junit/ClassRule.java b/src/main/java/org/junit/ClassRule.java
index 97a111f..97a111f 100644
--- a/src/org/junit/ClassRule.java
+++ b/src/main/java/org/junit/ClassRule.java
diff --git a/src/org/junit/ComparisonFailure.java b/src/main/java/org/junit/ComparisonFailure.java
index d37db4f..d37db4f 100644
--- a/src/org/junit/ComparisonFailure.java
+++ b/src/main/java/org/junit/ComparisonFailure.java
diff --git a/src/org/junit/Ignore.java b/src/main/java/org/junit/Ignore.java
index de530a9..de530a9 100644
--- a/src/org/junit/Ignore.java
+++ b/src/main/java/org/junit/Ignore.java
diff --git a/src/org/junit/Rule.java b/src/main/java/org/junit/Rule.java
index 9e67c07..9e67c07 100644
--- a/src/org/junit/Rule.java
+++ b/src/main/java/org/junit/Rule.java
diff --git a/src/org/junit/Test.java b/src/main/java/org/junit/Test.java
index 23dc78a..23dc78a 100644
--- a/src/org/junit/Test.java
+++ b/src/main/java/org/junit/Test.java
diff --git a/src/org/junit/experimental/ParallelComputer.java b/src/main/java/org/junit/experimental/ParallelComputer.java
index fccb97c..fccb97c 100644
--- a/src/org/junit/experimental/ParallelComputer.java
+++ b/src/main/java/org/junit/experimental/ParallelComputer.java
diff --git a/src/org/junit/experimental/categories/Categories.java b/src/main/java/org/junit/experimental/categories/Categories.java
index d57b4d3..d57b4d3 100644
--- a/src/org/junit/experimental/categories/Categories.java
+++ b/src/main/java/org/junit/experimental/categories/Categories.java
diff --git a/src/org/junit/experimental/categories/Category.java b/src/main/java/org/junit/experimental/categories/Category.java
index 3a4c0b9..3a4c0b9 100644
--- a/src/org/junit/experimental/categories/Category.java
+++ b/src/main/java/org/junit/experimental/categories/Category.java
diff --git a/src/org/junit/experimental/max/CouldNotReadCoreException.java b/src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java
index 03c3c8c..03c3c8c 100644
--- a/src/org/junit/experimental/max/CouldNotReadCoreException.java
+++ b/src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java
diff --git a/src/org/junit/experimental/max/MaxCore.java b/src/main/java/org/junit/experimental/max/MaxCore.java
index a2a34a9..a2a34a9 100644
--- a/src/org/junit/experimental/max/MaxCore.java
+++ b/src/main/java/org/junit/experimental/max/MaxCore.java
diff --git a/src/org/junit/experimental/max/MaxHistory.java b/src/main/java/org/junit/experimental/max/MaxHistory.java
index e091793..e091793 100644
--- a/src/org/junit/experimental/max/MaxHistory.java
+++ b/src/main/java/org/junit/experimental/max/MaxHistory.java
diff --git a/src/org/junit/experimental/results/FailureList.java b/src/main/java/org/junit/experimental/results/FailureList.java
index f4bc9b7..f4bc9b7 100644
--- a/src/org/junit/experimental/results/FailureList.java
+++ b/src/main/java/org/junit/experimental/results/FailureList.java
diff --git a/src/org/junit/experimental/results/PrintableResult.java b/src/main/java/org/junit/experimental/results/PrintableResult.java
index 8bc6f54..8bc6f54 100644
--- a/src/org/junit/experimental/results/PrintableResult.java
+++ b/src/main/java/org/junit/experimental/results/PrintableResult.java
diff --git a/src/org/junit/experimental/results/ResultMatchers.java b/src/main/java/org/junit/experimental/results/ResultMatchers.java
index 220d0dc..220d0dc 100644
--- a/src/org/junit/experimental/results/ResultMatchers.java
+++ b/src/main/java/org/junit/experimental/results/ResultMatchers.java
diff --git a/src/org/junit/experimental/runners/Enclosed.java b/src/main/java/org/junit/experimental/runners/Enclosed.java
index b0560ed..b0560ed 100644
--- a/src/org/junit/experimental/runners/Enclosed.java
+++ b/src/main/java/org/junit/experimental/runners/Enclosed.java
diff --git a/src/org/junit/experimental/theories/DataPoint.java b/src/main/java/org/junit/experimental/theories/DataPoint.java
index 2aaba6a..2aaba6a 100644
--- a/src/org/junit/experimental/theories/DataPoint.java
+++ b/src/main/java/org/junit/experimental/theories/DataPoint.java
diff --git a/src/org/junit/experimental/theories/DataPoints.java b/src/main/java/org/junit/experimental/theories/DataPoints.java
index 42145e3..42145e3 100644
--- a/src/org/junit/experimental/theories/DataPoints.java
+++ b/src/main/java/org/junit/experimental/theories/DataPoints.java
diff --git a/src/org/junit/experimental/theories/ParameterSignature.java b/src/main/java/org/junit/experimental/theories/ParameterSignature.java
index e7150fc..e7150fc 100644
--- a/src/org/junit/experimental/theories/ParameterSignature.java
+++ b/src/main/java/org/junit/experimental/theories/ParameterSignature.java
diff --git a/src/org/junit/experimental/theories/ParameterSupplier.java b/src/main/java/org/junit/experimental/theories/ParameterSupplier.java
index 9016c91..9016c91 100644
--- a/src/org/junit/experimental/theories/ParameterSupplier.java
+++ b/src/main/java/org/junit/experimental/theories/ParameterSupplier.java
diff --git a/src/org/junit/experimental/theories/ParametersSuppliedBy.java b/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java
index 8f090ef..8f090ef 100644
--- a/src/org/junit/experimental/theories/ParametersSuppliedBy.java
+++ b/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java
diff --git a/src/org/junit/experimental/theories/PotentialAssignment.java b/src/main/java/org/junit/experimental/theories/PotentialAssignment.java
index 0c008d0..0c008d0 100644
--- a/src/org/junit/experimental/theories/PotentialAssignment.java
+++ b/src/main/java/org/junit/experimental/theories/PotentialAssignment.java
diff --git a/src/org/junit/experimental/theories/Theories.java b/src/main/java/org/junit/experimental/theories/Theories.java
index 82ff98b..82ff98b 100644
--- a/src/org/junit/experimental/theories/Theories.java
+++ b/src/main/java/org/junit/experimental/theories/Theories.java
diff --git a/src/org/junit/experimental/theories/Theory.java b/src/main/java/org/junit/experimental/theories/Theory.java
index 134fe9d..134fe9d 100644
--- a/src/org/junit/experimental/theories/Theory.java
+++ b/src/main/java/org/junit/experimental/theories/Theory.java
diff --git a/src/org/junit/experimental/theories/internal/AllMembersSupplier.java b/src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java
index 615cc3e..615cc3e 100644
--- a/src/org/junit/experimental/theories/internal/AllMembersSupplier.java
+++ b/src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java
diff --git a/src/org/junit/experimental/theories/internal/Assignments.java b/src/main/java/org/junit/experimental/theories/internal/Assignments.java
index bd94f00..bd94f00 100644
--- a/src/org/junit/experimental/theories/internal/Assignments.java
+++ b/src/main/java/org/junit/experimental/theories/internal/Assignments.java
diff --git a/src/org/junit/experimental/theories/internal/ParameterizedAssertionError.java b/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
index 285bc3a..285bc3a 100644
--- a/src/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
+++ b/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
diff --git a/src/org/junit/experimental/theories/suppliers/TestedOn.java b/src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java
index d6ede64..d6ede64 100644
--- a/src/org/junit/experimental/theories/suppliers/TestedOn.java
+++ b/src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java
diff --git a/src/org/junit/experimental/theories/suppliers/TestedOnSupplier.java b/src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
index f80298f..f80298f 100644
--- a/src/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
+++ b/src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
diff --git a/src/org/junit/internal/ArrayComparisonFailure.java b/src/main/java/org/junit/internal/ArrayComparisonFailure.java
index 08851de..08851de 100644
--- a/src/org/junit/internal/ArrayComparisonFailure.java
+++ b/src/main/java/org/junit/internal/ArrayComparisonFailure.java
diff --git a/src/org/junit/internal/AssumptionViolatedException.java b/src/main/java/org/junit/internal/AssumptionViolatedException.java
index 8e11268..8e11268 100644
--- a/src/org/junit/internal/AssumptionViolatedException.java
+++ b/src/main/java/org/junit/internal/AssumptionViolatedException.java
diff --git a/src/org/junit/internal/ComparisonCriteria.java b/src/main/java/org/junit/internal/ComparisonCriteria.java
index e97011d..e97011d 100644
--- a/src/org/junit/internal/ComparisonCriteria.java
+++ b/src/main/java/org/junit/internal/ComparisonCriteria.java
diff --git a/src/org/junit/internal/ExactComparisonCriteria.java b/src/main/java/org/junit/internal/ExactComparisonCriteria.java
index 0a632ff..0a632ff 100644
--- a/src/org/junit/internal/ExactComparisonCriteria.java
+++ b/src/main/java/org/junit/internal/ExactComparisonCriteria.java
diff --git a/src/org/junit/internal/InexactComparisonCriteria.java b/src/main/java/org/junit/internal/InexactComparisonCriteria.java
index ef3d7ff..ef3d7ff 100644
--- a/src/org/junit/internal/InexactComparisonCriteria.java
+++ b/src/main/java/org/junit/internal/InexactComparisonCriteria.java
diff --git a/src/org/junit/internal/JUnitSystem.java b/src/main/java/org/junit/internal/JUnitSystem.java
index 6d9c242..6d9c242 100644
--- a/src/org/junit/internal/JUnitSystem.java
+++ b/src/main/java/org/junit/internal/JUnitSystem.java
diff --git a/src/org/junit/internal/RealSystem.java b/src/main/java/org/junit/internal/RealSystem.java
index 1067c6d..1067c6d 100644
--- a/src/org/junit/internal/RealSystem.java
+++ b/src/main/java/org/junit/internal/RealSystem.java
diff --git a/src/org/junit/internal/TextListener.java b/src/main/java/org/junit/internal/TextListener.java
index 2b1c679..2b1c679 100644
--- a/src/org/junit/internal/TextListener.java
+++ b/src/main/java/org/junit/internal/TextListener.java
diff --git a/src/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java b/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
index d3bd50a..d3bd50a 100644
--- a/src/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
+++ b/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
diff --git a/src/org/junit/internal/builders/AnnotatedBuilder.java b/src/main/java/org/junit/internal/builders/AnnotatedBuilder.java
index 8ed9ca7..8ed9ca7 100644
--- a/src/org/junit/internal/builders/AnnotatedBuilder.java
+++ b/src/main/java/org/junit/internal/builders/AnnotatedBuilder.java
diff --git a/src/org/junit/internal/builders/IgnoredBuilder.java b/src/main/java/org/junit/internal/builders/IgnoredBuilder.java
index 6be342c..6be342c 100644
--- a/src/org/junit/internal/builders/IgnoredBuilder.java
+++ b/src/main/java/org/junit/internal/builders/IgnoredBuilder.java
diff --git a/src/org/junit/internal/builders/IgnoredClassRunner.java b/src/main/java/org/junit/internal/builders/IgnoredClassRunner.java
index b4200a8..b4200a8 100644
--- a/src/org/junit/internal/builders/IgnoredClassRunner.java
+++ b/src/main/java/org/junit/internal/builders/IgnoredClassRunner.java
diff --git a/src/org/junit/internal/builders/JUnit3Builder.java b/src/main/java/org/junit/internal/builders/JUnit3Builder.java
index ddb070b..ddb070b 100644
--- a/src/org/junit/internal/builders/JUnit3Builder.java
+++ b/src/main/java/org/junit/internal/builders/JUnit3Builder.java
diff --git a/src/org/junit/internal/builders/JUnit4Builder.java b/src/main/java/org/junit/internal/builders/JUnit4Builder.java
index 4380db7..4380db7 100644
--- a/src/org/junit/internal/builders/JUnit4Builder.java
+++ b/src/main/java/org/junit/internal/builders/JUnit4Builder.java
diff --git a/src/org/junit/internal/builders/NullBuilder.java b/src/main/java/org/junit/internal/builders/NullBuilder.java
index 9d43d69..9d43d69 100644
--- a/src/org/junit/internal/builders/NullBuilder.java
+++ b/src/main/java/org/junit/internal/builders/NullBuilder.java
diff --git a/src/org/junit/internal/builders/SuiteMethodBuilder.java b/src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java
index 659bf31..659bf31 100644
--- a/src/org/junit/internal/builders/SuiteMethodBuilder.java
+++ b/src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java
diff --git a/src/org/junit/internal/matchers/CombinableMatcher.java b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
index e9e6947..e9e6947 100644
--- a/src/org/junit/internal/matchers/CombinableMatcher.java
+++ b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
diff --git a/src/org/junit/internal/matchers/Each.java b/src/main/java/org/junit/internal/matchers/Each.java
index 527db3b..527db3b 100644
--- a/src/org/junit/internal/matchers/Each.java
+++ b/src/main/java/org/junit/internal/matchers/Each.java
diff --git a/src/org/junit/internal/matchers/IsCollectionContaining.java b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
index 4436a83..4436a83 100644
--- a/src/org/junit/internal/matchers/IsCollectionContaining.java
+++ b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
diff --git a/src/org/junit/internal/matchers/StringContains.java b/src/main/java/org/junit/internal/matchers/StringContains.java
index e5f5334..e5f5334 100644
--- a/src/org/junit/internal/matchers/StringContains.java
+++ b/src/main/java/org/junit/internal/matchers/StringContains.java
diff --git a/src/org/junit/internal/matchers/SubstringMatcher.java b/src/main/java/org/junit/internal/matchers/SubstringMatcher.java
index 1c65240..1c65240 100644
--- a/src/org/junit/internal/matchers/SubstringMatcher.java
+++ b/src/main/java/org/junit/internal/matchers/SubstringMatcher.java
diff --git a/src/org/junit/internal/matchers/TypeSafeMatcher.java b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java
index 794a174..794a174 100644
--- a/src/org/junit/internal/matchers/TypeSafeMatcher.java
+++ b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java
diff --git a/src/org/junit/internal/requests/ClassRequest.java b/src/main/java/org/junit/internal/requests/ClassRequest.java
index 53bf520..53bf520 100644
--- a/src/org/junit/internal/requests/ClassRequest.java
+++ b/src/main/java/org/junit/internal/requests/ClassRequest.java
diff --git a/src/org/junit/internal/requests/FilterRequest.java b/src/main/java/org/junit/internal/requests/FilterRequest.java
index e5d98d1..e5d98d1 100644
--- a/src/org/junit/internal/requests/FilterRequest.java
+++ b/src/main/java/org/junit/internal/requests/FilterRequest.java
diff --git a/src/org/junit/internal/requests/SortingRequest.java b/src/main/java/org/junit/internal/requests/SortingRequest.java
index 3c6f4f5..3c6f4f5 100644
--- a/src/org/junit/internal/requests/SortingRequest.java
+++ b/src/main/java/org/junit/internal/requests/SortingRequest.java
diff --git a/src/org/junit/internal/requests/package-info.java b/src/main/java/org/junit/internal/requests/package-info.java
index 66d2928..66d2928 100644
--- a/src/org/junit/internal/requests/package-info.java
+++ b/src/main/java/org/junit/internal/requests/package-info.java
diff --git a/src/org/junit/internal/runners/ClassRoadie.java b/src/main/java/org/junit/internal/runners/ClassRoadie.java
index 1f77d37..1f77d37 100644
--- a/src/org/junit/internal/runners/ClassRoadie.java
+++ b/src/main/java/org/junit/internal/runners/ClassRoadie.java
diff --git a/src/org/junit/internal/runners/ErrorReportingRunner.java b/src/main/java/org/junit/internal/runners/ErrorReportingRunner.java
index 200b6f0..200b6f0 100644
--- a/src/org/junit/internal/runners/ErrorReportingRunner.java
+++ b/src/main/java/org/junit/internal/runners/ErrorReportingRunner.java
diff --git a/src/org/junit/internal/runners/FailedBefore.java b/src/main/java/org/junit/internal/runners/FailedBefore.java
index 29dcba4..29dcba4 100644
--- a/src/org/junit/internal/runners/FailedBefore.java
+++ b/src/main/java/org/junit/internal/runners/FailedBefore.java
diff --git a/src/org/junit/internal/runners/InitializationError.java b/src/main/java/org/junit/internal/runners/InitializationError.java
index 5715ec5..5715ec5 100644
--- a/src/org/junit/internal/runners/InitializationError.java
+++ b/src/main/java/org/junit/internal/runners/InitializationError.java
diff --git a/src/org/junit/internal/runners/JUnit38ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
index 0028d0c..0028d0c 100644
--- a/src/org/junit/internal/runners/JUnit38ClassRunner.java
+++ b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
diff --git a/src/org/junit/internal/runners/JUnit4ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit4ClassRunner.java
index d732880..d732880 100644
--- a/src/org/junit/internal/runners/JUnit4ClassRunner.java
+++ b/src/main/java/org/junit/internal/runners/JUnit4ClassRunner.java
diff --git a/src/org/junit/internal/runners/MethodRoadie.java b/src/main/java/org/junit/internal/runners/MethodRoadie.java
index 4407821..4407821 100644
--- a/src/org/junit/internal/runners/MethodRoadie.java
+++ b/src/main/java/org/junit/internal/runners/MethodRoadie.java
diff --git a/src/org/junit/internal/runners/MethodValidator.java b/src/main/java/org/junit/internal/runners/MethodValidator.java
index cadc93f..cadc93f 100644
--- a/src/org/junit/internal/runners/MethodValidator.java
+++ b/src/main/java/org/junit/internal/runners/MethodValidator.java
diff --git a/src/org/junit/internal/runners/SuiteMethod.java b/src/main/java/org/junit/internal/runners/SuiteMethod.java
index 4e8bebc..4e8bebc 100644
--- a/src/org/junit/internal/runners/SuiteMethod.java
+++ b/src/main/java/org/junit/internal/runners/SuiteMethod.java
diff --git a/src/org/junit/internal/runners/TestClass.java b/src/main/java/org/junit/internal/runners/TestClass.java
index 1ca2b9d..1ca2b9d 100644
--- a/src/org/junit/internal/runners/TestClass.java
+++ b/src/main/java/org/junit/internal/runners/TestClass.java
diff --git a/src/org/junit/internal/runners/TestMethod.java b/src/main/java/org/junit/internal/runners/TestMethod.java
index a06213c..a06213c 100644
--- a/src/org/junit/internal/runners/TestMethod.java
+++ b/src/main/java/org/junit/internal/runners/TestMethod.java
diff --git a/src/org/junit/internal/runners/model/EachTestNotifier.java b/src/main/java/org/junit/internal/runners/model/EachTestNotifier.java
index a7d534c..a7d534c 100644
--- a/src/org/junit/internal/runners/model/EachTestNotifier.java
+++ b/src/main/java/org/junit/internal/runners/model/EachTestNotifier.java
diff --git a/src/org/junit/internal/runners/model/MultipleFailureException.java b/src/main/java/org/junit/internal/runners/model/MultipleFailureException.java
index 3316806..3316806 100644
--- a/src/org/junit/internal/runners/model/MultipleFailureException.java
+++ b/src/main/java/org/junit/internal/runners/model/MultipleFailureException.java
diff --git a/src/org/junit/internal/runners/model/ReflectiveCallable.java b/src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java
index 9150d90..9150d90 100644
--- a/src/org/junit/internal/runners/model/ReflectiveCallable.java
+++ b/src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java
diff --git a/src/org/junit/internal/runners/package-info.java b/src/main/java/org/junit/internal/runners/package-info.java
index 5ab7e7b..5ab7e7b 100644
--- a/src/org/junit/internal/runners/package-info.java
+++ b/src/main/java/org/junit/internal/runners/package-info.java
diff --git a/src/org/junit/internal/runners/rules/RuleFieldValidator.java b/src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java
index e7df8bf..e7df8bf 100644
--- a/src/org/junit/internal/runners/rules/RuleFieldValidator.java
+++ b/src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java
diff --git a/src/org/junit/internal/runners/statements/ExpectException.java b/src/main/java/org/junit/internal/runners/statements/ExpectException.java
index ddfef07..ddfef07 100644
--- a/src/org/junit/internal/runners/statements/ExpectException.java
+++ b/src/main/java/org/junit/internal/runners/statements/ExpectException.java
diff --git a/src/org/junit/internal/runners/statements/Fail.java b/src/main/java/org/junit/internal/runners/statements/Fail.java
index e7d0d5c..e7d0d5c 100644
--- a/src/org/junit/internal/runners/statements/Fail.java
+++ b/src/main/java/org/junit/internal/runners/statements/Fail.java
diff --git a/src/org/junit/internal/runners/statements/FailOnTimeout.java b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
index bff7c72..bff7c72 100644
--- a/src/org/junit/internal/runners/statements/FailOnTimeout.java
+++ b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
diff --git a/src/org/junit/internal/runners/statements/InvokeMethod.java b/src/main/java/org/junit/internal/runners/statements/InvokeMethod.java
index e2e81e1..e2e81e1 100644
--- a/src/org/junit/internal/runners/statements/InvokeMethod.java
+++ b/src/main/java/org/junit/internal/runners/statements/InvokeMethod.java
diff --git a/src/org/junit/internal/runners/statements/RunAfters.java b/src/main/java/org/junit/internal/runners/statements/RunAfters.java
index 475ec72..475ec72 100644
--- a/src/org/junit/internal/runners/statements/RunAfters.java
+++ b/src/main/java/org/junit/internal/runners/statements/RunAfters.java
diff --git a/src/org/junit/internal/runners/statements/RunBefores.java b/src/main/java/org/junit/internal/runners/statements/RunBefores.java
index 66a34e1..66a34e1 100644
--- a/src/org/junit/internal/runners/statements/RunBefores.java
+++ b/src/main/java/org/junit/internal/runners/statements/RunBefores.java
diff --git a/src/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
index 837ed33..837ed33 100644
--- a/src/org/junit/matchers/JUnitMatchers.java
+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java
diff --git a/src/org/junit/matchers/package-info.java b/src/main/java/org/junit/matchers/package-info.java
index 71aca34..71aca34 100644
--- a/src/org/junit/matchers/package-info.java
+++ b/src/main/java/org/junit/matchers/package-info.java
diff --git a/src/org/junit/package-info.java b/src/main/java/org/junit/package-info.java
index bb60d0d..bb60d0d 100644
--- a/src/org/junit/package-info.java
+++ b/src/main/java/org/junit/package-info.java
diff --git a/src/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java
index 3522a65..3522a65 100644
--- a/src/org/junit/rules/ErrorCollector.java
+++ b/src/main/java/org/junit/rules/ErrorCollector.java
diff --git a/src/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java
index bac2fba..bac2fba 100644
--- a/src/org/junit/rules/ExpectedException.java
+++ b/src/main/java/org/junit/rules/ExpectedException.java
diff --git a/src/org/junit/rules/ExternalResource.java b/src/main/java/org/junit/rules/ExternalResource.java
index 1fe3719..1fe3719 100644
--- a/src/org/junit/rules/ExternalResource.java
+++ b/src/main/java/org/junit/rules/ExternalResource.java
diff --git a/src/org/junit/rules/MethodRule.java b/src/main/java/org/junit/rules/MethodRule.java
index 5167672..5167672 100644
--- a/src/org/junit/rules/MethodRule.java
+++ b/src/main/java/org/junit/rules/MethodRule.java
diff --git a/src/org/junit/rules/RuleChain.java b/src/main/java/org/junit/rules/RuleChain.java
index 8af3c05..8af3c05 100644
--- a/src/org/junit/rules/RuleChain.java
+++ b/src/main/java/org/junit/rules/RuleChain.java
diff --git a/src/org/junit/rules/RunRules.java b/src/main/java/org/junit/rules/RunRules.java
index d5905b9..d5905b9 100644
--- a/src/org/junit/rules/RunRules.java
+++ b/src/main/java/org/junit/rules/RunRules.java
diff --git a/src/org/junit/rules/TemporaryFolder.java b/src/main/java/org/junit/rules/TemporaryFolder.java
index a7c82aa..a7c82aa 100644
--- a/src/org/junit/rules/TemporaryFolder.java
+++ b/src/main/java/org/junit/rules/TemporaryFolder.java
diff --git a/src/org/junit/rules/TestName.java b/src/main/java/org/junit/rules/TestName.java
index c4ab9ce..c4ab9ce 100644
--- a/src/org/junit/rules/TestName.java
+++ b/src/main/java/org/junit/rules/TestName.java
diff --git a/src/org/junit/rules/TestRule.java b/src/main/java/org/junit/rules/TestRule.java
index b7760c4..b7760c4 100644
--- a/src/org/junit/rules/TestRule.java
+++ b/src/main/java/org/junit/rules/TestRule.java
diff --git a/src/org/junit/rules/TestWatcher.java b/src/main/java/org/junit/rules/TestWatcher.java
index 351b449..351b449 100644
--- a/src/org/junit/rules/TestWatcher.java
+++ b/src/main/java/org/junit/rules/TestWatcher.java
diff --git a/src/org/junit/rules/TestWatchman.java b/src/main/java/org/junit/rules/TestWatchman.java
index 15daa64..15daa64 100644
--- a/src/org/junit/rules/TestWatchman.java
+++ b/src/main/java/org/junit/rules/TestWatchman.java
diff --git a/src/org/junit/rules/Timeout.java b/src/main/java/org/junit/rules/Timeout.java
index 85ce6d6..85ce6d6 100644
--- a/src/org/junit/rules/Timeout.java
+++ b/src/main/java/org/junit/rules/Timeout.java
diff --git a/src/org/junit/rules/Verifier.java b/src/main/java/org/junit/rules/Verifier.java
index be1a55e..be1a55e 100644
--- a/src/org/junit/rules/Verifier.java
+++ b/src/main/java/org/junit/rules/Verifier.java
diff --git a/src/org/junit/runner/Computer.java b/src/main/java/org/junit/runner/Computer.java
index 939f702..939f702 100644
--- a/src/org/junit/runner/Computer.java
+++ b/src/main/java/org/junit/runner/Computer.java
diff --git a/src/org/junit/runner/Describable.java b/src/main/java/org/junit/runner/Describable.java
index e59cc01..e59cc01 100644
--- a/src/org/junit/runner/Describable.java
+++ b/src/main/java/org/junit/runner/Describable.java
diff --git a/src/org/junit/runner/Description.java b/src/main/java/org/junit/runner/Description.java
index b3083d5..b3083d5 100644
--- a/src/org/junit/runner/Description.java
+++ b/src/main/java/org/junit/runner/Description.java
diff --git a/src/org/junit/runner/JUnitCore.java b/src/main/java/org/junit/runner/JUnitCore.java
index 2fcd3b3..2fcd3b3 100644
--- a/src/org/junit/runner/JUnitCore.java
+++ b/src/main/java/org/junit/runner/JUnitCore.java
diff --git a/src/org/junit/runner/Request.java b/src/main/java/org/junit/runner/Request.java
index 310b915..310b915 100644
--- a/src/org/junit/runner/Request.java
+++ b/src/main/java/org/junit/runner/Request.java
diff --git a/src/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java
index edfb97c..edfb97c 100644
--- a/src/org/junit/runner/Result.java
+++ b/src/main/java/org/junit/runner/Result.java
diff --git a/src/org/junit/runner/RunWith.java b/src/main/java/org/junit/runner/RunWith.java
index 602edf0..602edf0 100644
--- a/src/org/junit/runner/RunWith.java
+++ b/src/main/java/org/junit/runner/RunWith.java
diff --git a/src/org/junit/runner/Runner.java b/src/main/java/org/junit/runner/Runner.java
index 39e424f..39e424f 100644
--- a/src/org/junit/runner/Runner.java
+++ b/src/main/java/org/junit/runner/Runner.java
diff --git a/src/org/junit/runner/manipulation/Filter.java b/src/main/java/org/junit/runner/manipulation/Filter.java
index c0f31b0..c0f31b0 100644
--- a/src/org/junit/runner/manipulation/Filter.java
+++ b/src/main/java/org/junit/runner/manipulation/Filter.java
diff --git a/src/org/junit/runner/manipulation/Filterable.java b/src/main/java/org/junit/runner/manipulation/Filterable.java
index 782c0f7..782c0f7 100644
--- a/src/org/junit/runner/manipulation/Filterable.java
+++ b/src/main/java/org/junit/runner/manipulation/Filterable.java
diff --git a/src/org/junit/runner/manipulation/NoTestsRemainException.java b/src/main/java/org/junit/runner/manipulation/NoTestsRemainException.java
index 03fb3bf..03fb3bf 100644
--- a/src/org/junit/runner/manipulation/NoTestsRemainException.java
+++ b/src/main/java/org/junit/runner/manipulation/NoTestsRemainException.java
diff --git a/src/org/junit/runner/manipulation/Sortable.java b/src/main/java/org/junit/runner/manipulation/Sortable.java
index fec1d0c..fec1d0c 100644
--- a/src/org/junit/runner/manipulation/Sortable.java
+++ b/src/main/java/org/junit/runner/manipulation/Sortable.java
diff --git a/src/org/junit/runner/manipulation/Sorter.java b/src/main/java/org/junit/runner/manipulation/Sorter.java
index 242df14..242df14 100644
--- a/src/org/junit/runner/manipulation/Sorter.java
+++ b/src/main/java/org/junit/runner/manipulation/Sorter.java
diff --git a/src/org/junit/runner/manipulation/package-info.java b/src/main/java/org/junit/runner/manipulation/package-info.java
index ba5c3b2..ba5c3b2 100644
--- a/src/org/junit/runner/manipulation/package-info.java
+++ b/src/main/java/org/junit/runner/manipulation/package-info.java
diff --git a/src/org/junit/runner/notification/Failure.java b/src/main/java/org/junit/runner/notification/Failure.java
index 501caa5..501caa5 100644
--- a/src/org/junit/runner/notification/Failure.java
+++ b/src/main/java/org/junit/runner/notification/Failure.java
diff --git a/src/org/junit/runner/notification/RunListener.java b/src/main/java/org/junit/runner/notification/RunListener.java
index ffe8134..ffe8134 100644
--- a/src/org/junit/runner/notification/RunListener.java
+++ b/src/main/java/org/junit/runner/notification/RunListener.java
diff --git a/src/org/junit/runner/notification/RunNotifier.java b/src/main/java/org/junit/runner/notification/RunNotifier.java
index d0f6c85..d0f6c85 100644
--- a/src/org/junit/runner/notification/RunNotifier.java
+++ b/src/main/java/org/junit/runner/notification/RunNotifier.java
diff --git a/src/org/junit/runner/notification/StoppedByUserException.java b/src/main/java/org/junit/runner/notification/StoppedByUserException.java
index 89be3ba..89be3ba 100644
--- a/src/org/junit/runner/notification/StoppedByUserException.java
+++ b/src/main/java/org/junit/runner/notification/StoppedByUserException.java
diff --git a/src/org/junit/runner/notification/package-info.java b/src/main/java/org/junit/runner/notification/package-info.java
index 0331c8f..0331c8f 100644
--- a/src/org/junit/runner/notification/package-info.java
+++ b/src/main/java/org/junit/runner/notification/package-info.java
diff --git a/src/org/junit/runner/package-info.java b/src/main/java/org/junit/runner/package-info.java
index e19fa0b..e19fa0b 100644
--- a/src/org/junit/runner/package-info.java
+++ b/src/main/java/org/junit/runner/package-info.java
diff --git a/src/org/junit/runners/AllTests.java b/src/main/java/org/junit/runners/AllTests.java
index 50c02db..50c02db 100644
--- a/src/org/junit/runners/AllTests.java
+++ b/src/main/java/org/junit/runners/AllTests.java
diff --git a/src/org/junit/runners/BlockJUnit4ClassRunner.java b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
index 92e0d07..92e0d07 100644
--- a/src/org/junit/runners/BlockJUnit4ClassRunner.java
+++ b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
diff --git a/src/org/junit/runners/JUnit4.java b/src/main/java/org/junit/runners/JUnit4.java
index 1e1f347..1e1f347 100644
--- a/src/org/junit/runners/JUnit4.java
+++ b/src/main/java/org/junit/runners/JUnit4.java
diff --git a/src/org/junit/runners/Parameterized.java b/src/main/java/org/junit/runners/Parameterized.java
index 3ebfead..3ebfead 100644
--- a/src/org/junit/runners/Parameterized.java
+++ b/src/main/java/org/junit/runners/Parameterized.java
diff --git a/src/org/junit/runners/ParentRunner.java b/src/main/java/org/junit/runners/ParentRunner.java
index a41aad3..a41aad3 100644
--- a/src/org/junit/runners/ParentRunner.java
+++ b/src/main/java/org/junit/runners/ParentRunner.java
diff --git a/src/org/junit/runners/Suite.java b/src/main/java/org/junit/runners/Suite.java
index 1b3bb48..1b3bb48 100644
--- a/src/org/junit/runners/Suite.java
+++ b/src/main/java/org/junit/runners/Suite.java
diff --git a/src/org/junit/runners/model/FrameworkField.java b/src/main/java/org/junit/runners/model/FrameworkField.java
index 4a4d4a4..4a4d4a4 100644
--- a/src/org/junit/runners/model/FrameworkField.java
+++ b/src/main/java/org/junit/runners/model/FrameworkField.java
diff --git a/src/org/junit/runners/model/FrameworkMember.java b/src/main/java/org/junit/runners/model/FrameworkMember.java
index 9cccd4b..9cccd4b 100644
--- a/src/org/junit/runners/model/FrameworkMember.java
+++ b/src/main/java/org/junit/runners/model/FrameworkMember.java
diff --git a/src/org/junit/runners/model/FrameworkMethod.java b/src/main/java/org/junit/runners/model/FrameworkMethod.java
index 81c8963..81c8963 100644
--- a/src/org/junit/runners/model/FrameworkMethod.java
+++ b/src/main/java/org/junit/runners/model/FrameworkMethod.java
diff --git a/src/org/junit/runners/model/InitializationError.java b/src/main/java/org/junit/runners/model/InitializationError.java
index 4de9ea7..4de9ea7 100644
--- a/src/org/junit/runners/model/InitializationError.java
+++ b/src/main/java/org/junit/runners/model/InitializationError.java
diff --git a/src/org/junit/runners/model/MultipleFailureException.java b/src/main/java/org/junit/runners/model/MultipleFailureException.java
index 6d70ca0..6d70ca0 100644
--- a/src/org/junit/runners/model/MultipleFailureException.java
+++ b/src/main/java/org/junit/runners/model/MultipleFailureException.java
diff --git a/src/org/junit/runners/model/NoGenericTypeParametersValidator.java b/src/main/java/org/junit/runners/model/NoGenericTypeParametersValidator.java
index 77662b8..77662b8 100644
--- a/src/org/junit/runners/model/NoGenericTypeParametersValidator.java
+++ b/src/main/java/org/junit/runners/model/NoGenericTypeParametersValidator.java
diff --git a/src/org/junit/runners/model/RunnerBuilder.java b/src/main/java/org/junit/runners/model/RunnerBuilder.java
index 3a334be..3a334be 100644
--- a/src/org/junit/runners/model/RunnerBuilder.java
+++ b/src/main/java/org/junit/runners/model/RunnerBuilder.java
diff --git a/src/org/junit/runners/model/RunnerScheduler.java b/src/main/java/org/junit/runners/model/RunnerScheduler.java
index fbc25a4..fbc25a4 100644
--- a/src/org/junit/runners/model/RunnerScheduler.java
+++ b/src/main/java/org/junit/runners/model/RunnerScheduler.java
diff --git a/src/org/junit/runners/model/Statement.java b/src/main/java/org/junit/runners/model/Statement.java
index a7c5478..a7c5478 100644
--- a/src/org/junit/runners/model/Statement.java
+++ b/src/main/java/org/junit/runners/model/Statement.java
diff --git a/src/org/junit/runners/model/TestClass.java b/src/main/java/org/junit/runners/model/TestClass.java
index 362a13a..362a13a 100644
--- a/src/org/junit/runners/model/TestClass.java
+++ b/src/main/java/org/junit/runners/model/TestClass.java
diff --git a/src/org/junit/runners/package-info.java b/src/main/java/org/junit/runners/package-info.java
index 418acaf..418acaf 100644
--- a/src/org/junit/runners/package-info.java
+++ b/src/main/java/org/junit/runners/package-info.java