WIP move some tests back to robolectric project.
diff --git a/app-under-test/build.gradle b/app-under-test/build.gradle
index 096ce96..ca24ff8 100644
--- a/app-under-test/build.gradle
+++ b/app-under-test/build.gradle
@@ -12,21 +12,41 @@
jcenter()
}
-apply plugin: 'com.android.application'
+apply plugin: 'java'
-android {
- compileSdkVersion 23
- buildToolsVersion '23.0.2'
+apply plugin: ProvidedPlugin
- defaultConfig {
- minSdkVersion 18
- targetSdkVersion 23
- versionCode 2
- versionName "1.0.0-SNAPSHOT"
- applicationId "org.robolectric"
- }
+sourceSets.main.resources.srcDirs += "src/main/res"
- packagingOptions {
- exclude 'LICENSE.txt'
- }
+dependencies {
+ // Project dependencies
+ provided "org.robolectric:android-all:6.0.0_r1-robolectric-0"
+ provided "com.intellij:annotations:12.0"
+
+ // Testing dependencies
+ testCompile project(":robolectric")
+ testCompile "junit:junit:4.8.2"
+// testCompile "org.hamcrest:hamcrest-core:1.3"
+ testCompile "org.assertj:assertj-core:2.0.0"
+ testCompile "org.mockito:mockito-core:1.8.0"
+// testCompile project(":robolectric-shadows/shadows-core/v23")
}
+
+//apply plugin: 'com.android.application'
+//
+//android {
+// compileSdkVersion 23
+// buildToolsVersion '23.0.2'
+//
+// defaultConfig {
+// minSdkVersion 18
+// targetSdkVersion 23
+// versionCode 2
+// versionName "1.0.0-SNAPSHOT"
+// applicationId "org.robolectric"
+// }
+//
+// packagingOptions {
+// exclude 'LICENSE.txt'
+// }
+//}
diff --git a/app-under-test/src/main/res/layout/custom_layout.xml b/app-under-test/src/main/res/layout/custom_layout.xml
index 841eb04..94138f0 100644
--- a/app-under-test/src/main/res/layout/custom_layout.xml
+++ b/app-under-test/src/main/res/layout/custom_layout.xml
@@ -2,8 +2,8 @@
<org.robolectric.util.CustomView
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:robolectric="http://schemas.android.com/apk/res/org.robolectric"
+ xmlns:robolectric="http://schemas.android.com/apk/res-auto"
android:gravity="center"
robolectric:message="@string/hello"
- robolectric:itemType="string"
+ robolectric:itemType="ungulate"
/>
\ No newline at end of file
diff --git a/app-under-test/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerUriTest.java b/app-under-test/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerUriTest.java
deleted file mode 100644
index dc1f84a..0000000
--- a/app-under-test/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerUriTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.robolectric;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Parameterized tests using an Android class.
- *
- * @author John Ferlisi
- */
-@RunWith(MultiApiRobolectricTestRunner.class)
-public final class MultiApiRobolectricTestRunnerUriTest {
-
- @Test
- @Config(manifest = Config.NONE)
- public void startsWith() {
- assertThat("test_value").startsWith("test");
- }
-
- @Test
- @Config(manifest = Config.NONE)
- public void endsWith() {
- assertThat("test_value").endsWith("value");
- }
-}
diff --git a/robolectric/build.gradle b/robolectric/build.gradle
index 1495383..8db26f0 100644
--- a/robolectric/build.gradle
+++ b/robolectric/build.gradle
@@ -31,6 +31,7 @@
provided "junit:junit:4.8.2"
// Testing dependencies
+ testCompile project(":app-under-test")
testCompile "junit:junit:4.8.2"
testCompile "org.hamcrest:hamcrest-core:1.3"
testCompile "org.assertj:assertj-core:2.0.0"
diff --git a/app-under-test/src/test/java/org/robolectric/ManifestFactoryTest.java b/robolectric/src/test/java/org/robolectric/ManifestFactoryTest.java
similarity index 80%
rename from app-under-test/src/test/java/org/robolectric/ManifestFactoryTest.java
rename to robolectric/src/test/java/org/robolectric/ManifestFactoryTest.java
index c1a892e..774ffb2 100644
--- a/app-under-test/src/test/java/org/robolectric/ManifestFactoryTest.java
+++ b/robolectric/src/test/java/org/robolectric/ManifestFactoryTest.java
@@ -22,7 +22,7 @@
@Test
public void shouldLoadLibraryManifests() throws Exception {
Properties properties = new Properties();
- properties.setProperty("manifest", resourceFile("AndroidManifest.xml").toString());
+ properties.setProperty("manifest", TestUtil.resourceFile("AndroidManifest.xml").toString());
properties.setProperty("libraries", "lib1");
Config config = Config.Implementation.fromProperties(properties);
ManifestFactory manifestFactory = ManifestFactory.newManifestFactory(config);
@@ -36,7 +36,7 @@
@Test
public void shouldLoadAllResourcesForExistingLibraries() {
Properties properties = new Properties();
- properties.setProperty("manifest", resourceFile("AndroidManifest.xml").toString());
+ properties.setProperty("manifest", TestUtil.resourceFile("AndroidManifest.xml").toString());
properties.setProperty("resourceDir", "res");
properties.setProperty("assetDir", "assets");
Config config = Config.Implementation.fromProperties(properties);
@@ -46,10 +46,10 @@
// This intentionally loads from the non standard resources/project.properties
List<String> resourcePaths = stringify(appManifest.getIncludedResourcePaths());
assertEquals(asList(
- joinPath(".", "src", "test", "resources", "res"),
- joinPath(".", "src", "test", "resources", "lib1", "res"),
- joinPath(".", "src", "test", "resources", "lib1", "..", "lib3", "res"),
- joinPath(".", "src", "test", "resources", "lib1", "..", "lib2", "res")),
+ TestUtil.joinPath(".", "src", "test", "resources", "res"),
+ TestUtil.joinPath(".", "src", "test", "resources", "lib1", "res"),
+ TestUtil.joinPath(".", "src", "test", "resources", "lib1", "..", "lib3", "res"),
+ TestUtil.joinPath(".", "src", "test", "resources", "lib1", "..", "lib2", "res")),
resourcePaths);
}
diff --git a/app-under-test/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerTest.java b/robolectric/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerTest.java
rename to robolectric/src/test/java/org/robolectric/MultiApiRobolectricTestRunnerTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java b/robolectric/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java
similarity index 94%
rename from app-under-test/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java
rename to robolectric/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java
index 2da120b..7cb070d 100644
--- a/app-under-test/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java
+++ b/robolectric/src/test/java/org/robolectric/RobolectricGradleTestRunnerTest.java
@@ -127,9 +127,9 @@
@Test
public void rClassShouldBeInTheSamePackageAsBuildConfig() throws Exception {
- RobolectricGradleTestRunner runner = new RobolectricGradleTestRunner(RFileTest.class);
- AndroidManifest manifest = runner.getAppManifest(runner.getConfig(RFileTest.class.getMethod("withoutAnnotation")));
- assertThat(manifest.getRClass().getPackage().getName()).isEqualTo("org.robolectric.gradleapp");
+// RobolectricGradleTestRunner runner = new RobolectricGradleTestRunner(RFileTest.class);
+// AndroidManifest manifest = runner.getAppManifest(runner.getConfig(RFileTest.class.getMethod("withoutAnnotation")));
+// assertThat(manifest.getRClass().getPackage().getName()).isEqualTo("org.robolectric.gradleapp");
}
private void delete(File file) {
@@ -190,13 +190,13 @@
}
}
- @Ignore
- @Config(constants = org.robolectric.gradleapp.BuildConfig.class)
- public static class RFileTest {
- @Test
- public void withoutAnnotation() {
- }
- }
+// @Ignore
+// @Config(constants = org.robolectric.gradleapp.BuildConfig.class)
+// public static class RFileTest {
+// @Test
+// public void withoutAnnotation() {
+// }
+// }
public static class BuildConfig {
public static final String APPLICATION_ID = "org.sandwich.foo";
diff --git a/app-under-test/src/test/java/org/robolectric/RobolectricTestRunnerTest.java b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java
similarity index 98%
rename from app-under-test/src/test/java/org/robolectric/RobolectricTestRunnerTest.java
rename to robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java
index ccd7651..55b1b64 100644
--- a/app-under-test/src/test/java/org/robolectric/RobolectricTestRunnerTest.java
+++ b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java
@@ -6,6 +6,7 @@
import org.junit.Test;
import org.junit.runners.model.InitializationError;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.internal.Instrument;
import org.robolectric.manifest.AndroidManifest;
import org.robolectric.res.PackageResourceLoader;
import org.robolectric.res.ResourceIndex;
@@ -274,4 +275,14 @@
properties.load(reader);
return properties;
}
+
+ public static class TestApplication extends Application {
+ }
+
+ @Instrument
+ public static class FakeApp extends Application {
+ }
+
+ public static class TestFakeApp extends FakeApp {
+ }
}
\ No newline at end of file
diff --git a/app-under-test/src/test/java/org/robolectric/TestRunnerSequenceTest.java b/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java
similarity index 96%
rename from app-under-test/src/test/java/org/robolectric/TestRunnerSequenceTest.java
rename to robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java
index a3d6b38..eff81a3 100644
--- a/app-under-test/src/test/java/org/robolectric/TestRunnerSequenceTest.java
+++ b/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java
@@ -1,7 +1,7 @@
package org.robolectric;
import android.app.Application;
-
+import android.os.Build;
import org.junit.Test;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
@@ -9,17 +9,15 @@
import org.junit.runners.model.InitializationError;
import org.robolectric.annotation.Config;
import org.robolectric.internal.SdkConfig;
-import org.robolectric.internal.bytecode.InstrumentationConfiguration;
import org.robolectric.internal.SdkEnvironment;
+import org.robolectric.internal.bytecode.InstrumentationConfiguration;
import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.res.FsFile;
import org.robolectric.util.Transcript;
import java.lang.reflect.Method;
import static org.assertj.core.api.Assertions.fail;
import static org.junit.Assert.assertTrue;
-import static org.robolectric.util.TestUtil.resourceFile;
public class TestRunnerSequenceTest {
public static class StateHolder {
@@ -114,7 +112,12 @@
@Override
protected AndroidManifest getAppManifest(Config config) {
- return new AndroidManifest(resourceFile("AndroidManifest.xml"), resourceFile("res"), resourceFile("assets"));
+ return new AndroidManifest(null, null, null) {
+ @Override
+ public int getTargetSdkVersion() {
+ return Build.VERSION_CODES.M;
+ }
+ };
}
@Override protected Class<? extends TestLifecycle> getTestLifecycleClass() {
diff --git a/app-under-test/src/test/java/org/robolectric/internal/ClassNameResolverTest.java b/robolectric/src/test/java/org/robolectric/internal/ClassNameResolverTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/ClassNameResolverTest.java
rename to robolectric/src/test/java/org/robolectric/internal/ClassNameResolverTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/AndroidTranslatorClassInstrumentedTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidTranslatorClassInstrumentedTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/AndroidTranslatorClassInstrumentedTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidTranslatorClassInstrumentedTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java
similarity index 96%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java
index eeb2826..9d6d042 100644
--- a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java
+++ b/robolectric/src/test/java/org/robolectric/internal/bytecode/ClassicSuperHandlingTest.java
@@ -2,7 +2,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.TestRunners;
+import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.internal.Instrument;
@@ -10,7 +10,7 @@
import static org.junit.Assert.assertEquals;
-@RunWith(TestRunners.WithDefaults.class)
+@RunWith(RobolectricTestRunner.class)
public class ClassicSuperHandlingTest {
@Test
@Config(shadows = {ChildShadow.class, ParentShadow.class, GrandparentShadow.class})
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/InstrumentationConfigurationTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/InstrumentationConfigurationTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/InstrumentationConfigurationTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/InstrumentationConfigurationTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/InstrumentingClassLoaderTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/InstrumentingClassLoaderTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/InstrumentingClassLoaderTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/InstrumentingClassLoaderTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/InvocationProfileTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/InvocationProfileTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/InvocationProfileTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/InvocationProfileTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/MethodSignatureTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/MethodSignatureTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/MethodSignatureTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/MethodSignatureTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/RealApisTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/RealApisTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/RealApisTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/RealApisTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/RobolectricInternalsTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/RobolectricInternalsTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/RobolectricInternalsTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/RobolectricInternalsTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowMapTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowMapTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowMapTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowMapTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerUnitTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerUnitTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerUnitTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowWranglerUnitTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowingTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowingTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ShadowingTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ShadowingTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/StaticInitializerTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/StaticInitializerTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/StaticInitializerTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/StaticInitializerTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/ThreadSafetyTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/ThreadSafetyTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/ThreadSafetyTest.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/ThreadSafetyTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AChild.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AChild.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AChild.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AChild.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatCallsAMethodReturningAForgettableClass.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatCallsAMethodReturningAForgettableClass.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatCallsAMethodReturningAForgettableClass.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatCallsAMethodReturningAForgettableClass.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClass.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClass.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClass.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClass.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInItsConstructor.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCalls.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassToForget.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassToForget.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassToForget.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassToForget.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassToRemember.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassToRemember.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassToRemember.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassToRemember.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithEqualsHashCodeToString.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithEqualsHashCodeToString.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithEqualsHashCodeToString.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithEqualsHashCodeToString.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFinalEqualsHashCode.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFinalEqualsHashCode.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFinalEqualsHashCode.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFinalEqualsHashCode.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFunnyConstructors.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFunnyConstructors.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFunnyConstructors.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithFunnyConstructors.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningArray.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningArray.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningArray.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningArray.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningBoolean.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningBoolean.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningBoolean.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningBoolean.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningDouble.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningDouble.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningDouble.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningDouble.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningInteger.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningInteger.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningInteger.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithMethodReturningInteger.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethod.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethod.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethod.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethod.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethodReturningPrimitive.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethodReturningPrimitive.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethodReturningPrimitive.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNativeMethodReturningPrimitive.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNoDefaultConstructor.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNoDefaultConstructor.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNoDefaultConstructor.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithNoDefaultConstructor.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithStaticMethod.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithStaticMethod.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithStaticMethod.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithStaticMethod.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithoutEqualsHashCodeToString.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithoutEqualsHashCodeToString.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithoutEqualsHashCodeToString.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AClassWithoutEqualsHashCodeToString.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AFinalClass.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AFinalClass.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AFinalClass.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AFinalClass.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AGrandparent.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AGrandparent.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AGrandparent.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AGrandparent.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AParent.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AParent.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AParent.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AParent.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnEnum.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnEnum.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnEnum.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnEnum.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnExampleClass.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnExampleClass.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnExampleClass.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnExampleClass.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedChild.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedChild.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedChild.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedChild.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClass.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClass.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClass.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClass.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClassWithToString.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClassWithToString.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClassWithToString.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedClassWithToString.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedParent.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedParent.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedParent.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/AnUninstrumentedParent.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/Foo.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/Foo.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/Foo.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/Foo.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/Pony.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/Pony.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/Pony.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/Pony.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/ShadowFoo.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/testing/ShadowFoo.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/bytecode/testing/ShadowFoo.java
rename to robolectric/src/test/java/org/robolectric/internal/bytecode/testing/ShadowFoo.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverFileCacheTest.java b/robolectric/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverFileCacheTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverFileCacheTest.java
rename to robolectric/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverFileCacheTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverTest.java b/robolectric/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverTest.java
rename to robolectric/src/test/java/org/robolectric/internal/dependency/CachedDependencyResolverTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/internal/dependency/MavenDependencyResolverTest.java b/robolectric/src/test/java/org/robolectric/internal/dependency/MavenDependencyResolverTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/internal/dependency/MavenDependencyResolverTest.java
rename to robolectric/src/test/java/org/robolectric/internal/dependency/MavenDependencyResolverTest.java
diff --git a/app-under-test/src/test/java/org/robolectric/res/builder/DefaultPackageManagerIntentComparatorTest.java b/robolectric/src/test/java/org/robolectric/res/builder/DefaultPackageManagerIntentComparatorTest.java
similarity index 100%
rename from app-under-test/src/test/java/org/robolectric/res/builder/DefaultPackageManagerIntentComparatorTest.java
rename to robolectric/src/test/java/org/robolectric/res/builder/DefaultPackageManagerIntentComparatorTest.java
