Merge "Extend MetricsFactory so it can log to different LogWriters"

tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java

@@ -15,31 +15,46 @@
  */
 package com.android.settings.core.instrumentation;
 
-import com.android.settings.TestConfig;
+import android.content.Context;
 
+import com.android.settings.TestConfig;
+import com.android.settings.overlay.FeatureFactory;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
 
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class MetricsFactoryTest {
+public class MetricsFeatureProviderTest {
 
-    @Test
-    public void factoryShouldReuseCachedInstance() {
-        MetricsFactory factory1 = MetricsFactory.get();
-        MetricsFactory factory2 = MetricsFactory.get();
-        assertTrue(factory1 == factory2);
+    private ShadowApplication mApplication;
+    private Context mContext;
+
+    @Mock
+    private LogWriter mLogWriter;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mApplication = ShadowApplication.getInstance();
+        mContext = mApplication.getApplicationContext();
     }
 
     @Test
-    public void factoryShouldCacheLogger() {
-        MetricsFactory factory = MetricsFactory.get();
-        LogWriter logger1 = factory.getLogger();
-        LogWriter logger2 = factory.getLogger();
-        assertTrue(logger1 == logger2);
+    public void getFactory_shouldReuseCachedInstance() {
+        MetricsFeatureProvider feature1 =
+                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+        MetricsFeatureProvider feature2 =
+                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+        assertTrue(feature1 == feature2);
     }
 }

tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java

@@ -18,6 +18,7 @@ package com.android.settings.core.instrumentation;
 import android.content.Context;
 
 import com.android.settings.TestConfig;
+import com.android.settings.overlay.FeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +32,7 @@ import org.robolectric.shadows.ShadowApplication;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 @RunWith(RobolectricTestRunner.class)
@@ -43,6 +45,7 @@ public class SharedPreferenceLoggerTest {
     @Mock
     private LogWriter mLogWriter;
 
+    private MetricsFeatureProvider mMetricsFeature;
     private ShadowApplication mApplication;
     private SharedPreferencesLogger mSharedPrefLogger;
 
@@ -50,7 +53,10 @@ public class SharedPreferenceLoggerTest {
     public void init() {
         MockitoAnnotations.initMocks(this);
         mApplication = ShadowApplication.getInstance();
-        MetricsFactory.get().setLogger(mLogWriter);
+        Context context = mApplication.getApplicationContext();
+        mMetricsFeature = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        ((MetricsFeatureProviderImpl) mMetricsFeature).addLogWriter(mLogWriter);
+
         mSharedPrefLogger = new SharedPreferencesLogger(
                 mApplication.getApplicationContext(), TEST_TAG);
     }

tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java

@@ -38,26 +38,27 @@ import static org.mockito.Mockito.verify;
 public class VisibilityLoggerMixinTest {
 
     @Mock
-    private EventLogWriter mLogger;
+    private MetricsFeatureProvider mMetricsFeature;
+
     private VisibilityLoggerMixin mMixin;
 
     @Before
     public void init() {
         MockitoAnnotations.initMocks(this);
-        mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC, mLogger);
+        mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC, mMetricsFeature);
     }
 
     @Test
     public void shouldLogVisibleOnResume() {
         mMixin.onResume();
-        verify(mLogger, times(1))
+        verify(mMetricsFeature, times(1))
                 .visible(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
 
     @Test
     public void shouldLogHideOnPause() {
         mMixin.onPause();
-        verify(mLogger, times(1))
+        verify(mMetricsFeature, times(1))
                 .hidden(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
 

tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java

@@ -15,7 +15,10 @@
  */
 package com.android.settings.core.lifecycle;
 
+import android.content.Context;
+
 import com.android.settings.TestConfig;
+import com.android.settings.core.lifecycle.events.OnAttach;
 import com.android.settings.core.lifecycle.events.OnDestroy;
 import com.android.settings.core.lifecycle.events.OnPause;
 import com.android.settings.core.lifecycle.events.OnResume;
@@ -57,15 +60,23 @@ public class LifecycleTest {
 
     }
 
-    public static class TestObserver implements LifecycleObserver, OnStart, OnResume,
+    public static class TestObserver implements LifecycleObserver, OnAttach, OnStart, OnResume,
             OnPause, OnStop, OnDestroy {
 
+        boolean mOnAttachObserved;
+        boolean mOnAttachHasContext;
         boolean mOnStartObserved;
         boolean mOnResumeObserved;
         boolean mOnPauseObserved;
         boolean mOnStopObserved;
         boolean mOnDestroyObserved;
 
+        @Override
+        public void onAttach(Context context) {
+            mOnAttachObserved = true;
+            mOnAttachHasContext = context != null;
+        }
+
         @Override
         public void onStart() {
             mOnStartObserved = true;
@@ -115,8 +126,10 @@ public class LifecycleTest {
                 Robolectric.buildFragment(TestDialogFragment.class);
         TestDialogFragment fragment = fragmentController.get();
 
-        fragmentController.create().start().resume().pause().stop().destroy();
+        fragmentController.attach().create().start().resume().pause().stop().destroy();
 
+        assertTrue(fragment.mFragObserver.mOnAttachObserved);
+        assertTrue(fragment.mFragObserver.mOnAttachHasContext);
         assertTrue(fragment.mFragObserver.mOnStartObserved);
         assertTrue(fragment.mFragObserver.mOnResumeObserved);
         assertTrue(fragment.mFragObserver.mOnPauseObserved);