File tree Expand file tree Collapse file tree 6 files changed +1
-57
lines changed
core/src/test/java/io/opentelemetry/android
main/java/io/opentelemetry/android/internal/services
test/java/io/opentelemetry/android/internal/services Expand file tree Collapse file tree 6 files changed +1
-57
lines changed Original file line number Diff line number Diff line change 4
4
demo-app /local.properties
5
5
.DS_Store
6
6
** /build /
7
+ .kotlin /
Original file line number Diff line number Diff line change 36
36
import io .opentelemetry .android .instrumentation .internal .AndroidInstrumentationLoaderImpl ;
37
37
import io .opentelemetry .android .internal .initialization .InitializationEvents ;
38
38
import io .opentelemetry .android .internal .services .CacheStorage ;
39
- import io .opentelemetry .android .internal .services .Preferences ;
40
39
import io .opentelemetry .android .internal .services .Services ;
41
40
import io .opentelemetry .android .internal .services .applifecycle .AppLifecycle ;
42
41
import io .opentelemetry .android .internal .services .visiblescreen .VisibleScreenTracker ;
@@ -513,7 +512,6 @@ private static Services createAndSetServiceManager() {
513
512
Services services = mock (Services .class );
514
513
when (services .getAppLifecycle ()).thenReturn (mock (AppLifecycle .class ));
515
514
when (services .getCacheStorage ()).thenReturn (mock (CacheStorage .class ));
516
- when (services .getPreferences ()).thenReturn (mock (Preferences .class ));
517
515
VisibleScreenTracker screenService = mock (VisibleScreenTracker .class );
518
516
when (screenService .getCurrentlyVisibleScreen ()).thenReturn (CUR_SCREEN_NAME );
519
517
when (services .getVisibleScreenTracker ()).thenReturn (screenService );
Original file line number Diff line number Diff line change @@ -3,19 +3,13 @@ public class io/opentelemetry/android/internal/services/CacheStorage {
3
3
public fun getCacheDir ()Ljava/io/File;
4
4
}
5
5
6
- public final class io/opentelemetry/android/internal/services/Preferences {
7
- public final fun retrieveInt (Ljava/lang/String;I)I
8
- public final fun store (Ljava/lang/String;I)V
9
- }
10
-
11
6
public final class io/opentelemetry/android/internal/services/Services {
12
7
public static final field Companion Lio/opentelemetry/android/internal/services/Services$Companion;
13
8
public static final fun get (Landroid/app/Application;)Lio/opentelemetry/android/internal/services/Services;
14
9
public final fun getAppLifecycle ()Lio/opentelemetry/android/internal/services/applifecycle/AppLifecycle;
15
10
public final fun getCacheStorage ()Lio/opentelemetry/android/internal/services/CacheStorage;
16
11
public final fun getCurrentNetworkProvider ()Lio/opentelemetry/android/internal/services/network/CurrentNetworkProvider;
17
12
public final fun getPeriodicWork ()Lio/opentelemetry/android/internal/services/periodicwork/PeriodicWork;
18
- public final fun getPreferences ()Lio/opentelemetry/android/internal/services/Preferences;
19
13
public final fun getVisibleScreenTracker ()Lio/opentelemetry/android/internal/services/visiblescreen/VisibleScreenTracker;
20
14
public static final fun set (Lio/opentelemetry/android/internal/services/Services;)V
21
15
}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -22,10 +22,6 @@ import io.opentelemetry.android.internal.services.visiblescreen.VisibleScreenTra
22
22
class Services internal constructor(
23
23
private val factory : ServicesFactory ,
24
24
) {
25
- val preferences: Preferences by lazy {
26
- factory.createPreferences()
27
- }
28
-
29
25
val cacheStorage: CacheStorage by lazy {
30
26
factory.createCacheStorage()
31
27
}
@@ -68,14 +64,6 @@ class Services internal constructor(
68
64
internal class ServicesFactory (
69
65
private val application : Application ,
70
66
) {
71
- fun createPreferences (): Preferences =
72
- Preferences (
73
- application.getSharedPreferences(
74
- " io.opentelemetry.android" + " .prefs" ,
75
- Context .MODE_PRIVATE ,
76
- ),
77
- )
78
-
79
67
fun createCacheStorage (): CacheStorage = CacheStorage (application)
80
68
81
69
fun createPeriodicWork (): PeriodicWork = PeriodicWork ()
Original file line number Diff line number Diff line change @@ -24,8 +24,6 @@ class ServicesTest {
24
24
@Test
25
25
fun `Verify that services are created lazily` () {
26
26
val factory = mockk<ServicesFactory >()
27
- val preferences = mockk<Preferences >()
28
- every { factory.createPreferences() }.returns(preferences)
29
27
val cacheStorage = mockk<CacheStorage >()
30
28
every { factory.createCacheStorage() }.returns(cacheStorage)
31
29
val periodicWork = mockk<PeriodicWork >()
@@ -41,7 +39,6 @@ class ServicesTest {
41
39
val services = Services (factory)
42
40
verify { factory wasNot Called }
43
41
44
- verifyLazyCreation(preferences, services::preferences, factory::createPreferences)
45
42
verifyLazyCreation(cacheStorage, services::cacheStorage, factory::createCacheStorage)
46
43
verifyLazyCreation(periodicWork, services::periodicWork, factory::createPeriodicWork)
47
44
verifyLazyCreation(
You can’t perform that action at this time.
0 commit comments