Espresso: Move sample tests to test app package.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=58367934
diff --git a/pom.xml b/pom.xml
index d0ab721..c380b4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
<modules>
<module>espresso</module>
<module>testapp</module>
+ <module>testapp_test</module>
<module>testrunner</module>
<module>testrunner-runtime</module>
</modules>
diff --git a/testapp/pom.xml b/testapp/pom.xml
index a88a56a..11006b8 100644
--- a/testapp/pom.xml
+++ b/testapp/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.google.android.apps.common.testing</groupId>
- <artifactId>TestKit</artifactId>
+ <artifactId>testapp-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>testapp</artifactId>
diff --git a/testapp/src/main/java/com/google/android/apps/common/testing/ui/testapp/parent-pom.xml b/testapp/src/main/java/com/google/android/apps/common/testing/ui/testapp/parent-pom.xml
new file mode 100644
index 0000000..1834a11
--- /dev/null
+++ b/testapp/src/main/java/com/google/android/apps/common/testing/ui/testapp/parent-pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>TestKit</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>testapp-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Testapp Parent Project</name>
+ <modules>
+ <module>testapp</module>
+ <module>testapp_test</module>
+ </modules>
+</project>
diff --git a/testapp_test/AndroidManifest.xml b/testapp_test/AndroidManifest.xml
new file mode 100644
index 0000000..911d6f6
--- /dev/null
+++ b/testapp_test/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.apps.common.testing.ui.testapp.tests" >
+
+ <uses-sdk
+ android:minSdkVersion="7"
+ android:targetSdkVersion="18" />
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+
+ <instrumentation
+ android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
+ android:targetPackage="com.google.android.apps.common.testing.ui.testapp" />
+
+</manifest>
diff --git a/testapp_test/pom.xml b/testapp_test/pom.xml
new file mode 100644
index 0000000..f18845a
--- /dev/null
+++ b/testapp_test/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>TestKit</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>testapp_test</artifactId>
+ <packaging>apk</packaging>
+ <name>Tests For the Test App</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- We use TestApp to create scenarios to verify Espresso's functionality.
+ The below dependency installs it on the device.
+ -->
+ <dependency>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>testapp</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>apk</type>
+ </dependency>
+ <!-- Allows us to use TestApp's R.class at compile time.
+ -->
+ <dependency>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>testapp</artifactId>
+ <type>jar</type>
+ <scope>provided</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- we have a direct compile / install time dependency on the espresso
+ testing framework - otherwise what will we test? -->
+ <dependency>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>espresso</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android-test</artifactId>
+ <scope>provided</scope>
+ </dependency>
+<!-- <dependency>
+ <groupId>com.google.android.apps.common.testing</groupId>
+ <artifactId>testrunner-runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency> -->
+ </dependencies>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <extractDuplicates>true</extractDuplicates>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/ActionBarTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/ActionBarTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/ActionBarTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/ActionBarTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/AdapterViewTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/AdapterViewTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/AdapterViewTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/AdapterViewTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/AdvancedSynchronizationTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/AdvancedSynchronizationTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/AdvancedSynchronizationTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/AdvancedSynchronizationTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/BasicTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/BasicTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/BasicTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/BasicTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/CustomFailureHandlerTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/CustomFailureHandlerTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/CustomFailureHandlerTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/CustomFailureHandlerTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/DrawerActionsTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/DrawerActionsTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/DrawerActionsTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/DrawerActionsTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/LongListMatchers.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/LongListMatchers.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/LongListMatchers.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/LongListMatchers.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/LongListMatchersTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/LongListMatchersTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/LongListMatchersTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/LongListMatchersTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/MenuTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/MenuTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/MenuTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/MenuTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/MultipleWindowTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/MultipleWindowTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/MultipleWindowTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/MultipleWindowTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/ScrollToTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/ScrollToTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/ScrollToTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/ScrollToTest.java
diff --git a/espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/SwipeTest.java b/testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/SwipeTest.java
similarity index 100%
rename from espresso/libtests/src/main/java/com/google/android/apps/common/testing/ui/espresso/sample/SwipeTest.java
rename to testapp_test/src/main/java/com/google/android/apps/common/testing/ui/testapp/SwipeTest.java
