aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hoisie <hoisie@google.com>2024-04-26 16:41:36 +0000
committerMichael Hoisie <hoisie@gmail.com>2024-04-26 13:40:35 -0700
commitd440248316a4fbd1eb97b2b7f7c45ae79e6cd14c (patch)
treecee4ddb6b4108129962c67cafbafdf1eb109170b
parentad506f9b44f154157fa33767486cd33372a96dd3 (diff)
downloadrobolectric-d440248316a4fbd1eb97b2b7f7c45ae79e6cd14c.tar.gz
Rename `compat-target28` integration test to `sdkcompat`
`sdkcompat` is a more generic and relevant name.
-rw-r--r--integration_tests/sdkcompat/build.gradle (renamed from integration_tests/compat-target28/build.gradle)2
-rw-r--r--integration_tests/sdkcompat/src/main/AndroidManifest.xml (renamed from integration_tests/compat-target28/src/main/AndroidManifest.xml)2
-rw-r--r--integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/MainActivity.java (renamed from integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/MainActivity.java)2
-rw-r--r--integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/TestAppComponentFactory.java (renamed from integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/TestAppComponentFactory.java)2
-rw-r--r--integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java (renamed from integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/JavaClassResolveCompatibilityTest.java)2
-rw-r--r--integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt (renamed from integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/NormalCompatibilityTest.kt)5
-rw-r--r--integration_tests/sdkcompat/src/test/resources/robolectric.properties (renamed from integration_tests/compat-target28/src/test/resources/robolectric.properties)0
-rw-r--r--settings.gradle2
8 files changed, 8 insertions, 9 deletions
diff --git a/integration_tests/compat-target28/build.gradle b/integration_tests/sdkcompat/build.gradle
index 7e11b884e..9f5fff0a4 100644
--- a/integration_tests/compat-target28/build.gradle
+++ b/integration_tests/sdkcompat/build.gradle
@@ -15,7 +15,7 @@ spotless {
android {
compileSdk 28
- namespace 'org.robolectric.integrationtests.compattarget28'
+ namespace 'org.robolectric.integrationtests.sdkcompat'
defaultConfig {
minSdk 19
diff --git a/integration_tests/compat-target28/src/main/AndroidManifest.xml b/integration_tests/sdkcompat/src/main/AndroidManifest.xml
index b4251821a..cd8b3f105 100644
--- a/integration_tests/compat-target28/src/main/AndroidManifest.xml
+++ b/integration_tests/sdkcompat/src/main/AndroidManifest.xml
@@ -2,6 +2,6 @@
<manifest xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<application
- android:appComponentFactory="org.robolectric.integrationtests.compattarget28.TestAppComponentFactory"
+ android:appComponentFactory="org.robolectric.integrationtests.sdkcompat.TestAppComponentFactory"
tools:targetApi="p" />
</manifest>
diff --git a/integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/MainActivity.java b/integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/MainActivity.java
index 88722c541..b4f27c88e 100644
--- a/integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/MainActivity.java
+++ b/integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/MainActivity.java
@@ -1,4 +1,4 @@
-package org.robolectric.integrationtests.compattarget28;
+package org.robolectric.integrationtests.sdkcompat;
import android.app.Activity;
diff --git a/integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/TestAppComponentFactory.java b/integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/TestAppComponentFactory.java
index 8f16ee0e7..b059a72ab 100644
--- a/integration_tests/compat-target28/src/main/java/org/robolectric/integrationtests/compattarget28/TestAppComponentFactory.java
+++ b/integration_tests/sdkcompat/src/main/java/org/robolectric/integrationtests/sdkcompat/TestAppComponentFactory.java
@@ -1,4 +1,4 @@
-package org.robolectric.integrationtests.compattarget28;
+package org.robolectric.integrationtests.sdkcompat;
import android.app.Activity;
import android.app.AppComponentFactory;
diff --git a/integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/JavaClassResolveCompatibilityTest.java b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java
index 9c86cffd0..f159686a4 100644
--- a/integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/JavaClassResolveCompatibilityTest.java
+++ b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/JavaClassResolveCompatibilityTest.java
@@ -1,4 +1,4 @@
-package org.robolectric.integration.compat.target28;
+package org.robolectric.integrationtests.sdkcompat;
import static com.google.common.truth.Truth.assertThat;
diff --git a/integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/NormalCompatibilityTest.kt b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt
index 8521b5698..c7be16a0b 100644
--- a/integration_tests/compat-target28/src/test/java/org/robolectric/integration/compat/target28/NormalCompatibilityTest.kt
+++ b/integration_tests/sdkcompat/src/test/java/org/robolectric/integrationtests/sdkcompat/NormalCompatibilityTest.kt
@@ -1,4 +1,4 @@
-package org.robolectric.integration.compat.target28
+package org.robolectric.integrationtests.sdkcompat
import android.content.Context
import android.content.Context.VIBRATOR_SERVICE
@@ -19,8 +19,7 @@ import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.Shadows
import org.robolectric.annotation.Config
-import org.robolectric.integrationtests.compattarget28.MainActivity
-import org.robolectric.integrationtests.compattarget28.MainActivity.CreationSource
+import org.robolectric.integrationtests.sdkcompat.MainActivity.CreationSource
import org.robolectric.testapp.TestActivity
@RunWith(RobolectricTestRunner::class)
diff --git a/integration_tests/compat-target28/src/test/resources/robolectric.properties b/integration_tests/sdkcompat/src/test/resources/robolectric.properties
index 89a6c8b4c..89a6c8b4c 100644
--- a/integration_tests/compat-target28/src/test/resources/robolectric.properties
+++ b/integration_tests/sdkcompat/src/test/resources/robolectric.properties
diff --git a/settings.gradle b/settings.gradle
index 1d2e82c32..498473c58 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -36,7 +36,7 @@ include ':integration_tests:ctesque'
include ':integration_tests:security-providers'
include ":integration_tests:mockk"
include ":integration_tests:jacoco-offline"
-include ':integration_tests:compat-target28'
+include ':integration_tests:sdkcompat'
include ":integration_tests:multidex"
include ":integration_tests:play_services"
include ":integration_tests:sparsearray"