Code improvements

getodk · Mar 20, 2023 · 7cddbaf · 7cddbaf
1 parent 5834ef7
commit 7cddbaf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyModule.java b/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyModule.java
@@ -123,7 +123,7 @@
 import org.odk.collect.metadata.DeviceDetailsProvider;
 import org.odk.collect.metadata.InstallIDProvider;
 import org.odk.collect.metadata.PropertyManager;
-import org.odk.collect.metadata.CollectInstallIDProvider;
+import org.odk.collect.metadata.SettingsInstallIDProvider;
 import org.odk.collect.metadata.StaticCachingDeviceDetailsProvider;
 import org.odk.collect.permissions.ContextCompatPermissionChecker;
 import org.odk.collect.permissions.PermissionsChecker;
@@ -237,7 +237,7 @@ public SettingsProvider providesSettingsProvider(Context context) {
 
     @Provides
     InstallIDProvider providesInstallIDProvider(SettingsProvider settingsProvider) {
-        return new CollectInstallIDProvider(settingsProvider.getMetaSettings(), KEY_INSTALL_ID);
+        return new SettingsInstallIDProvider(settingsProvider.getMetaSettings(), KEY_INSTALL_ID);
     }
 
     @Provides

diff --git a/metadata/build.gradle.kts b/metadata/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
     }
     implementation(Dependencies.timber)
 
-    testImplementation(Dependencies.androidx_test_ext_junit)
+    testImplementation(Dependencies.hamcrest)
+    testImplementation(Dependencies.junit)
     testImplementation(Dependencies.mockito_kotlin)
 }
diff --git a/metadata/src/main/java/org/odk/collect/metadata/InstallIDProvider.kt b/metadata/src/main/java/org/odk/collect/metadata/InstallIDProvider.kt
@@ -7,7 +7,7 @@ interface InstallIDProvider {
     val installID: String
 }
 
-class CollectInstallIDProvider(
+class SettingsInstallIDProvider(
     private val metaPreferences: Settings,
     private val preferencesKey: String
 ) : InstallIDProvider {

diff --git a/metadata/src/test/java/org/odk/collect/metadata/PropertyManagerTest.kt b/metadata/src/test/java/org/odk/collect/metadata/PropertyManagerTest.kt
@@ -28,8 +28,6 @@ class PropertyManagerTest {
 
     @Test
     fun `getSingularProperty should require phone state permission for phone number property only`() {
-        propertyManager.reload()
-
         propertyManager.getSingularProperty(PropertyManager.PROPMGR_DEVICE_ID)
         propertyManager.getSingularProperty(PropertyManager.PROPMGR_USERNAME)
         propertyManager.getSingularProperty(PropertyManager.PROPMGR_EMAIL)

diff --git a/.../metadata/CollectInstallIDProviderTest.kt → ...metadata/SettingsInstallIDProviderTest.kt b/.../metadata/CollectInstallIDProviderTest.kt → ...metadata/SettingsInstallIDProviderTest.kt
@@ -9,9 +9,9 @@ import org.junit.Test
 import org.odk.collect.shared.settings.InMemSettings
 import org.odk.collect.shared.settings.Settings
 
-class CollectInstallIDProviderTest {
+class SettingsInstallIDProviderTest {
     private val metaPreferences: Settings = InMemSettings()
-    private val provider = CollectInstallIDProvider(metaPreferences, "blah")
+    private val provider = SettingsInstallIDProvider(metaPreferences, "blah")
 
     @Test
     fun returnsSameValueEveryTime() {