| commit | 4fa9444d96d80b9281cb7fc738683044d72a9e2d | [log] [tgz] |
|---|---|---|
| author | Ian Lake <ilake@google.com> | Mon Mar 06 14:12:53 2017 -0800 |
| committer | Yigit Boyar <yboyar@google.com> | Thu Jul 06 16:28:15 2017 -0700 |
| tree | 5c6b68db77088d4dc672e521ef8d847bdc42162d | |
| parent | 83ebc490a3749991fe049df215491ecc8f7a5cce [diff] |
Standardize lifecycle integration-tests/testapp naming Move lifecycle's test app from integration-tests/test-app to integration-tests/testapp to match other components. This has an immediate benefit in Android Studio as the module is no longer named simply 'test-app', but instead the fully qualified 'lifecycle-integration-tests-testapp', grouping it with the other lifecycle modules. Test: lifecycle-integration-tests-testapp module appears in Android Studio Change-Id: I36d51cdf9d94b37f573d600c1ebf3d387c318c6a
diff --git a/app-toolkit/settings.gradle b/app-toolkit/settings.gradle index 493b1f1..a88d833 100644 --- a/app-toolkit/settings.gradle +++ b/app-toolkit/settings.gradle
@@ -48,8 +48,8 @@ include ':lifecycle:compiler' project(':lifecycle:compiler').projectDir = new File(supportRoot, "lifecycle/compiler") -include ':lifecycle:integration-tests:test-app' -project(':lifecycle:integration-tests:test-app').projectDir = new File(supportRoot, "lifecycle/integration-tests/test-app") +include ':lifecycle:integration-tests:testapp' +project(':lifecycle:integration-tests:testapp').projectDir = new File(supportRoot, "lifecycle/integration-tests/testapp") include ':room:common' project(':room:common').projectDir = new File(supportRoot, "room/common")
diff --git a/lifecycle/integration-tests/test-app/.gitignore b/lifecycle/integration-tests/testapp/.gitignore similarity index 100% rename from lifecycle/integration-tests/test-app/.gitignore rename to lifecycle/integration-tests/testapp/.gitignore
diff --git a/lifecycle/integration-tests/test-app/build.gradle b/lifecycle/integration-tests/testapp/build.gradle similarity index 100% rename from lifecycle/integration-tests/test-app/build.gradle rename to lifecycle/integration-tests/testapp/build.gradle
diff --git a/lifecycle/integration-tests/test-app/proguard-rules.pro b/lifecycle/integration-tests/testapp/proguard-rules.pro similarity index 100% rename from lifecycle/integration-tests/test-app/proguard-rules.pro rename to lifecycle/integration-tests/testapp/proguard-rules.pro
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/ActivityFullLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/ActivityFullLifecycleTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/ActivityFullLifecycleTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/ActivityFullLifecycleTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/ProcessProviderTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/ProcessProviderTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/ProcessProviderTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/ProcessProviderTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/SimpleAppFullLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/SimpleAppFullLifecycleTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/SimpleAppFullLifecycleTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/SimpleAppFullLifecycleTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/SynchronousActivityLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/SynchronousActivityLifecycleTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/SynchronousActivityLifecycleTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/SynchronousActivityLifecycleTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/TestUtils.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/TestUtils.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/TestUtils.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/TestUtils.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/BaseStateProviderTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/FragmentStatesTests.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/RetainedStateProviderTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/RetainedStateProviderTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/RetainedStateProviderTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/RetainedStateProviderTest.java
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/SavedStateProviderTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/SavedStateProviderTest.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/state/SavedStateProviderTest.java rename to lifecycle/integration-tests/testapp/src/androidTest/java/com/android/support/lifecycle/state/SavedStateProviderTest.java
diff --git a/lifecycle/integration-tests/test-app/src/main/AndroidManifest.xml b/lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/AndroidManifest.xml rename to lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/FullLifecycleTestActivity.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/FullLifecycleTestActivity.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/FullLifecycleTestActivity.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/FullLifecycleTestActivity.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/LifecycleTestActivity.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/LifecycleTestActivity.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/LifecycleTestActivity.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/LifecycleTestActivity.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/MainActivity.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/MainActivity.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/MainActivity.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/MainActivity.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationDialogActivity.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationDialogActivity.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationDialogActivity.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationDialogActivity.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivityFirst.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivityFirst.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivityFirst.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivityFirst.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivitySecond.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivitySecond.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivitySecond.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/NavigationTestActivitySecond.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/SimpleAppLifecycleTestActivity.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/SimpleAppLifecycleTestActivity.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/SimpleAppLifecycleTestActivity.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/SimpleAppLifecycleTestActivity.java
diff --git a/lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/UsualFragment.java b/lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/UsualFragment.java similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/java/com/android/support/lifecycle/testapp/UsualFragment.java rename to lifecycle/integration-tests/testapp/src/main/java/com/android/support/lifecycle/testapp/UsualFragment.java
diff --git a/lifecycle/integration-tests/test-app/src/main/res/layout/activity.xml b/lifecycle/integration-tests/testapp/src/main/res/layout/activity.xml similarity index 100% rename from lifecycle/integration-tests/test-app/src/main/res/layout/activity.xml rename to lifecycle/integration-tests/testapp/src/main/res/layout/activity.xml