From 67f419c2442119f00d5bd1ce67b505a08fdfe500 Mon Sep 17 00:00:00 2001 From: Ramanpreet Singh Date: Wed, 24 Mar 2021 18:57:54 -0700 Subject: [PATCH 1/5] Fixing variable names from the test classes only. --- .../perf/FirebasePerformanceTestBase.java | 6 +- .../perf/application/AppStateMonitorTest.java | 191 +++++++++--------- .../perf/metrics/AppStartTraceTest.java | 150 +++++++------- .../firebase/perf/metrics/HttpMetricTest.java | 98 ++++----- .../NetworkRequestMetricBuilderTest.java | 152 +++++++------- .../perf/metrics/TraceMetricBuilderTest.java | 108 +++++----- .../FirebasePerfTraceValidatorTest.java | 14 +- .../network/FirebasePerfHttpClientTest.java | 120 +++++------ .../network/FirebasePerfOkHttpClientTest.java | 10 +- .../FirebasePerfUrlConnectionTest.java | 26 +-- .../network/InstrHttpInputStreamTest.java | 94 ++++----- .../network/InstrHttpOutputStreamTest.java | 86 ++++---- .../network/InstrHttpURLConnectionTest.java | 134 ++++++------ .../network/InstrHttpsURLConnectionTest.java | 146 ++++++------- .../network/InstrURLConnectionBaseTest.java | 60 +++--- .../gauges/GaugeMetadataManagerTest.java | 20 +- .../perf/transport/RateLimiterTest.java | 64 +++--- .../timing/FakeDirectExecutorService.java | 10 +- .../timing/FakeScheduledExecutorService.java | 12 +- 19 files changed, 750 insertions(+), 751 deletions(-) diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java index 44f661c5482..e542123e8fa 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java @@ -48,11 +48,11 @@ public class FirebasePerformanceTestBase { protected static final String FAKE_FIREBASE_DB_URL = "https://fir-perftestapp.firebaseio.com"; protected static final String FAKE_FIREBASE_PROJECT_ID = "fir-perftestapp"; - protected Context context; + protected Context appContext; @Before public void setUpFirebaseApp() { - context = ApplicationProvider.getApplicationContext(); + appContext = ApplicationProvider.getApplicationContext(); FirebaseOptions options = new FirebaseOptions.Builder() .setApplicationId(FAKE_FIREBASE_APPLICATION_ID) @@ -60,7 +60,7 @@ public void setUpFirebaseApp() { .setDatabaseUrl(FAKE_FIREBASE_DB_URL) .setProjectId(FAKE_FIREBASE_PROJECT_ID) .build(); - FirebaseApp.initializeApp(context, options); + FirebaseApp.initializeApp(appContext, options); } @After diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java index fc1456be111..9e3f27447c1 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java @@ -65,22 +65,21 @@ @RunWith(RobolectricTestRunner.class) public class AppStateMonitorTest extends FirebasePerformanceTestBase { - @Mock private Clock mClock; + @Mock private Clock clock; @Mock private TransportManager transportManager; - @Captor private ArgumentCaptor mArgTraceMetric; - @Captor private ArgumentCaptor mArgRate; + @Captor private ArgumentCaptor argTraceMetric; - private long mCurrentTime = 0; + private long currentTime = 0; private Activity activity1; private Activity activity2; @Before public void setUp() { - mCurrentTime = 0; + currentTime = 0; initMocks(this); - doAnswer((Answer) invocationOnMock -> new Timer(mCurrentTime)).when(mClock).getTime(); + doAnswer((Answer) invocationOnMock -> new Timer(currentTime)).when(clock).getTime(); activity1 = createFakeActivity(/* isHardwareAccelerated= */ true); activity2 = createFakeActivity(/* isHardwareAccelerated= */ true); @@ -91,27 +90,27 @@ public void setUp() { @Test public void foregroundBackgroundEvent_activityStateChanges_fgBgEventsCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.incrementCount("counter1", 10); monitor.onActivityResumed(activity1); - Assert.assertEquals(mCurrentTime, monitor.getResumeTime().getMicros()); + Assert.assertEquals(currentTime, monitor.getResumeTime().getMicros()); Assert.assertEquals(1, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); verify(transportManager, times(0)) - .log(mArgTraceMetric.capture(), nullable(ApplicationProcessState.class)); + .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.incrementCount("counter2", 20); monitor.onActivityStopped(activity1); - Assert.assertEquals(mCurrentTime, monitor.getPauseTime().getMicros()); + Assert.assertEquals(currentTime, monitor.getPauseTime().getMicros()); Assert.assertEquals(0, monitor.getResumed().size()); Assert.assertFalse(monitor.isForeground()); - verify(transportManager, times(1)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); - TraceMetric metric = mArgTraceMetric.getValue(); + TraceMetric metric = argTraceMetric.getValue(); Assert.assertEquals(Constants.TraceNames.FOREGROUND_TRACE_NAME.toString(), metric.getName()); Assert.assertEquals(2, metric.getCountersCount()); Assert.assertEquals(1, metric.getPerfSessionsCount()); @@ -128,18 +127,18 @@ public void foregroundBackgroundEvent_activityStateChanges_fgBgEventsCreated() { Assert.assertEquals(0, monitor.getResumed().size()); Assert.assertFalse(monitor.isForeground()); // log() should NOT be called again on second onActivityStopped() call. - verify(transportManager, times(1)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); // activity1 goes to foreground. - mCurrentTime = 3; + currentTime = 3; monitor.incrementCount("counter3", 30); monitor.onActivityResumed(activity1); - Assert.assertEquals(mCurrentTime, monitor.getResumeTime().getMicros()); + Assert.assertEquals(currentTime, monitor.getResumeTime().getMicros()); Assert.assertEquals(1, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); - verify(transportManager, times(2)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(2)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); - metric = mArgTraceMetric.getValue(); + metric = argTraceMetric.getValue(); Assert.assertEquals(Constants.TraceNames.BACKGROUND_TRACE_NAME.toString(), metric.getName()); Assert.assertEquals(1, metric.getCountersCount()); assertThat(metric.getCountersMap()).containsEntry("counter3", 30L); @@ -151,7 +150,7 @@ public void foregroundBackgroundEvent_activityStateChanges_fgBgEventsCreated() { @Test public void testIncrementCount() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); monitor.incrementCount("counter1", 10); monitor.incrementCount("counter2", 20); @@ -162,8 +161,8 @@ public void testIncrementCount() { monitor.onActivityStopped(activity1); verify(transportManager) - .log(mArgTraceMetric.capture(), nullable(ApplicationProcessState.class)); - TraceMetric metric = mArgTraceMetric.getValue(); + .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); + TraceMetric metric = argTraceMetric.getValue(); Map counters = metric.getCountersMap(); Assert.assertEquals(10, (long) counters.get("counter1")); @@ -172,35 +171,35 @@ public void testIncrementCount() { @Test public void testTwoActivities() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); - Assert.assertEquals(mCurrentTime, monitor.getResumeTime().getMicros()); + Assert.assertEquals(currentTime, monitor.getResumeTime().getMicros()); Assert.assertEquals(1, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); verify(transportManager, times(0)) - .log(mArgTraceMetric.capture(), nullable(ApplicationProcessState.class)); + .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); - mCurrentTime = 2; + currentTime = 2; monitor.onActivityResumed(activity2); // second activity becomes visible does not change resumeTime. Assert.assertEquals(1, monitor.getResumeTime().getMicros()); // two activities visible. Assert.assertEquals(2, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); - verify(transportManager, times(0)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(0)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); // activity1 goes to background. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityStopped(activity1); Assert.assertNull(monitor.getPauseTime()); Assert.assertEquals(1, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); - verify(transportManager, times(0)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(0)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); // activity2 goes to background. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityStopped(activity2); // pauseTime updated. Assert.assertEquals(4, monitor.getPauseTime().getMicros()); @@ -208,32 +207,32 @@ public void testTwoActivities() { Assert.assertEquals(0, monitor.getResumed().size()); Assert.assertFalse(monitor.isForeground()); // send foreground trace log. - verify(transportManager, times(1)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); - TraceMetric metric = mArgTraceMetric.getValue(); + TraceMetric metric = argTraceMetric.getValue(); Assert.assertEquals(Constants.TraceNames.FOREGROUND_TRACE_NAME.toString(), metric.getName()); Assert.assertEquals(monitor.getResumeTime().getMicros(), metric.getClientStartTimeUs()); Assert.assertEquals( monitor.getResumeTime().getDurationMicros(monitor.getPauseTime()), metric.getDurationUs()); // activity1 goes to foreground. - mCurrentTime = 5; + currentTime = 5; monitor.onActivityResumed(activity1); // resumeTime updated. - Assert.assertEquals(mCurrentTime, monitor.getResumeTime().getMicros()); + Assert.assertEquals(currentTime, monitor.getResumeTime().getMicros()); Assert.assertEquals(1, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); // send background trace. - verify(transportManager, times(2)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(2)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); - metric = mArgTraceMetric.getValue(); + metric = argTraceMetric.getValue(); Assert.assertEquals(Constants.TraceNames.BACKGROUND_TRACE_NAME.toString(), metric.getName()); Assert.assertEquals(monitor.getPauseTime().getMicros(), metric.getClientStartTimeUs()); Assert.assertEquals( monitor.getPauseTime().getDurationMicros(monitor.getResumeTime()), metric.getDurationUs()); // activity2 goes to foreground. - mCurrentTime = 6; + currentTime = 6; monitor.onActivityResumed(activity2); // resumeTime does not change because this is second activity becomes visible. Assert.assertEquals(5, monitor.getResumeTime().getMicros()); @@ -241,18 +240,18 @@ public void testTwoActivities() { Assert.assertEquals(2, monitor.getResumed().size()); Assert.assertTrue(monitor.isForeground()); // no new event log. - verify(transportManager, times(2)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(2)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); } @Test public void testAppStateCallbackWithTrace() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); - Trace trace = new Trace("TRACE_1", transportManager, mClock, monitor); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); + Trace trace = new Trace("TRACE_1", transportManager, clock, monitor); // Trace is not started yet, default state is APPLICATION_PROCESS_STATE_UNKNOWN Assert.assertEquals( ApplicationProcessState.APPLICATION_PROCESS_STATE_UNKNOWN, trace.getAppState()); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; // registerForAppState() is called by Trace.start(). trace.start(); // Trace started, get state from AppStateMonitor. @@ -261,14 +260,14 @@ public void testAppStateCallbackWithTrace() { Assert.assertTrue(monitor.isForeground()); Assert.assertEquals(FOREGROUND_BACKGROUND, trace.getAppState()); verify(transportManager, times(0)) - .log(mArgTraceMetric.capture(), nullable(ApplicationProcessState.class)); + .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityStopped(activity1); Assert.assertFalse(monitor.isForeground()); // Foreground session trace. - verify(transportManager, times(1)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); // Trace is updated through AppStatCallback. Assert.assertEquals(FOREGROUND_BACKGROUND, trace.getAppState()); @@ -277,35 +276,35 @@ public void testAppStateCallbackWithTrace() { // trace has been through FOREGROUND_BACKGROUND Assert.assertEquals(FOREGROUND_BACKGROUND, trace.getAppState()); // a TraceMetric is sent for this trace object. - verify(transportManager, times(2)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(2)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); - TraceMetric metric = mArgTraceMetric.getValue(); + TraceMetric metric = argTraceMetric.getValue(); Assert.assertEquals("TRACE_1", metric.getName()); } @Test public void testAppStateCallbackWithNetworkRequestMetricBuilder() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); // registerForAppState() is called by NetworkRequestMetricBuilder's constructor. NetworkRequestMetricBuilder builder = new NetworkRequestMetricBuilder( mock(TransportManager.class), monitor, mock(GaugeManager.class)); Assert.assertEquals(ApplicationProcessState.BACKGROUND, builder.getAppState()); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); Assert.assertTrue(monitor.isForeground()); // builder is updated through AppStateCallback. Assert.assertEquals(FOREGROUND_BACKGROUND, builder.getAppState()); verify(transportManager, times(0)) - .log(mArgTraceMetric.capture(), nullable(ApplicationProcessState.class)); + .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityStopped(activity1); Assert.assertFalse(monitor.isForeground()); // Foreground session trace. - verify(transportManager, times(1)).log(mArgTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); + verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND)); // builder is updated again. Assert.assertEquals(FOREGROUND_BACKGROUND, builder.getAppState()); @@ -316,7 +315,7 @@ public void testAppStateCallbackWithNetworkRequestMetricBuilder() { @Test public void testRegisterActivityLifecycleCallbacks() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Context context = mock(Context.class); Application application = mock(Application.class); when(context.getApplicationContext()).thenReturn(application); @@ -330,7 +329,7 @@ public void testRegisterActivityLifecycleCallbacks() { @Test public void testUnregisterActivityLifecycleCallbacks() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Context context = mock(Context.class); Application application = mock(Application.class); when(context.getApplicationContext()).thenReturn(application); @@ -342,7 +341,7 @@ public void testUnregisterActivityLifecycleCallbacks() { @Test public void testUnregisterActivityLifecycleCallbacksBeforeItWasRegistered() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Context context = mock(Context.class); Application application = mock(Application.class); when(context.getApplicationContext()).thenReturn(application); @@ -353,7 +352,7 @@ public void testUnregisterActivityLifecycleCallbacksBeforeItWasRegistered() { @Test public void screenTrace_twoActivities_traceStartedAndStoppedWithActivityLifecycle() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Activity[] arr = {activity1, activity2}; for (int i = 0; i < arr.length; ++i) { @@ -361,10 +360,10 @@ public void screenTrace_twoActivities_traceStartedAndStoppedWithActivityLifecycl // Start and then stop activity to trigger logging of the screen trace int startTime = i * 100; int endTime = startTime + 10; - mCurrentTime = startTime; + currentTime = startTime; monitor.onActivityStarted(activity); assertThat(monitor.getActivity2ScreenTrace()).hasSize(1); - mCurrentTime = endTime; + currentTime = endTime; monitor.onActivityStopped(activity); Assert.assertEquals(0, monitor.getActivity2ScreenTrace().size()); } @@ -372,7 +371,7 @@ public void screenTrace_twoActivities_traceStartedAndStoppedWithActivityLifecycl @Test public void screenTrace_noHardwareAccelerated_traceNotCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Activity activityWithNonHardwareAcceleratedView = createFakeActivity(/* isHardwareAccelerated =*/ false); @@ -385,7 +384,7 @@ public void screenTrace_noHardwareAccelerated_traceNotCreated() { @Test public void screenTrace_perfMonDisabledAtBuildTime_traceNotCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Activity activityWithNonHardwareAcceleratedView = createFakeActivity(/* isHardwareAccelerated =*/ true); ConfigResolver configResolver = ConfigResolver.getInstance(); @@ -403,7 +402,7 @@ public void screenTrace_perfMonDisabledAtBuildTime_traceNotCreated() { @Test public void screenTrace_perfMonEnabledSwitchAtRuntime_traceCreationDependsOnRuntime() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Activity activityWithNonHardwareAcceleratedView = createFakeActivity(/* isHardwareAccelerated =*/ true); ConfigResolver configResolver = ConfigResolver.getInstance(); @@ -418,10 +417,10 @@ public void screenTrace_perfMonEnabledSwitchAtRuntime_traceCreationDependsOnRunt configResolver.setIsPerformanceCollectionEnabled(true); // Assert that screen trace has been created. - mCurrentTime = 100; + currentTime = 100; monitor.onActivityStarted(activityWithNonHardwareAcceleratedView); assertThat(monitor.getActivity2ScreenTrace()).hasSize(1); - mCurrentTime = 200; + currentTime = 200; monitor.onActivityStopped(activityWithNonHardwareAcceleratedView); assertThat(monitor.getActivity2ScreenTrace()).isEmpty(); @@ -437,7 +436,7 @@ public void screenTrace_perfMonEnabledSwitchAtRuntime_traceCreationDependsOnRunt @Test public void screenTrace_perfMonDeactivated_traceNotCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Activity activityWithNonHardwareAcceleratedView = createFakeActivity(/* isHardwareAccelerated =*/ true); ConfigResolver configResolver = ConfigResolver.getInstance(); @@ -459,14 +458,14 @@ public void screenTrace_perfMonDeactivated_traceNotCreated() { @Test public void foregroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground traces has been created because Performance Monitoring is enabled. @@ -476,11 +475,11 @@ public void foregroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { ConfigResolver.getInstance().setIsPerformanceCollectionEnabled(false); // activity1 comes to foreground. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityResumed(activity1); // activity1 goes to background. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground trace is not created because Performance Monitoring is disabled at runtime. @@ -489,7 +488,7 @@ public void foregroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { @Test public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); ConfigResolver configResolver = ConfigResolver.getInstance(); configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService())); @@ -499,11 +498,11 @@ public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() { configResolver.setMetadataBundle(new ImmutableBundle(bundle)); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground trace is not created because Performance Monitoring is disabled at build time. @@ -513,13 +512,13 @@ public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() { configResolver.setIsPerformanceCollectionEnabled(true); // activity1 comes to foreground. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityResumed(activity1); // Background trace has been created because Performance Monitoring is enabled. verify(transportManager, times(1)).log(any(TraceMetric.class), eq(FOREGROUND_BACKGROUND)); // activity1 goes to background. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground trace has been created because Performance Monitoring is enabled. @@ -528,7 +527,7 @@ public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() { @Test public void foreGroundTrace_perfMonDeactivated_traceCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); ConfigResolver configResolver = ConfigResolver.getInstance(); configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService())); @@ -538,11 +537,11 @@ public void foreGroundTrace_perfMonDeactivated_traceCreated() { configResolver.setMetadataBundle(new ImmutableBundle(bundle)); // activity1 comes to foreground. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); // activity1 goes to background. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground trace is not created because Performance Monitoring is deactivated at build time. @@ -552,11 +551,11 @@ public void foreGroundTrace_perfMonDeactivated_traceCreated() { configResolver.setIsPerformanceCollectionEnabled(true); // activity1 comes to foreground. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityResumed(activity1); // activity1 goes to background. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityStopped(activity1); assertThat(monitor.isForeground()).isFalse(); // Foreground trace is not created because deactivation takes higher priority. @@ -565,10 +564,10 @@ public void foreGroundTrace_perfMonDeactivated_traceCreated() { @Test public void backgroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); // activity1 comes to background. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); monitor.onActivityStopped(activity1); // Foreground trace has been created because Performance Monitoring is enabled. @@ -578,18 +577,18 @@ public void backgroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { ConfigResolver.getInstance().setIsPerformanceCollectionEnabled(false); // activity1 goes to foreground. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // Background trace is not created because previously Performance Monitoring was enabled. verify(transportManager, times(1)).log(any(TraceMetric.class), eq(FOREGROUND_BACKGROUND)); // activity1 comes to background. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityStopped(activity1); // activity1 goes to foreground. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // New foreground trace is not created because Performance Monitoring is disabled at runtime. @@ -598,7 +597,7 @@ public void backgroundTrace_perfMonDisabledAtRuntime_traceNotCreated() { @Test public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); ConfigResolver configResolver = ConfigResolver.getInstance(); configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService())); @@ -608,12 +607,12 @@ public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() { configResolver.setMetadataBundle(new ImmutableBundle(bundle)); // activity1 comes to background. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); monitor.onActivityStopped(activity1); // activity1 goes to foreground. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // Background trace is not created because Performance Monitoring is disabled at build time. @@ -623,13 +622,13 @@ public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() { configResolver.setIsPerformanceCollectionEnabled(true); // activity1 comes to background. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityStopped(activity1); // Foreground trace is created because Performance Monitoring is enabled. verify(transportManager, times(1)).log(any(TraceMetric.class), eq(FOREGROUND_BACKGROUND)); // activity1 goes to foreground. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // Background trace is created because Performance Monitoring is enabled. @@ -638,7 +637,7 @@ public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() { @Test public void backgroundTrace_perfMonDeactivated_traceCreated() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); ConfigResolver configResolver = ConfigResolver.getInstance(); configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService())); @@ -648,12 +647,12 @@ public void backgroundTrace_perfMonDeactivated_traceCreated() { configResolver.setMetadataBundle(new ImmutableBundle(bundle)); // activity1 comes to background. - mCurrentTime = 1; + currentTime = 1; monitor.onActivityResumed(activity1); monitor.onActivityStopped(activity1); // activity1 goes to foreground. - mCurrentTime = 2; + currentTime = 2; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // Background trace is not created because Performance Monitoring is deactivated at build time. @@ -663,11 +662,11 @@ public void backgroundTrace_perfMonDeactivated_traceCreated() { configResolver.setIsPerformanceCollectionEnabled(true); // activity1 comes to background. - mCurrentTime = 3; + currentTime = 3; monitor.onActivityStopped(activity1); // activity1 goes to foreground. - mCurrentTime = 4; + currentTime = 4; monitor.onActivityResumed(activity1); assertThat(monitor.isForeground()).isTrue(); // Background trace is not created because deactivation takes higher priority. @@ -676,7 +675,7 @@ public void backgroundTrace_perfMonDeactivated_traceCreated() { @Test public void activityStateChanges_singleClient_callbackIsCalled() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Map clientState = new HashMap<>(); final int client1 = 1; @@ -694,7 +693,7 @@ public void activityStateChanges_singleClient_callbackIsCalled() { @Test public void activityStateChanges_multipleClients_callbackCalledOnEachClient() { - AppStateMonitor monitor = new AppStateMonitor(transportManager, mClock); + AppStateMonitor monitor = new AppStateMonitor(transportManager, clock); Map clientState = new HashMap<>(); final int client1 = 1; diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java index a2e7f3c0180..6cb4313b41e 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java @@ -49,22 +49,22 @@ @RunWith(RobolectricTestRunner.class) public class AppStartTraceTest extends FirebasePerformanceTestBase { - @Mock private Clock mClock; + @Mock private Clock clock; @Mock private TransportManager transportManager; - @Mock private Activity mActivity1; - @Mock private Activity mActivity2; - @Mock private Bundle mBundle; + @Mock private Activity activity1; + @Mock private Activity activity2; + @Mock private Bundle bundle; - private ArgumentCaptor mArguments; + private ArgumentCaptor traceArgumentCaptor; // a mocked current wall-clock time in microseconds. - private long mCurrentTime = 0; + private long currentTime = 0; // wall-clock time in microseconds - private long mAppStartTime; + private long appStartTime; // high resolution time in microseconds - private long mAppStartHRT; + private long appStartHRT; @Before public void setUp() { @@ -73,48 +73,48 @@ public void setUp() { new Answer() { @Override public Timer answer(InvocationOnMock invocationOnMock) throws Throwable { - return new Timer(mCurrentTime); + return new Timer(currentTime); } }) - .when(mClock) + .when(clock) .getTime(); transportManager = mock(TransportManager.class); - mArguments = ArgumentCaptor.forClass(TraceMetric.class); - mAppStartTime = FirebasePerfProvider.getAppStartTime().getMicros(); - mAppStartHRT = FirebasePerfProvider.getAppStartTime().getHighResTime(); + traceArgumentCaptor = ArgumentCaptor.forClass(TraceMetric.class); + appStartTime = FirebasePerfProvider.getAppStartTime().getMicros(); + appStartHRT = FirebasePerfProvider.getAppStartTime().getHighResTime(); } /** Test activity sequentially goes through onCreate()->onStart()->onResume() state change. */ @Test public void testLaunchActivity() { - AppStartTrace trace = new AppStartTrace(transportManager, mClock); + AppStartTrace trace = new AppStartTrace(transportManager, clock); // first activity goes through onCreate()->onStart()->onResume() state change. - mCurrentTime = 1; - trace.onActivityCreated(mActivity1, mBundle); - mCurrentTime = 2; - trace.onActivityStarted(mActivity1); - mCurrentTime = 3; - trace.onActivityResumed(mActivity1); - verifyFinalState(mActivity1, trace, 1, 2, 3); + currentTime = 1; + trace.onActivityCreated(activity1, bundle); + currentTime = 2; + trace.onActivityStarted(activity1); + currentTime = 3; + trace.onActivityResumed(activity1); + verifyFinalState(activity1, trace, 1, 2, 3); // same activity goes through onCreate()->onStart()->onResume() state change again. // should have no effect on AppStartTrace. - mCurrentTime = 4; - trace.onActivityCreated(mActivity1, mBundle); - mCurrentTime = 5; - trace.onActivityStarted(mActivity1); - mCurrentTime = 6; - trace.onActivityResumed(mActivity1); - verifyFinalState(mActivity1, trace, 1, 2, 3); + currentTime = 4; + trace.onActivityCreated(activity1, bundle); + currentTime = 5; + trace.onActivityStarted(activity1); + currentTime = 6; + trace.onActivityResumed(activity1); + verifyFinalState(activity1, trace, 1, 2, 3); // a different activity goes through onCreate()->onStart()->onResume() state change. // should have no effect on AppStartTrace. - mCurrentTime = 7; - trace.onActivityCreated(mActivity2, mBundle); - mCurrentTime = 8; - trace.onActivityStarted(mActivity2); - mCurrentTime = 9; - trace.onActivityResumed(mActivity2); - verifyFinalState(mActivity1, trace, 1, 2, 3); + currentTime = 7; + trace.onActivityCreated(activity2, bundle); + currentTime = 8; + trace.onActivityStarted(activity2); + currentTime = 9; + trace.onActivityResumed(activity2); + verifyFinalState(activity1, trace, 1, 2, 3); } private void verifyFinalState( @@ -124,18 +124,18 @@ private void verifyFinalState( Assert.assertEquals(startTime, trace.getOnStartTime().getMicros()); Assert.assertEquals(resumeTime, trace.getOnResumeTime().getMicros()); verify(transportManager, times(1)) - .log(mArguments.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - TraceMetric metric = mArguments.getValue(); + .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + TraceMetric metric = traceArgumentCaptor.getValue(); Assert.assertEquals(Constants.TraceNames.APP_START_TRACE_NAME.toString(), metric.getName()); - Assert.assertEquals(mAppStartTime, metric.getClientStartTimeUs()); - Assert.assertEquals(resumeTime - mAppStartHRT, metric.getDurationUs()); + Assert.assertEquals(appStartTime, metric.getClientStartTimeUs()); + Assert.assertEquals(resumeTime - appStartHRT, metric.getDurationUs()); Assert.assertEquals(3, metric.getSubtracesCount()); Assert.assertEquals( Constants.TraceNames.ON_CREATE_TRACE_NAME.toString(), metric.getSubtraces(0).getName()); - Assert.assertEquals(mAppStartTime, metric.getSubtraces(0).getClientStartTimeUs()); - Assert.assertEquals(createTime - mAppStartHRT, metric.getSubtraces(0).getDurationUs()); + Assert.assertEquals(appStartTime, metric.getSubtraces(0).getClientStartTimeUs()); + Assert.assertEquals(createTime - appStartHRT, metric.getSubtraces(0).getDurationUs()); Assert.assertEquals( Constants.TraceNames.ON_START_TRACE_NAME.toString(), metric.getSubtraces(1).getName()); @@ -156,69 +156,69 @@ private void verifyFinalState( */ @Test public void testInterleavedActivity() { - AppStartTrace trace = new AppStartTrace(transportManager, mClock); + AppStartTrace trace = new AppStartTrace(transportManager, clock); // first activity onCreate() - mCurrentTime = 1; - trace.onActivityCreated(mActivity1, mBundle); - Assert.assertEquals(mActivity1, trace.getLaunchActivity()); + currentTime = 1; + trace.onActivityCreated(activity1, bundle); + Assert.assertEquals(activity1, trace.getLaunchActivity()); Assert.assertEquals(1, trace.getOnCreateTime().getMicros()); // second activity onCreate(), should not change onCreate time. - mCurrentTime = 2; - trace.onActivityCreated(mActivity2, mBundle); + currentTime = 2; + trace.onActivityCreated(activity2, bundle); Assert.assertEquals(1, trace.getOnCreateTime().getMicros()); // second activity onStart() time is recorded as onStartTime. - mCurrentTime = 3; - trace.onActivityStarted(mActivity2); + currentTime = 3; + trace.onActivityStarted(activity2); Assert.assertEquals(3, trace.getOnStartTime().getMicros()); // second activity onResume() time is recorded as onResumeTime. // and second activity is recorded as AppStartActivity. - mCurrentTime = 4; - trace.onActivityResumed(mActivity2); - Assert.assertEquals(mActivity1, trace.getLaunchActivity()); - Assert.assertEquals(mActivity2, trace.getAppStartActivity()); - verifyFinalState(mActivity2, trace, 1, 3, 4); + currentTime = 4; + trace.onActivityResumed(activity2); + Assert.assertEquals(activity1, trace.getLaunchActivity()); + Assert.assertEquals(activity2, trace.getAppStartActivity()); + verifyFinalState(activity2, trace, 1, 3, 4); // first activity continues. - mCurrentTime = 5; - trace.onActivityStarted(mActivity1); - mCurrentTime = 6; - trace.onActivityResumed(mActivity1); - verifyFinalState(mActivity2, trace, 1, 3, 4); + currentTime = 5; + trace.onActivityStarted(activity1); + currentTime = 6; + trace.onActivityResumed(activity1); + verifyFinalState(activity2, trace, 1, 3, 4); } @Test public void testDelayedAppStart() { - AppStartTrace trace = new AppStartTrace(transportManager, mClock); + AppStartTrace trace = new AppStartTrace(transportManager, clock); // Delays activity creation after 1 minute from app start time. - mCurrentTime = mAppStartTime + TimeUnit.MINUTES.toMicros(1) + 1; - trace.onActivityCreated(mActivity1, mBundle); - Assert.assertEquals(mCurrentTime, trace.getOnCreateTime().getMicros()); - ++mCurrentTime; - trace.onActivityStarted(mActivity1); - ++mCurrentTime; - trace.onActivityResumed(mActivity1); + currentTime = appStartTime + TimeUnit.MINUTES.toMicros(1) + 1; + trace.onActivityCreated(activity1, bundle); + Assert.assertEquals(currentTime, trace.getOnCreateTime().getMicros()); + ++currentTime; + trace.onActivityStarted(activity1); + ++currentTime; + trace.onActivityResumed(activity1); Assert.assertNull(trace.getOnStartTime()); Assert.assertNull(trace.getOnResumeTime()); // There should be no trace sent. verify(transportManager, times(0)) - .log(mArguments.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); } @Test public void testStartFromBackground() { - AppStartTrace trace = new AppStartTrace(transportManager, mClock); + AppStartTrace trace = new AppStartTrace(transportManager, clock); trace.setIsStartFromBackground(); - trace.onActivityCreated(mActivity1, mBundle); + trace.onActivityCreated(activity1, bundle); Assert.assertNull(trace.getOnCreateTime()); - ++mCurrentTime; - trace.onActivityStarted(mActivity1); + ++currentTime; + trace.onActivityStarted(activity1); Assert.assertNull(trace.getOnStartTime()); - ++mCurrentTime; - trace.onActivityResumed(mActivity1); + ++currentTime; + trace.onActivityResumed(activity1); Assert.assertNull(trace.getOnResumeTime()); // There should be no trace sent. verify(transportManager, times(0)) - .log(mArguments.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); } @Test diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java index 84e04dafe24..63c4bf0c99a 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java @@ -41,37 +41,37 @@ public class HttpMetricTest extends FirebasePerformanceTestBase { @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn(1000L); - when(mTimer.getDurationMicros()).thenReturn(2000L).thenReturn(3000L); + when(timer.getMicros()).thenReturn(1000L); + when(timer.getDurationMicros()).thenReturn(2000L).thenReturn(3000L); } @Test public void startStop() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - verifyMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + verifyMetric(networkArgumentCaptor.getValue()); } @Test public void setHttpResponseCode() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.setHttpResponseCode(200); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getHttpResponseCode()).isEqualTo(200); } @@ -79,13 +79,13 @@ public void setHttpResponseCode() { @Test public void setRequestSize() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.setRequestPayloadSize(256); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getRequestPayloadBytes()).isEqualTo(256); } @@ -93,13 +93,13 @@ public void setRequestSize() { @Test public void setResponseSize() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.setResponsePayloadSize(256); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getResponsePayloadBytes()).isEqualTo(256); } @@ -107,13 +107,13 @@ public void setResponseSize() { @Test public void setResponseContentType() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.setResponseContentType("text/html"); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getResponseContentType()).isEqualTo("text/html"); } @@ -121,13 +121,13 @@ public void setResponseContentType() { @Test public void markRequestComplete() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.markRequestComplete(); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -139,13 +139,13 @@ public void markRequestComplete() { @Test public void markResponseStart() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.markResponseStart(); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -157,13 +157,13 @@ public void markResponseStart() { @Test public void putAttribute() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.putAttribute("attr1", "free"); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -176,13 +176,13 @@ public void putAttribute() { @Test public void putInvalidAttribute() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.putAttribute("_invalidattr1", "free"); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -194,13 +194,13 @@ public void putInvalidAttribute() { @Test public void putAttributeAfterHttpMetricIsStopped() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.stop(); metric.putAttribute("attr1", "free"); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -212,7 +212,7 @@ public void putAttributeAfterHttpMetricIsStopped() { @Test public void removeAttribute() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.putAttribute("attr1", "free"); Map attributes = metric.getAttributes(); @@ -222,8 +222,8 @@ public void removeAttribute() { assertThat(attributes.size()).isEqualTo(0); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -235,14 +235,14 @@ public void removeAttribute() { @Test public void removeAttributeAfterStopped() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.putAttribute("attr1", "free"); metric.stop(); metric.removeAttribute("attr1"); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -255,14 +255,14 @@ public void removeAttributeAfterStopped() { @Test public void addAttributeWithSameName() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); metric.putAttribute("attr1", "free"); metric.putAttribute("attr1", "paid"); metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -275,7 +275,7 @@ public void addAttributeWithSameName() { @Test public void testMaxAttributes() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); for (int i = 0; i <= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES; i++) { metric.putAttribute("dim" + i, "value" + i); @@ -285,8 +285,8 @@ public void testMaxAttributes() { } metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); @@ -304,15 +304,15 @@ public void testMaxAttributes() { @Test public void testMoreThanMaxAttributes() { HttpMetric metric = - new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, mTimer); + new HttpMetric("https://www.google.com/", HttpMethod.GET, transportManager, timer); metric.start(); for (int i = 0; i <= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES; i++) { metric.putAttribute("dim" + i, "value" + i); } metric.stop(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); - NetworkRequestMetric metricValue = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) .isEqualTo(com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod.GET); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java index fc1ff2d9c1c..8530d1ebdad 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java @@ -48,12 +48,12 @@ public class NetworkRequestMetricBuilderTest extends FirebasePerformanceTestBase @Mock private GaugeManager mockGaugeManager; @Mock private AppStateMonitor mockAppStateMonitor; - private NetworkRequestMetricBuilder builder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { initMocks(this); - builder = + networkRequestBuilder = new NetworkRequestMetricBuilder( mockTransportManager, mockAppStateMonitor, mockGaugeManager); } @@ -61,127 +61,127 @@ public void setUp() { @Test public void testSetUrl() { String url = "www.google.com"; - NetworkRequestMetric metric = builder.setUrl(url).build(); + NetworkRequestMetric metric = networkRequestBuilder.setUrl(url).build(); assertThat(metric.getUrl()).isEqualTo(url); } @Test public void testIsReportSent() { - assertThat(builder.isReportSent()).isFalse(); + assertThat(networkRequestBuilder.isReportSent()).isFalse(); } @Test public void testSetReportSent() { - builder.setReportSent(); - assertThat(builder.isReportSent()).isTrue(); + networkRequestBuilder.setReportSent(); + assertThat(networkRequestBuilder.isReportSent()).isTrue(); } @Test public void testSetHttpMethod() { String type = "GET"; - NetworkRequestMetric metric = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.GET); type = "PUT"; - NetworkRequestMetric metric1 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric1 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric1.getHttpMethod()).isEqualTo(HttpMethod.PUT); type = "POST"; - NetworkRequestMetric metric2 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric2 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric2.getHttpMethod()).isEqualTo(HttpMethod.POST); type = "DELETE"; - NetworkRequestMetric metric3 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric3 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric3.getHttpMethod()).isEqualTo(HttpMethod.DELETE); type = "POST"; - NetworkRequestMetric metric4 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric4 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric4.getHttpMethod()).isEqualTo(HttpMethod.POST); type = "HEAD"; - NetworkRequestMetric metric5 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric5 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric5.getHttpMethod()).isEqualTo(HttpMethod.HEAD); type = "PATCH"; - NetworkRequestMetric metric6 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric6 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric6.getHttpMethod()).isEqualTo(HttpMethod.PATCH); type = "OPTIONS"; - NetworkRequestMetric metric7 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric7 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric7.getHttpMethod()).isEqualTo(HttpMethod.OPTIONS); type = "TRACE"; - NetworkRequestMetric metric8 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric8 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric8.getHttpMethod()).isEqualTo(HttpMethod.TRACE); type = "CONNECT"; - NetworkRequestMetric metric9 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric9 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric9.getHttpMethod()).isEqualTo(HttpMethod.CONNECT); type = "UNKNOWN"; - NetworkRequestMetric metric10 = builder.setHttpMethod(type).build(); + NetworkRequestMetric metric10 = networkRequestBuilder.setHttpMethod(type).build(); assertThat(metric10.getHttpMethod()).isEqualTo(HttpMethod.HTTP_METHOD_UNKNOWN); } @Test public void testSetRequestPayloadBytes() { long bytes = 256; - NetworkRequestMetric metric = builder.setRequestPayloadBytes(bytes).build(); + NetworkRequestMetric metric = networkRequestBuilder.setRequestPayloadBytes(bytes).build(); assertThat(metric.getRequestPayloadBytes()).isEqualTo(bytes); } @Test public void testSetResponsePayloadBytes() { long bytes = 256; - NetworkRequestMetric metric = builder.setResponsePayloadBytes(bytes).build(); + NetworkRequestMetric metric = networkRequestBuilder.setResponsePayloadBytes(bytes).build(); assertThat(metric.getResponsePayloadBytes()).isEqualTo(bytes); } @Test public void testSetHttpResponseCode() { int code = 200; - NetworkRequestMetric metric = builder.setHttpResponseCode(code).build(); + NetworkRequestMetric metric = networkRequestBuilder.setHttpResponseCode(code).build(); assertThat(metric.getHttpResponseCode()).isEqualTo(code); } @Test public void testSetResponseContentType() { String contentType = "text/html"; - NetworkRequestMetric metric = builder.setResponseContentType(contentType).build(); + NetworkRequestMetric metric = networkRequestBuilder.setResponseContentType(contentType).build(); assertThat(metric.getResponseContentType()).isEqualTo(contentType); } @Test public void testSetRequestStartTimeMicros() { long time = 2000; - NetworkRequestMetric metric = builder.setRequestStartTimeMicros(time).build(); + NetworkRequestMetric metric = networkRequestBuilder.setRequestStartTimeMicros(time).build(); assertThat(metric.getClientStartTimeUs()).isEqualTo(time); } @Test public void testSetRequestEndTimeMicros() { long time = 2000; - NetworkRequestMetric metric = builder.setTimeToRequestCompletedMicros(time).build(); + NetworkRequestMetric metric = networkRequestBuilder.setTimeToRequestCompletedMicros(time).build(); assertThat(metric.getTimeToRequestCompletedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseInitiatedMicros() { long time = 2000; - NetworkRequestMetric metric = builder.setTimeToResponseInitiatedMicros(time).build(); + NetworkRequestMetric metric = networkRequestBuilder.setTimeToResponseInitiatedMicros(time).build(); assertThat(metric.getTimeToResponseInitiatedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseCompletedMicros() { long time = 2000; - NetworkRequestMetric metric = builder.setTimeToResponseCompletedMicros(time).build(); + NetworkRequestMetric metric = networkRequestBuilder.setTimeToResponseCompletedMicros(time).build(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(time); } @Test public void testAllNullFields() { - NetworkRequestMetric metric = builder.build(); + NetworkRequestMetric metric = networkRequestBuilder.build(); assertThat(metric.hasUrl()).isFalse(); assertThat(metric.hasHttpMethod()).isFalse(); @@ -198,19 +198,19 @@ public void testAllNullFields() { @Test public void testNoSessionIdsInNetworkRequestMetricWhenNotStarted() { - builder.setUrl(/* url= */ "www.google.com"); + networkRequestBuilder.setUrl(/* url= */ "www.google.com"); - assertThat(builder.getSessions()).isNotNull(); - assertThat(builder.getSessions()).isEmpty(); + assertThat(networkRequestBuilder.getSessions()).isNotNull(); + assertThat(networkRequestBuilder.getSessions()).isEmpty(); } @Test public void testSessionIdsInNetworkRequestMetricAfterStarted() { - builder.setUrl(/* url= */ "www.google.com"); - builder.setRequestStartTimeMicros(/* time= */ 2000); + networkRequestBuilder.setUrl(/* url= */ "www.google.com"); + networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).isNotNull(); - assertThat(builder.getSessions()).isNotEmpty(); + assertThat(networkRequestBuilder.getSessions()).isNotNull(); + assertThat(networkRequestBuilder.getSessions()).isNotEmpty(); } @Test @@ -219,8 +219,8 @@ public void testSessionIdAdditionInNetworkRequestMetric() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).isNotNull(); - assertThat(builder.getSessions()).isEmpty(); + assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); + assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); SessionManager.getInstance().updatePerfSession(ApplicationProcessState.FOREGROUND); @@ -234,8 +234,8 @@ public void testSessionIdNotAddedIfPerfSessionIsNull() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).isNotNull(); - assertThat(builder.getSessions()).isEmpty(); + assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); + assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); @@ -251,8 +251,8 @@ public void testSessionIdNotAddedForBackgroundInNetworkRequestMetric() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).isNotNull(); - assertThat(builder.getSessions()).isEmpty(); + assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); + assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.BACKGROUND); @@ -262,7 +262,7 @@ public void testSessionIdNotAddedForBackgroundInNetworkRequestMetric() { @Test public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSession() { forceVerboseSession(); - builder.setRequestStartTimeMicros(2000).build(); + networkRequestBuilder.setRequestStartTimeMicros(2000).build(); verify(mockGaugeManager).collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -270,7 +270,7 @@ public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSe public void testSetRequestStartTimeMicrosDoesNotSingleTriggerGaugeCollectionOnNonVerboseSession() { forceNonVerboseSession(); - builder.setRequestStartTimeMicros(2000).build(); + networkRequestBuilder.setRequestStartTimeMicros(2000).build(); verify(mockGaugeManager, never()) .collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -278,7 +278,7 @@ public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSe @Test public void testSetTimeToResponseCompletedMicrosTriggerSingleGaugeCollectionOnVerboseSession() { forceVerboseSession(); - builder.setTimeToResponseCompletedMicros(3000).build(); + networkRequestBuilder.setTimeToResponseCompletedMicros(3000).build(); verify(mockGaugeManager).collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -286,70 +286,70 @@ public void testSetTimeToResponseCompletedMicrosTriggerSingleGaugeCollectionOnVe public void testSetTimeToResponseCompletedMicrosDoesNotTriggerSingleGaugeCollectionOnNonVerboseSession() { forceNonVerboseSession(); - builder.setTimeToResponseCompletedMicros(3000).build(); + networkRequestBuilder.setTimeToResponseCompletedMicros(3000).build(); verify(mockGaugeManager, never()) .collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @Test public void testSettingInvalidContentType() { - builder.clearBuilderFields(); - builder.setResponseContentType(""); - assertThat(builder.build().hasResponseContentType()).isTrue(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType(""); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); - builder.clearBuilderFields(); - builder.setResponseContentType("a\u001f"); - assertThat(builder.build().hasResponseContentType()).isFalse(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType("a\u001f"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); - builder.clearBuilderFields(); - builder.setResponseContentType("a\u0020"); - assertThat(builder.build().hasResponseContentType()).isTrue(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType("a\u0020"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); - builder.clearBuilderFields(); - builder.setResponseContentType("a\u007f"); - assertThat(builder.build().hasResponseContentType()).isTrue(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType("a\u007f"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); - builder.clearBuilderFields(); - builder.setResponseContentType("a\u0080"); - assertThat(builder.build().hasResponseContentType()).isFalse(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType("a\u0080"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); byte[] bytes = new byte[Constants.MAX_CONTENT_TYPE_LENGTH]; Arrays.fill(bytes, (byte) 'x'); String str = new String(bytes, StandardCharsets.UTF_8); - builder.clearBuilderFields(); - builder.setResponseContentType(str); - assertThat(builder.build().hasResponseContentType()).isTrue(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType(str); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); - builder.clearBuilderFields(); - builder.setResponseContentType(str + "x"); - assertThat(builder.build().hasResponseContentType()).isFalse(); + networkRequestBuilder.clearBuilderFields(); + networkRequestBuilder.setResponseContentType(str + "x"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); } @Test public void testSettingNullForContentTypeClearsIt() { - builder.setResponseContentType("application/json"); - assertThat(builder.build().hasResponseContentType()).isTrue(); + networkRequestBuilder.setResponseContentType("application/json"); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); - builder.setResponseContentType(null); - assertThat(builder.build().hasResponseContentType()).isFalse(); + networkRequestBuilder.setResponseContentType(null); + assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); } @Test public void testUpdateSessionWithValidSessionIsAdded() { - builder.setRequestStartTimeMicros(/* time= */ 2000); + networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).hasSize(1); - builder.updateSession(PerfSession.create()); - assertThat(builder.getSessions()).hasSize(2); + assertThat(networkRequestBuilder.getSessions()).hasSize(1); + networkRequestBuilder.updateSession(PerfSession.create()); + assertThat(networkRequestBuilder.getSessions()).hasSize(2); } @Test public void testUpdateSessionWithNullIsNotAdded() { - builder.setRequestStartTimeMicros(/* time= */ 2000); + networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(builder.getSessions()).hasSize(1); - builder.updateSession(null); - assertThat(builder.getSessions()).hasSize(1); + assertThat(networkRequestBuilder.getSessions()).hasSize(1); + networkRequestBuilder.updateSession(null); + assertThat(networkRequestBuilder.getSessions()).hasSize(1); } } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceMetricBuilderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceMetricBuilderTest.java index c8c677412ad..fc019c51ce0 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceMetricBuilderTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceMetricBuilderTest.java @@ -44,35 +44,35 @@ public class TraceMetricBuilderTest extends FirebasePerformanceTestBase { private static final String TRACE_ATTRIBUTE_KEY = "TRACE_ATTRIBUTE_KEY"; private static final String TRACE_ATTRIBUTE_VALUE = "TRACE_ATTRIBUTE_VALUE"; - private long mCurrentTime = 0; + private long currentTime = 0; - @Mock private Clock mClock; + @Mock private Clock clock; @Mock private TransportManager transportManager; - @Mock private AppStateMonitor mAppStateMonitor; + @Mock private AppStateMonitor appStateMonitor; @Before public void setUp() { - mCurrentTime = 0; + currentTime = 0; initMocks(this); doAnswer( new Answer() { @Override public Timer answer(InvocationOnMock invocationOnMock) throws Throwable { - return new Timer(mCurrentTime); + return new Timer(currentTime); } }) - .when(mClock) + .when(clock) .getTime(); } @Test public void testJustStartAndStopWithoutCheckpointsAndCounters() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -85,15 +85,15 @@ public void testJustStartAndStopWithoutCheckpointsAndCounters() { @Test public void testAddingCountersWithStartAndStop() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); trace.incrementMetric(METRIC_1, 1); trace.incrementMetric(METRIC_1, 1); trace.incrementMetric(METRIC_2, 1); trace.incrementMetric(METRIC_2, 1); trace.incrementMetric(METRIC_2, 1); - mCurrentTime = 2; + currentTime = 2; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -111,13 +111,13 @@ public void testAddingCountersWithStartAndStop() { @Test public void testIncrementingCounterByX() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); trace.incrementMetric(METRIC_1, 5); trace.incrementMetric(METRIC_2, 1); trace.incrementMetric(METRIC_2, 10); - mCurrentTime = 2; + currentTime = 2; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -135,12 +135,12 @@ public void testIncrementingCounterByX() { @Test public void testAddingSubtraceWithStartAndStop() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); - mCurrentTime = 3; + currentTime = 3; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -159,17 +159,17 @@ public void testAddingSubtraceWithStartAndStop() { @Test public void testAddingSubtraceAndCountersWithStartAndStop() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); trace.incrementMetric(METRIC_1, 1); trace.incrementMetric(METRIC_1, 1); trace.incrementMetric(METRIC_2, 1); trace.incrementMetric(METRIC_2, 1); trace.incrementMetric(METRIC_2, 1); - mCurrentTime = 3; + currentTime = 3; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -194,13 +194,13 @@ public void testAddingSubtraceAndCountersWithStartAndStop() { @Test public void testAddingCustomAttributes() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); trace.putAttribute(TRACE_ATTRIBUTE_KEY, TRACE_ATTRIBUTE_VALUE); - mCurrentTime = 3; + currentTime = 3; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); Assert.assertEquals(TRACE_1, traceMetric.getName()); @@ -213,14 +213,14 @@ public void testAddingCustomAttributesBeforeStartAfterStop() { String beforeStart = "beforeStart"; String afterStart = "afterStart"; String afterStop = "afterStop"; - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.putAttribute(TRACE_ATTRIBUTE_KEY + beforeStart, TRACE_ATTRIBUTE_VALUE + beforeStart); trace.startStage(TRACE_2); trace.putAttribute(TRACE_ATTRIBUTE_KEY + afterStart, TRACE_ATTRIBUTE_VALUE + afterStart); - mCurrentTime = 3; + currentTime = 3; trace.stop(); trace.putAttribute(TRACE_ATTRIBUTE_KEY + afterStop, TRACE_ATTRIBUTE_VALUE + afterStop); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -235,10 +235,10 @@ public void testAddingCustomAttributesBeforeStartAfterStop() { @Test public void testAddingMoreThanMaxLocalAttributes() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; for (int i = 0; i <= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES; i++) { trace.putAttribute(TRACE_ATTRIBUTE_KEY + i, TRACE_ATTRIBUTE_VALUE + i); } @@ -256,13 +256,13 @@ public void testAddingMoreThanMaxLocalAttributes() { @Test public void testRemovingCustomAttributes() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); trace.putAttribute(TRACE_ATTRIBUTE_KEY, TRACE_ATTRIBUTE_VALUE); - mCurrentTime = 3; + currentTime = 3; trace.removeAttribute(TRACE_ATTRIBUTE_KEY); trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -272,12 +272,12 @@ public void testRemovingCustomAttributes() { @Test public void testAddingAttributeWithNullKey() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.putAttribute(null, TRACE_ATTRIBUTE_VALUE); - mCurrentTime = 3; + currentTime = 3; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); Assert.assertEquals(TRACE_1, traceMetric.getName()); @@ -286,12 +286,12 @@ public void testAddingAttributeWithNullKey() { @Test public void testAddingAttributeWithNullValue() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.putAttribute(TRACE_ATTRIBUTE_KEY, null); - mCurrentTime = 3; + currentTime = 3; trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); Assert.assertEquals(TRACE_1, traceMetric.getName()); @@ -300,13 +300,13 @@ public void testAddingAttributeWithNullValue() { @Test public void testRemovingNonExistingCustomAttributes() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); trace.putAttribute(TRACE_ATTRIBUTE_KEY, TRACE_ATTRIBUTE_VALUE); - mCurrentTime = 3; + currentTime = 3; trace.removeAttribute(TRACE_ATTRIBUTE_KEY + "NonExisting"); trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); @@ -317,13 +317,13 @@ public void testRemovingNonExistingCustomAttributes() { @Test public void testUpdatingCustomAttributes() { - Trace trace = new Trace(TRACE_1, transportManager, mClock, mAppStateMonitor); - mCurrentTime = 1; + Trace trace = new Trace(TRACE_1, transportManager, clock, appStateMonitor); + currentTime = 1; trace.start(); - mCurrentTime = 2; + currentTime = 2; trace.startStage(TRACE_2); trace.putAttribute(TRACE_ATTRIBUTE_KEY, TRACE_ATTRIBUTE_VALUE); - mCurrentTime = 3; + currentTime = 3; trace.putAttribute(TRACE_ATTRIBUTE_KEY, TRACE_ATTRIBUTE_VALUE + "New"); trace.stop(); TraceMetric traceMetric = new TraceMetricBuilder(trace).build(); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java index 63b27f3261e..210a33cd7f4 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java @@ -43,9 +43,9 @@ @RunWith(RobolectricTestRunner.class) public class FirebasePerfTraceValidatorTest extends FirebasePerformanceTestBase { - private long mCurrentTime = 0; + private long currentTime = 0; - @Mock private Clock mClock; + @Mock private Clock clock; @Before public void setUp() { @@ -54,10 +54,10 @@ public void setUp() { new Answer() { @Override public Timer answer(InvocationOnMock invocationOnMock) throws Throwable { - return new Timer(mCurrentTime); + return new Timer(currentTime); } }) - .when(mClock) + .when(clock) .getTime(); } @@ -243,10 +243,10 @@ private TraceMetric.Builder createValidTraceMetric() { AppStateMonitor appStateMonitor = mock(AppStateMonitor.class); ArgumentCaptor argMetric = ArgumentCaptor.forClass(TraceMetric.class); - Trace trace = new Trace(traceName, transportManager, mClock, appStateMonitor); - mCurrentTime = expectedClientStartTime; + Trace trace = new Trace(traceName, transportManager, clock, appStateMonitor); + currentTime = expectedClientStartTime; trace.start(); - mCurrentTime += expectedTraceDuration; + currentTime += expectedTraceDuration; trace.stop(); verify(transportManager) .log(argMetric.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java index 47704d0444a..0fb53cf81e8 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java @@ -63,14 +63,14 @@ public class FirebasePerfHttpClientTest extends FirebasePerformanceTestBase { private interface ResponseHandlerInterface extends ResponseHandler {} @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); } @Test @@ -81,13 +81,13 @@ public void testExecuteRequest() throws IOException, URISyntaxException { when(client.execute(request)).thenReturn(response); HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, request, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, timer, transportManager); assertSame(httpResponse, response); - verify(mTimer).reset(); + verify(timer).reset(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -100,13 +100,13 @@ public void testExecuteRequestContext() throws IOException, URISyntaxException { when(client.execute(request, context)).thenReturn(response); HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, request, context, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, context, timer, transportManager); assertSame(httpResponse, response); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -119,13 +119,13 @@ public void testExecuteHostRequest() throws IOException, URISyntaxException { when(client.execute(host, request)).thenReturn(response); HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, host, request, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, timer, transportManager); assertSame(httpResponse, response); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -139,13 +139,13 @@ public void testExecuteHostRequestContext() throws IOException, URISyntaxExcepti when(client.execute(host, request, c)).thenReturn(response); HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, host, request, c, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, c, timer, transportManager); assertSame(httpResponse, response); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -155,13 +155,13 @@ public void testRequestHandler() throws IOException, URISyntaxException { HttpUriRequest request = mockHttpUriRequest(); ResponseHandler handler = mock(ResponseHandlerInterface.class); - FirebasePerfHttpClient.execute(client, request, handler, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, handler, timer, transportManager); ArgumentCaptor argRequest = ArgumentCaptor.forClass(HttpUriRequest.class); ArgumentCaptor argHandler = ArgumentCaptor.forClass(ResponseHandlerInterface.class); verify(client).execute(argRequest.capture(), argHandler.capture()); - verify(mTimer).reset(); + verify(timer).reset(); assertSame(argRequest.getValue(), request); assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler); } @@ -173,14 +173,14 @@ public void testRequestHandlerContext() throws IOException, URISyntaxException { HttpContext context = mock(HttpContext.class); ResponseHandler handler = mock(ResponseHandlerInterface.class); - FirebasePerfHttpClient.execute(client, request, handler, context, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, handler, context, timer, transportManager); ArgumentCaptor argRequest = ArgumentCaptor.forClass(HttpUriRequest.class); ArgumentCaptor argHandler = ArgumentCaptor.forClass(ResponseHandlerInterface.class); ArgumentCaptor argContext = ArgumentCaptor.forClass(HttpContext.class); verify(client).execute(argRequest.capture(), argHandler.capture(), argContext.capture()); - verify(mTimer).reset(); + verify(timer).reset(); assertSame(argRequest.getValue(), request); assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler); assertSame(argContext.getValue(), context); @@ -193,14 +193,14 @@ public void testHostRequestHandler() throws IOException, URISyntaxException { HttpHost host = mockHttpHost(); ResponseHandler handler = mock(ResponseHandlerInterface.class); - FirebasePerfHttpClient.execute(client, host, request, handler, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, handler, timer, transportManager); ArgumentCaptor argHost = ArgumentCaptor.forClass(HttpHost.class); ArgumentCaptor argRequest = ArgumentCaptor.forClass(HttpRequest.class); ArgumentCaptor argHandler = ArgumentCaptor.forClass(ResponseHandlerInterface.class); verify(client).execute(argHost.capture(), argRequest.capture(), argHandler.capture()); - verify(mTimer).reset(); + verify(timer).reset(); assertSame(argHost.getValue(), host); assertSame(argRequest.getValue(), request); assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler); @@ -215,7 +215,7 @@ public void testHostRequestHandlerContext() throws IOException, URISyntaxExcepti ResponseHandler handler = mock(ResponseHandlerInterface.class); FirebasePerfHttpClient.execute( - client, host, request, handler, context, mTimer, transportManager); + client, host, request, handler, context, timer, transportManager); ArgumentCaptor argHost = ArgumentCaptor.forClass(HttpHost.class); ArgumentCaptor argRequest = ArgumentCaptor.forClass(HttpRequest.class); @@ -225,7 +225,7 @@ public void testHostRequestHandlerContext() throws IOException, URISyntaxExcepti verify(client) .execute( argHost.capture(), argRequest.capture(), argHandler.capture(), argContext.capture()); - verify(mTimer).reset(); + verify(timer).reset(); assertSame(argHost.getValue(), host); assertSame(argRequest.getValue(), request); assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler); @@ -244,13 +244,13 @@ public void testExecuteRequestError() throws IOException, URISyntaxException { IOException.class, () -> { HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, request, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, timer, transportManager); assertSame(httpResponse, response); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -267,13 +267,13 @@ public void testExecuteRequestContextError() throws IOException, URISyntaxExcept IOException.class, () -> { HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, request, context, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, context, timer, transportManager); assertSame(httpResponse, response); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -290,13 +290,13 @@ public void testExecuteHostRequestError() throws IOException, URISyntaxException IOException.class, () -> { HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, host, request, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, timer, transportManager); assertSame(httpResponse, response); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -314,14 +314,14 @@ public void testExecuteHostRequestContextError() throws IOException, URISyntaxEx IOException.class, () -> { HttpResponse httpResponse = - FirebasePerfHttpClient.execute(client, host, request, c, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, c, timer, transportManager); assertSame(httpResponse, response); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -337,12 +337,12 @@ public void testRequestHandlerError() throws IOException, URISyntaxException { assertThrows( IOException.class, () -> { - FirebasePerfHttpClient.execute(client, request, handler, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, request, handler, timer, transportManager); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -362,12 +362,12 @@ public void testRequestHandlerContextError() throws IOException, URISyntaxExcept IOException.class, () -> { FirebasePerfHttpClient.execute( - client, request, handler, context, mTimer, transportManager); + client, request, handler, context, timer, transportManager); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -386,12 +386,12 @@ public void testHostRequestHandlerError() throws IOException, URISyntaxException assertThrows( IOException.class, () -> { - FirebasePerfHttpClient.execute(client, host, request, handler, mTimer, transportManager); + FirebasePerfHttpClient.execute(client, host, request, handler, timer, transportManager); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } @@ -413,12 +413,12 @@ public void testHostRequestHandlerContextError() throws IOException, URISyntaxEx IOException.class, () -> { FirebasePerfHttpClient.execute( - client, host, request, handler, context, mTimer, transportManager); + client, host, request, handler, context, timer, transportManager); }); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verify(mTimer).reset(); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verify(timer).reset(); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetricWithError(metric); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfOkHttpClientTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfOkHttpClientTest.java index 4c51052dfa1..77a14766b0a 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfOkHttpClientTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfOkHttpClientTest.java @@ -46,7 +46,7 @@ public class FirebasePerfOkHttpClientTest extends FirebasePerformanceTestBase { @Mock TransportManager transportManager; - @Captor ArgumentCaptor mArgMetric; + @Captor ArgumentCaptor networkArgumentCaptor; @Before public void setUp() { @@ -79,8 +79,8 @@ public void testSendMetric() throws IOException { response, builder, startTimeMicros, responseCompletedTimeMicros); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.POST); assertThat(metric.getRequestPayloadBytes()).isEqualTo(requestStr.length()); @@ -117,8 +117,8 @@ public void testSendMetricWithQueryURL() throws IOException { response, builder, startTimeMicros, responseCompletedTimeMicros); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.POST); assertThat(metric.getRequestPayloadBytes()).isEqualTo(requestStr.length()); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java index f108fe34625..e161aa19436 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java @@ -44,14 +44,14 @@ public class FirebasePerfUrlConnectionTest extends FirebasePerformanceTestBase { @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); } @Test @@ -61,12 +61,12 @@ public void testOpenStreamHttpConnectionError() throws IOException { when(wrapper.openConnection()).thenThrow(IOException.class); try { - FirebasePerfUrlConnection.openStream(wrapper, transportManager, mTimer); + FirebasePerfUrlConnection.openStream(wrapper, transportManager, timer); fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } } @@ -78,12 +78,12 @@ public void testGetContentError() throws IOException { when(wrapper.openConnection()).thenThrow(IOException.class); try { - FirebasePerfUrlConnection.getContent(wrapper, transportManager, mTimer); + FirebasePerfUrlConnection.getContent(wrapper, transportManager, timer); fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } } @@ -97,12 +97,12 @@ public void testGetContentClasses() throws IOException { when(wrapper.openConnection()).thenThrow(IOException.class); try { - FirebasePerfUrlConnection.getContent(wrapper, classes, transportManager, mTimer); + FirebasePerfUrlConnection.getContent(wrapper, classes, transportManager, timer); fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java index 9fa0b3401cb..ba74063052f 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java @@ -46,24 +46,24 @@ public class InstrHttpInputStreamTest extends FirebasePerformanceTestBase { @Mock InputStream mInputStream; @Mock TransportManager transportManager; - @Mock Timer mTimer; - @Captor ArgumentCaptor mArgMetric; + @Mock Timer timer; + @Captor ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder mBuilder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); - mBuilder = NetworkRequestMetricBuilder.builder(transportManager); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); + networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testAvailable() throws IOException { int availableVal = 7; when(mInputStream.available()).thenReturn(availableVal); - int ret = new InstrHttpInputStream(mInputStream, mBuilder, mTimer).available(); + int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).available(); assertThat(ret).isEqualTo(availableVal); verify(mInputStream).available(); @@ -71,19 +71,19 @@ public void testAvailable() throws IOException { @Test public void testClose() throws IOException { - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).close(); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).close(); verify(mInputStream).close(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - assertThat(mArgMetric.getValue().getTimeToResponseCompletedUs()).isEqualTo(2000); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + assertThat(networkArgumentCaptor.getValue().getTimeToResponseCompletedUs()).isEqualTo(2000); } @Test public void testMark() throws IOException { int markInput = 256; - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).mark(markInput); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).mark(markInput); verify(mInputStream).mark(markInput); } @@ -91,7 +91,7 @@ public void testMark() throws IOException { @Test public void testMarkSupported() throws IOException { when(mInputStream.markSupported()).thenReturn(true); - boolean ret = new InstrHttpInputStream(mInputStream, mBuilder, mTimer).markSupported(); + boolean ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).markSupported(); assertThat(ret).isTrue(); verify(mInputStream).markSupported(); @@ -101,7 +101,7 @@ public void testMarkSupported() throws IOException { public void testRead() throws IOException { int readVal = 256; when(mInputStream.read()).thenReturn(readVal); - int ret = new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(); + int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(); assertThat(ret).isEqualTo(readVal); verify(mInputStream).read(); @@ -114,7 +114,7 @@ public void testReadBufferOffsetCount() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(readLength); int ret = - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer, offset, readLength); assertThat(ret).isEqualTo(readLength); verify(mInputStream).read(buffer, offset, readLength); @@ -126,7 +126,7 @@ public void testReadBuffer() throws IOException { byte[] buffer = new byte[] {(byte) 0xe6}; int readLength = 256; when(mInputStream.read(buffer)).thenReturn(readLength); - int ret = new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(buffer); + int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer); assertThat(ret).isEqualTo(readLength); verify(mInputStream).read(buffer); @@ -134,7 +134,7 @@ public void testReadBuffer() throws IOException { @Test public void testReset() throws IOException { - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).reset(); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).reset(); verify(mInputStream).reset(); } @@ -143,7 +143,7 @@ public void testReset() throws IOException { public void testSkip() throws IOException { int skipLength = 64; when(mInputStream.skip(skipLength)).thenReturn((long) skipLength); - long ret = new InstrHttpInputStream(mInputStream, mBuilder, mTimer).skip(skipLength); + long ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).skip(skipLength); assertThat(ret).isEqualTo(skipLength); verify(mInputStream).skip(skipLength); @@ -154,11 +154,11 @@ public void availableThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).available(); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).available()); + () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).available()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).available(); } @@ -166,11 +166,11 @@ public void availableThrowsIOException() throws IOException { public void closeThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).close(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).close()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).close()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).close(); } @@ -178,11 +178,11 @@ public void closeThrowsIOException() throws IOException { public void readThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).read(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(); } @@ -195,12 +195,12 @@ public void readByteOffsetCountThrowsIOException() throws IOException { assertThrows( IOException.class, () -> - new InstrHttpInputStream(mInputStream, mBuilder, mTimer) + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer) .read(buffer, offset, readLength)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(buffer, offset, readLength); } @@ -210,11 +210,11 @@ public void readByteThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).read(buffer); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(buffer)); + () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(buffer); } @@ -222,11 +222,11 @@ public void readByteThrowsIOException() throws IOException { public void resetThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).reset(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).reset()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).reset()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).reset(); } @@ -236,11 +236,11 @@ public void skipThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).skip(byteCount); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, mBuilder, mTimer).skip(byteCount)); + () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).skip(byteCount)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).skip(byteCount); } @@ -248,11 +248,11 @@ public void skipThrowsIOException() throws IOException { public void readEOFLogsMetric() throws IOException { when(mInputStream.read()).thenReturn(-1); - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(); } @@ -261,11 +261,11 @@ public void readByteEOFLogsMetric() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; when(mInputStream.read(buffer)).thenReturn(-1); - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(buffer); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(buffer); } @@ -276,11 +276,11 @@ public void readByteOffsetCountEOFLogsMetric() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(-1); - new InstrHttpInputStream(mInputStream, mBuilder, mTimer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer, offset, readLength); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyNetworkMetric(mArgMetric.getValue()); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyNetworkMetric(networkArgumentCaptor.getValue()); verify(mInputStream).read(buffer, offset, readLength); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java index dfa44ec93d4..98ffdeded4d 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java @@ -43,131 +43,131 @@ @RunWith(RobolectricTestRunner.class) public class InstrHttpOutputStreamTest extends FirebasePerformanceTestBase { - @Mock OutputStream mOutputStream; + @Mock OutputStream outputStream; @Mock TransportManager transportManager; - @Mock Timer mTimer; - @Captor ArgumentCaptor mArgMetric; + @Mock Timer timer; + @Captor ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder mBuilder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); - mBuilder = NetworkRequestMetricBuilder.builder(transportManager); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); + networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testClose() throws IOException { - new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).close(); + new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).close(); - NetworkRequestMetric metric = mBuilder.build(); + NetworkRequestMetric metric = networkRequestBuilder.build(); assertThat(metric.getTimeToRequestCompletedUs()).isEqualTo(2000); - verify(mOutputStream).close(); + verify(outputStream).close(); } @Test public void testFlush() throws IOException { - new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).flush(); + new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).flush(); - verify(mOutputStream).flush(); + verify(outputStream).flush(); } @Test public void testWriteInt() throws IOException { - new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(8); + new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(8); - verify(mOutputStream).write(8); + verify(outputStream).write(8); } @Test public void testWriteByteArray() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(buffer); + new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer); - verify(mOutputStream).write(buffer); + verify(outputStream).write(buffer); } @Test public void testWriteByteArrayOffLength() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(buffer, 0, 1); + new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer, 0, 1); - verify(mOutputStream).write(buffer, 0, 1); + verify(outputStream).write(buffer, 0, 1); } @Test public void closeThrowsIOException() throws IOException { - doThrow(new IOException()).when(mOutputStream).close(); + doThrow(new IOException()).when(outputStream).close(); assertThrows( IOException.class, - () -> new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).close()); + () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).close()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); - verify(mOutputStream).close(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); + verify(outputStream).close(); } @Test public void flushThrowsIOException() throws IOException { - doThrow(new IOException()).when(mOutputStream).flush(); + doThrow(new IOException()).when(outputStream).flush(); assertThrows( IOException.class, - () -> new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).flush()); + () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).flush()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); - verify(mOutputStream).flush(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); + verify(outputStream).flush(); } @Test public void writeIntThrowsIOException() throws IOException { - doThrow(new IOException()).when(mOutputStream).write(8); + doThrow(new IOException()).when(outputStream).write(8); assertThrows( IOException.class, - () -> new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(8)); + () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(8)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); - verify(mOutputStream).write(8); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); + verify(outputStream).write(8); } @Test public void writeByteThrowsIOException() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - doThrow(new IOException()).when(mOutputStream).write(buffer); + doThrow(new IOException()).when(outputStream).write(buffer); assertThrows( IOException.class, - () -> new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(buffer)); + () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); - verify(mOutputStream).write(buffer); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); + verify(outputStream).write(buffer); } @Test public void writeByteOffsetLengthThrowsIOException() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - doThrow(new IOException()).when(mOutputStream).write(buffer, 0, 1); + doThrow(new IOException()).when(outputStream).write(buffer, 0, 1); assertThrows( IOException.class, - () -> new InstrHttpOutputStream(mOutputStream, mBuilder, mTimer).write(buffer, 0, 1)); + () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer, 0, 1)); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - verifyErrorNetworkMetric(mArgMetric.getValue()); - verify(mOutputStream).write(buffer, 0, 1); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); + verify(outputStream).write(buffer, 0, 1); } private void verifyErrorNetworkMetric(NetworkRequestMetric metric) { diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java index bf96c628b65..e3d95ff255e 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java @@ -54,24 +54,24 @@ public class InstrHttpURLConnectionTest extends FirebasePerformanceTestBase { @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder mBuilder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); - mBuilder = NetworkRequestMetricBuilder.builder(transportManager); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); + networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testConnect() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).connect(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).connect(); verify(urlConnection).connect(); } @@ -80,12 +80,12 @@ public void testConnect() throws IOException { public void testDisconnect() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).disconnect(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).disconnect(); verify(urlConnection).disconnect(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertEquals(2000, metric.getTimeToResponseCompletedUs()); } @@ -96,13 +96,13 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContent(); + Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertEquals(1000, metric.getClientStartTimeUs()); assertEquals(HttpMethod.POST, metric.getHttpMethod()); assertEquals(urlConnection.getResponseCode(), metric.getHttpResponseCode()); @@ -118,12 +118,12 @@ public void testGetContentIOException() throws IOException { when(urlConnection.getDoOutput()).thenReturn(true); when(urlConnection.getContent()).thenThrow(new IOException()); - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContent(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); verify(urlConnection).getContent(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertEquals(1000, metric.getClientStartTimeUs()); assertEquals(HttpMethod.POST, metric.getHttpMethod()); assertEquals(urlConnection.getResponseCode(), metric.getHttpResponseCode()); @@ -141,13 +141,13 @@ public void testGetContentClasses() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent(classes)).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContent(classes); + Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(classes); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(classes); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertEquals(1000, metric.getClientStartTimeUs()); assertEquals(HttpMethod.POST, metric.getHttpMethod()); assertEquals(urlConnection.getResponseCode(), metric.getHttpResponseCode()); @@ -161,7 +161,7 @@ public void testGetInputStream() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getInputStream(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getInputStream(); verify(urlConnection).getInputStream(); } @@ -172,7 +172,7 @@ public void testGetLastModified() throws IOException { when(urlConnection.getDoOutput()).thenReturn(false); long lastModified = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getLastModified(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getLastModified(); assertEquals(6000, lastModified); verify(urlConnection).getLastModified(); @@ -185,7 +185,7 @@ public void testGetOutputStream() throws IOException { when(urlConnection.getOutputStream()).thenReturn(outputStream); OutputStream retOutputStream = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getOutputStream(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getOutputStream(); assertTrue(retOutputStream instanceof InstrHttpOutputStream); verify(urlConnection).getOutputStream(); @@ -198,7 +198,7 @@ public void testGetPermission() throws IOException { when(urlConnection.getPermission()).thenReturn(permission); Permission retPermission = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getPermission(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getPermission(); assertEquals(permission, retPermission); verify(urlConnection).getPermission(); @@ -208,7 +208,7 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - int retCode = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getResponseCode(); + int retCode = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getResponseCode(); assertEquals(200, retCode); verify(urlConnection).getResponseCode(); @@ -220,7 +220,7 @@ public void testGetResponseMessage() throws IOException { when(urlConnection.getResponseMessage()).thenReturn("return message"); String retMessage = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getResponseMessage(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getResponseMessage(); assertEquals("return message", retMessage); verify(urlConnection).getResponseMessage(); @@ -232,7 +232,7 @@ public void testGetExpiration() throws IOException { when(urlConnection.getExpiration()).thenReturn((long) 1000); long retExpiration = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getExpiration(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getExpiration(); assertEquals(1000, retExpiration); verify(urlConnection).getExpiration(); @@ -244,7 +244,7 @@ public void testGetHeaderField() throws IOException { when(urlConnection.getHeaderField(1)).thenReturn("text/html"); String retHeader = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getHeaderField(1); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField(1); assertEquals("text/html", retHeader); verify(urlConnection).getHeaderField(1); @@ -256,7 +256,7 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getHeaderField("content-type"); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField("content-type"); assertEquals("text/html", retHeader); verify(urlConnection).getHeaderField("content-type"); @@ -268,7 +268,7 @@ public void testGetHeaderFieldInt() throws IOException { when(urlConnection.getHeaderFieldInt("content-type", 1)).thenReturn(2); int retHeader = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder) + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder) .getHeaderFieldInt("content-type", 1); assertEquals(2, retHeader); @@ -281,7 +281,7 @@ public void testGetHeaderFieldLong() throws IOException { when(urlConnection.getHeaderFieldLong("content-type", 1)).thenReturn((long) 2); long retHeader = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder) + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder) .getHeaderFieldLong("content-type", 1); assertEquals(2, retHeader); @@ -294,7 +294,7 @@ public void testGetHeaderFieldKey() throws IOException { when(urlConnection.getHeaderFieldKey(1)).thenReturn("content-type"); String retHeader = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getHeaderFieldKey(1); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFieldKey(1); assertEquals("content-type", retHeader); verify(urlConnection).getHeaderFieldKey(1); @@ -308,7 +308,7 @@ public void testGetHeaderFields() throws IOException { when(urlConnection.getHeaderFields()).thenReturn(values); Map> ret = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getHeaderFields(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFields(); assertEquals(values, ret); verify(urlConnection).getHeaderFields(); @@ -319,7 +319,7 @@ public void testGetContentEncoding() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContentEncoding(); + String ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentEncoding(); assertEquals("ascii", ret); verify(urlConnection).getContentEncoding(); @@ -330,7 +330,7 @@ public void testGetContentLength() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContentLength(); + int ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentLength(); assertEquals(256, ret); // 2 times, one for updating the request info and one for the return value @@ -342,7 +342,7 @@ public void testGetContentLengthLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContentLengthLong(); + long ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentLengthLong(); assertEquals(256, ret); verify(urlConnection).getContentLengthLong(); @@ -353,7 +353,7 @@ public void testGetContentType() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getContentType(); + String ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentType(); assertEquals("text/html", ret); verify(urlConnection).getContentType(); @@ -364,7 +364,7 @@ public void testGetDate() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDate()).thenReturn((long) 1000); - long ret = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getDate(); + long ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDate(); assertEquals(1000, ret); verify(urlConnection).getDate(); @@ -376,7 +376,7 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).addRequestProperty(key, value); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -387,7 +387,7 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getAllowUserInteraction(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getAllowUserInteraction(); assertEquals(true, res); verify(urlConnection).getAllowUserInteraction(); @@ -399,7 +399,7 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getConnectTimeout(); + int res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getConnectTimeout(); assertEquals(timeout, res); verify(urlConnection).getConnectTimeout(); @@ -410,7 +410,7 @@ public void testGetDefaultUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDefaultUseCaches()).thenReturn(false); - boolean res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getDefaultUseCaches(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDefaultUseCaches(); assertFalse(res); verify(urlConnection).getDefaultUseCaches(); @@ -421,7 +421,7 @@ public void testGetDoInput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getDoInput(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDoInput(); assertEquals(true, res); verify(urlConnection).getDoInput(); @@ -432,7 +432,7 @@ public void testGetDoOutput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getDoOutput(); + boolean result = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDoOutput(); assertFalse(result); verify(urlConnection).getDoOutput(); @@ -444,7 +444,7 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getErrorStream(); + InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -455,7 +455,7 @@ public void testGetErrorStreamNull() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getErrorStream(); + InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -467,7 +467,7 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getIfModifiedSince(); + long res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getIfModifiedSince(); assertEquals(modifiedSince, res); verify(urlConnection).getIfModifiedSince(); @@ -479,7 +479,7 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getInstanceFollowRedirects(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getInstanceFollowRedirects(); assertEquals(true, res); verify(urlConnection).getInstanceFollowRedirects(); @@ -491,7 +491,7 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getReadTimeout(); + int res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getReadTimeout(); assertEquals(timeout, res); verify(urlConnection).getReadTimeout(); @@ -503,7 +503,7 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getRequestMethod(); + String res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestMethod(); assertEquals(method, res); verify(urlConnection).getRequestMethod(); @@ -517,7 +517,7 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getRequestProperties(); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperties(); assertEquals(input, res); verify(urlConnection).getRequestProperties(); @@ -531,7 +531,7 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getRequestProperty(property); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperty(property); assertEquals(value, res); verify(urlConnection).getRequestProperty(property); @@ -543,7 +543,7 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).getUseCaches(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getUseCaches(); assertEquals(useCaches, res); verify(urlConnection).getUseCaches(); @@ -554,7 +554,7 @@ public void testSetAllowUserInteraction() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setAllowUserInteraction(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -564,7 +564,7 @@ public void testSetChunkedStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 134; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setChunkedStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -574,7 +574,7 @@ public void testSetConnectTimeout() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 150; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setConnectTimeout(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setConnectTimeout(val); verify(urlConnection).setConnectTimeout(val); } @@ -584,7 +584,7 @@ public void testSetDefaultUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setDefaultUseCaches(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDefaultUseCaches(val); verify(urlConnection).setDefaultUseCaches(val); } @@ -594,7 +594,7 @@ public void testSetDoInput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setDoInput(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDoInput(val); verify(urlConnection).setDoInput(val); } @@ -604,7 +604,7 @@ public void testSetDoOutput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setDoOutput(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDoOutput(val); verify(urlConnection).setDoOutput(val); } @@ -614,7 +614,7 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 200; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -624,7 +624,7 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); long val = 142; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -634,7 +634,7 @@ public void testSetIfModifiedSince() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); long val = 72; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setIfModifiedSince(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setIfModifiedSince(val); verify(urlConnection).setIfModifiedSince(val); } @@ -644,7 +644,7 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setInstanceFollowRedirects(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -654,7 +654,7 @@ public void testSetReadTimeout() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 63; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setReadTimeout(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setReadTimeout(val); verify(urlConnection).setReadTimeout(val); } @@ -664,7 +664,7 @@ public void testSetRequestMethod() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); String val = "GET"; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setRequestMethod(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setRequestMethod(val); verify(urlConnection).setRequestMethod(val); } @@ -675,7 +675,7 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setRequestProperty(key, val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -685,7 +685,7 @@ public void testSetUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).setUseCaches(val); + new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setUseCaches(val); verify(urlConnection).setUseCaches(val); } @@ -696,7 +696,7 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, mTimer, mBuilder).usingProxy(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).usingProxy(); assertEquals(val, res); verify(urlConnection).usingProxy(); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java index e43e4e6dfe4..fa92a4d0173 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java @@ -59,24 +59,24 @@ public class InstrHttpsURLConnectionTest extends FirebasePerformanceTestBase { @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder mBuilder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); - mBuilder = NetworkRequestMetricBuilder.builder(transportManager); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); + networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testConnect() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).connect(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).connect(); verify(urlConnection).connect(); } @@ -84,12 +84,12 @@ public void testConnect() throws IOException { @Test public void testDisconnect() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).disconnect(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).disconnect(); verify(urlConnection).disconnect(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -100,13 +100,13 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContent(); + Object retObj = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); assertThat(retObj).isEqualTo(fakeObject); verify(urlConnection).getContent(); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getClientStartTimeUs()).isEqualTo(1000); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.POST); assertThat(metric.getHttpResponseCode()).isEqualTo(urlConnection.getResponseCode()); @@ -125,13 +125,13 @@ public void testGetContentClasses() throws IOException { when(urlConnection.getContent(classes)).thenReturn(fakeObject); Object retObj = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContent(classes); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContent(classes); assertThat(retObj).isEqualTo(fakeObject); verify(urlConnection).getContent(classes); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getClientStartTimeUs()).isEqualTo(1000); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.POST); assertThat(metric.getHttpResponseCode()).isEqualTo(urlConnection.getResponseCode()); @@ -145,7 +145,7 @@ public void testGetInputStream() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getInputStream(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getInputStream(); verify(urlConnection).getInputStream(); } @@ -156,7 +156,7 @@ public void testGetLastModified() throws IOException { when(urlConnection.getDoOutput()).thenReturn(false); long lastModified = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getLastModified(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLastModified(); assertThat(lastModified).isEqualTo(6000); verify(urlConnection).getLastModified(); @@ -169,7 +169,7 @@ public void testGetOutputStream() throws IOException { when(urlConnection.getOutputStream()).thenReturn(outputStream); OutputStream retOutputStream = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getOutputStream(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getOutputStream(); assertThat(retOutputStream).isInstanceOf(InstrHttpOutputStream.class); verify(urlConnection).getOutputStream(); @@ -182,7 +182,7 @@ public void testGetPermission() throws IOException { when(urlConnection.getPermission()).thenReturn(permission); Permission retPermission = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getPermission(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getPermission(); assertThat(permission).isEqualTo(retPermission); verify(urlConnection).getPermission(); @@ -192,7 +192,7 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - int retCode = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getResponseCode(); + int retCode = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getResponseCode(); assertThat(retCode).isEqualTo(200); verify(urlConnection).getResponseCode(); @@ -204,7 +204,7 @@ public void testGetResponseMessage() throws IOException { when(urlConnection.getResponseMessage()).thenReturn("return message"); String retMessage = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getResponseMessage(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getResponseMessage(); assertThat(retMessage).isEqualTo("return message"); verify(urlConnection).getResponseMessage(); @@ -216,7 +216,7 @@ public void testGetExpiration() throws IOException { when(urlConnection.getExpiration()).thenReturn((long) 1000); long retExpiration = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getExpiration(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getExpiration(); assertThat(retExpiration).isEqualTo(1000); verify(urlConnection).getExpiration(); @@ -228,7 +228,7 @@ public void testGetHeaderField() throws IOException { when(urlConnection.getHeaderField(1)).thenReturn("text/html"); String retHeader = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getHeaderField(1); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField(1); assertThat(retHeader).isEqualTo("text/html"); verify(urlConnection).getHeaderField(1); @@ -240,7 +240,7 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getHeaderField("content-type"); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField("content-type"); assertThat(retHeader).isEqualTo("text/html"); verify(urlConnection).getHeaderField("content-type"); @@ -252,7 +252,7 @@ public void testGetHeaderFieldInt() throws IOException { when(urlConnection.getHeaderFieldInt("content-type", 1)).thenReturn(2); int retHeader = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) .getHeaderFieldInt("content-type", 1); assertThat(retHeader).isEqualTo(2); @@ -265,7 +265,7 @@ public void testGetHeaderFieldLong() throws IOException { when(urlConnection.getHeaderFieldLong("content-type", 1)).thenReturn((long) 2); long retHeader = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) .getHeaderFieldLong("content-type", 1); assertThat(retHeader).isEqualTo(2); @@ -278,7 +278,7 @@ public void testGetHeaderFieldKey() throws IOException { when(urlConnection.getHeaderFieldKey(1)).thenReturn("content-type"); String retHeader = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getHeaderFieldKey(1); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFieldKey(1); assertThat(retHeader).isEqualTo("content-type"); verify(urlConnection).getHeaderFieldKey(1); @@ -292,7 +292,7 @@ public void testGetHeaderFields() throws IOException { when(urlConnection.getHeaderFields()).thenReturn(values); Map> ret = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getHeaderFields(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFields(); assertThat(ret).isEqualTo(values); verify(urlConnection).getHeaderFields(); @@ -303,7 +303,7 @@ public void testGetContentEncoding() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContentEncoding(); + String ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentEncoding(); assertThat(ret).isEqualTo("ascii"); verify(urlConnection).getContentEncoding(); @@ -314,7 +314,7 @@ public void testGetContentLength() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContentLength(); + int ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentLength(); assertThat(ret).isEqualTo(256); // 2 times, one for updating the request info and one for the return value @@ -326,7 +326,7 @@ public void testGetContentLengthLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContentLengthLong(); + long ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentLengthLong(); assertThat(ret).isEqualTo(256); verify(urlConnection).getContentLengthLong(); @@ -337,7 +337,7 @@ public void testGetContentType() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getContentType(); + String ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentType(); assertThat(ret).isEqualTo("text/html"); verify(urlConnection).getContentType(); @@ -348,7 +348,7 @@ public void testGetDate() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDate()).thenReturn((long) 1000); - long ret = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getDate(); + long ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDate(); assertThat(ret).isEqualTo(1000); verify(urlConnection).getDate(); @@ -360,7 +360,7 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).addRequestProperty(key, value); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -371,7 +371,7 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getAllowUserInteraction(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getAllowUserInteraction(); assertThat(res).isTrue(); verify(urlConnection).getAllowUserInteraction(); @@ -383,7 +383,7 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getConnectTimeout(); + int res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getConnectTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getConnectTimeout(); @@ -395,7 +395,7 @@ public void testGetDefaultUseCaches() throws IOException { when(urlConnection.getDefaultUseCaches()).thenReturn(false); boolean res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getDefaultUseCaches(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDefaultUseCaches(); assertThat(res).isFalse(); verify(urlConnection).getDefaultUseCaches(); @@ -406,7 +406,7 @@ public void testGetDoInput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getDoInput(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDoInput(); assertThat(res).isTrue(); verify(urlConnection).getDoInput(); @@ -417,7 +417,7 @@ public void testGetDoOutput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getDoOutput(); + boolean result = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDoOutput(); assertThat(result).isFalse(); verify(urlConnection).getDoOutput(); @@ -429,7 +429,7 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getErrorStream(); + InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -440,7 +440,7 @@ public void testGetErrorStreamNull() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getErrorStream(); + InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -452,7 +452,7 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getIfModifiedSince(); + long res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getIfModifiedSince(); assertThat(res).isEqualTo(modifiedSince); verify(urlConnection).getIfModifiedSince(); @@ -464,7 +464,7 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getInstanceFollowRedirects(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getInstanceFollowRedirects(); assertThat(res).isTrue(); verify(urlConnection).getInstanceFollowRedirects(); @@ -476,7 +476,7 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getReadTimeout(); + int res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getReadTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getReadTimeout(); @@ -488,7 +488,7 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getRequestMethod(); + String res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestMethod(); assertThat(res).isEqualTo(method); verify(urlConnection).getRequestMethod(); @@ -502,7 +502,7 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getRequestProperties(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperties(); assertThat(res).isEqualTo(input); verify(urlConnection).getRequestProperties(); @@ -516,7 +516,7 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getRequestProperty(property); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperty(property); assertThat(res).isEqualTo(value); verify(urlConnection).getRequestProperty(property); @@ -528,7 +528,7 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getUseCaches(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getUseCaches(); assertThat(res).isEqualTo(useCaches); verify(urlConnection).getUseCaches(); @@ -539,7 +539,7 @@ public void testSetAllowUserInteraction() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setAllowUserInteraction(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -549,7 +549,7 @@ public void testSetChunkedStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 134; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setChunkedStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -559,7 +559,7 @@ public void testSetConnectTimeout() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 150; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setConnectTimeout(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setConnectTimeout(val); verify(urlConnection).setConnectTimeout(val); } @@ -569,7 +569,7 @@ public void testSetDefaultUseCaches() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setDefaultUseCaches(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDefaultUseCaches(val); verify(urlConnection).setDefaultUseCaches(val); } @@ -579,7 +579,7 @@ public void testSetDoInput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setDoInput(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDoInput(val); verify(urlConnection).setDoInput(val); } @@ -589,7 +589,7 @@ public void testSetDoOutput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setDoOutput(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDoOutput(val); verify(urlConnection).setDoOutput(val); } @@ -599,7 +599,7 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 200; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -609,7 +609,7 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); long val = 142; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -619,7 +619,7 @@ public void testSetIfModifiedSince() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); long val = 72; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setIfModifiedSince(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setIfModifiedSince(val); verify(urlConnection).setIfModifiedSince(val); } @@ -629,7 +629,7 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setInstanceFollowRedirects(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -639,7 +639,7 @@ public void testSetReadTimeout() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 63; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setReadTimeout(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setReadTimeout(val); verify(urlConnection).setReadTimeout(val); } @@ -649,7 +649,7 @@ public void testSetRequestMethod() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); String val = "GET"; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setRequestMethod(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setRequestMethod(val); verify(urlConnection).setRequestMethod(val); } @@ -660,7 +660,7 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setRequestProperty(key, val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -670,7 +670,7 @@ public void testSetUseCaches() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setUseCaches(val); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setUseCaches(val); verify(urlConnection).setUseCaches(val); } @@ -681,7 +681,7 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).usingProxy(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).usingProxy(); assertThat(res).isEqualTo(val); verify(urlConnection).usingProxy(); @@ -693,7 +693,7 @@ public void testGetCipherSuite() throws IOException { String val = "CipherSuite"; when(urlConnection.getCipherSuite()).thenReturn(val); - String res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getCipherSuite(); + String res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getCipherSuite(); assertThat(res).isEqualTo(val); verify(urlConnection).getCipherSuite(); @@ -713,7 +713,7 @@ public boolean verify(String hostname, SSLSession session) { when(urlConnection.getHostnameVerifier()).thenReturn(hostnameVerifier); HostnameVerifier res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getHostnameVerifier(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHostnameVerifier(); assertThat(res).isEqualTo(hostnameVerifier); verify(urlConnection).getHostnameVerifier(); @@ -727,7 +727,7 @@ public void testGetLocalCertificates() throws IOException { when(urlConnection.getLocalCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getLocalCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLocalCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getLocalCertificates(); @@ -746,7 +746,7 @@ public String getName() { when(urlConnection.getLocalPrincipal()).thenReturn(principal); Principal res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getLocalPrincipal(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLocalPrincipal(); assertThat(res).isEqualTo(principal); verify(urlConnection).getLocalPrincipal(); @@ -764,7 +764,7 @@ public String getName() { }; when(urlConnection.getPeerPrincipal()).thenReturn(principal); - Principal res = new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getPeerPrincipal(); + Principal res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getPeerPrincipal(); assertThat(res).isEqualTo(principal); verify(urlConnection).getPeerPrincipal(); @@ -778,7 +778,7 @@ public void testGetServerCertificates() throws IOException { when(urlConnection.getServerCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getServerCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getServerCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getServerCertificates(); @@ -832,7 +832,7 @@ public Socket createSocket( when(urlConnection.getSSLSocketFactory()).thenReturn(factory); SSLSocketFactory res = - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).getSSLSocketFactory(); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getSSLSocketFactory(); assertThat(res).isEqualTo(factory); verify(urlConnection).getSSLSocketFactory(); @@ -850,7 +850,7 @@ public boolean verify(String hostname, SSLSession session) { } }; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) .setHostnameVerifier(hostnameVerifier); verify(urlConnection).setHostnameVerifier(hostnameVerifier); @@ -902,7 +902,7 @@ public Socket createSocket( } }; - new InstrHttpsURLConnection(urlConnection, mTimer, mBuilder).setSSLSocketFactory(factory); + new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setSSLSocketFactory(factory); verify(urlConnection).setSSLSocketFactory(factory); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java index 5d0f6e8101b..6a61f329afe 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java @@ -46,17 +46,17 @@ public class InstrURLConnectionBaseTest extends FirebasePerformanceTestBase { @Mock private TransportManager transportManager; - @Mock private Timer mTimer; - @Captor private ArgumentCaptor mArgMetric; + @Mock private Timer timer; + @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder mBuilder; + private NetworkRequestMetricBuilder networkRequestBuilder; @Before public void setUp() { initMocks(this); - when(mTimer.getMicros()).thenReturn((long) 1000); - when(mTimer.getDurationMicros()).thenReturn((long) 2000); - mBuilder = NetworkRequestMetricBuilder.builder(transportManager); + when(timer.getMicros()).thenReturn((long) 1000); + when(timer.getDurationMicros()).thenReturn((long) 2000); + networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test @@ -65,10 +65,10 @@ public void testConnectThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).connect(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).connect()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).connect()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -81,12 +81,12 @@ public void testGetContentClassesThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getContent(classes); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getContent(classes)); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getContent(classes)); verify(urlConnection).getContent(classes); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -96,10 +96,10 @@ public void testGetInputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getInputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getInputStream()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getInputStream()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -109,10 +109,10 @@ public void testGetOutputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getOutputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getOutputStream()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getOutputStream()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -122,10 +122,10 @@ public void testGetPermissionThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getPermission(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getPermission()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getPermission()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -135,10 +135,10 @@ public void testGetResponseCodeThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseCode(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getResponseCode()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getResponseCode()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -148,10 +148,10 @@ public void testGetResponseMessageThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseMessage(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getResponseMessage()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getResponseMessage()); verify(transportManager) - .log(mArgMetric.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); - NetworkRequestMetric metric = mArgMetric.getValue(); + .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + NetworkRequestMetric metric = networkArgumentCaptor.getValue(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000); } @@ -163,7 +163,7 @@ public void testGetHeaderFieldDate() { when(urlConnection.getHeaderFieldDate("content-date", defaultDate)).thenReturn(expectedDate); Long retDate = - new InstrURLConnectionBase(urlConnection, mTimer, mBuilder) + new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder) .getHeaderFieldDate("content-date", defaultDate); assertThat(retDate).isEqualTo(expectedDate); @@ -173,7 +173,7 @@ public void testGetHeaderFieldDate() { public void testGetUrl() throws MalformedURLException { HttpURLConnection urlConnection = mockHttpUrlConnection(); URL expectedURL = new URL("http://www.google.com"); - URL retURL = new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).getURL(); + URL retURL = new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getURL(); assertThat(retURL).isEqualTo(expectedURL); } @@ -182,7 +182,7 @@ public void testToString() { HttpURLConnection urlConnection = mockHttpUrlConnection(); String expectedStringRepr = "expectedStringRepr"; when(urlConnection.toString()).thenReturn(expectedStringRepr); - String retStringRepr = new InstrURLConnectionBase(urlConnection, mTimer, mBuilder).toString(); + String retStringRepr = new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).toString(); assertThat(retStringRepr).isEqualTo(expectedStringRepr); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java index 2b6bb27e176..4bbf108985c 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java @@ -54,16 +54,16 @@ public class GaugeMetadataManagerTest extends FirebasePerformanceTestBase { @Mock private Runtime runtime; private ActivityManager activityManager; - private Context context; + private Context appContext; @Before public void setUp() { initMocks(this); - context = RuntimeEnvironment.application; - activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + appContext = RuntimeEnvironment.application; + activityManager = (ActivityManager) appContext.getSystemService(Context.ACTIVITY_SERVICE); mockMemory(); - testGaugeMetadataManager = new GaugeMetadataManager(runtime, context); + testGaugeMetadataManager = new GaugeMetadataManager(runtime, appContext); } private void mockMemory() { @@ -83,14 +83,14 @@ public void testInitialization_getProcessNameReturnsNull_doesNotCrash() { ActivityManager activityManagerPartialMock = spy(activityManager); when(activityManagerPartialMock.getRunningAppProcesses()).thenReturn(null); - assertThat(new GaugeMetadataManager(runtime, context)).isNotNull(); + assertThat(new GaugeMetadataManager(runtime, appContext)).isNotNull(); } @Test public void testGetProcessName_noProcessInfoList_returnsPackageName() { shadowOf(activityManager).setProcesses(new ArrayList<>()); - assertThat(new GaugeMetadataManager(runtime, context).getProcessName()) - .isEqualTo(context.getPackageName()); + assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName()) + .isEqualTo(appContext.getPackageName()); } @Test @@ -98,15 +98,15 @@ public void testGetProcessName_processListWithoutCurrentPid_returnsPackageName() shadowOf(activityManager) .setProcesses( generateFakeAppProcessInfoListThatContainsPid(android.os.Process.myPid() + 100)); - assertThat(new GaugeMetadataManager(runtime, context).getProcessName()) - .isEqualTo(context.getPackageName()); + assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName()) + .isEqualTo(appContext.getPackageName()); } @Test public void testGetProcessName_processListWithCurrentPid_returnsProcessName() { shadowOf(activityManager) .setProcesses(generateFakeAppProcessInfoListThatContainsPid(android.os.Process.myPid())); - assertThat(new GaugeMetadataManager(runtime, context).getProcessName()) + assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName()) .isEqualTo("fakeProcessName"); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java index 3bc7c750ed0..a8b3a9b2e77 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java @@ -55,7 +55,7 @@ public class RateLimiterTest extends FirebasePerformanceTestBase { @Mock private Clock mClock; @Mock private ConfigResolver mockConfigResolver; - private long mCurrentTime = 0; + private long currentTime = 0; @Before public void setUp() { @@ -64,7 +64,7 @@ public void setUp() { new Answer() { @Override public Timer answer(InvocationOnMock invocationOnMock) throws Throwable { - return new Timer(mCurrentTime, mCurrentTime * 1000); + return new Timer(currentTime, currentTime * 1000); } }) .when(mClock) @@ -87,35 +87,35 @@ public void testRateLimitImpl() { new RateLimiterImpl(2.0d / 60, 2, mClock, mockConfigResolver, NETWORK, false); PerfMetric metric = PerfMetric.getDefaultInstance(); // clock is 15 seconds, token count is 1. - mCurrentTime = 1 * FIFTEEN_SECONDS; + currentTime = 1 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 30 seconds, count is 0. - mCurrentTime = 2 * FIFTEEN_SECONDS; + currentTime = 2 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 45 seconds, count is 0. - mCurrentTime = 3 * FIFTEEN_SECONDS; + currentTime = 3 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isFalse(); ; // clock is 60 seconds, count is 0 - mCurrentTime = 4 * FIFTEEN_SECONDS; + currentTime = 4 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 75 seconds, count is 0, - mCurrentTime = 5 * FIFTEEN_SECONDS; + currentTime = 5 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isFalse(); // clock is 90 seconds, count is 0 - mCurrentTime = 6 * FIFTEEN_SECONDS; + currentTime = 6 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 105 seconds, count is 0 - mCurrentTime = 7 * FIFTEEN_SECONDS; + currentTime = 7 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isFalse(); // clock is 120 seconds, count is 0, - mCurrentTime = 8 * FIFTEEN_SECONDS; + currentTime = 8 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 135 seconds, count is 0, - mCurrentTime = 9 * FIFTEEN_SECONDS; + currentTime = 9 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isFalse(); // clock is 150 seconds, count is 0, - mCurrentTime = 10 * FIFTEEN_SECONDS; + currentTime = 10 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); } @@ -149,43 +149,43 @@ public void testRateLimit() { .setNetworkRequestMetric(NetworkRequestMetric.getDefaultInstance()) .build(); // clock is 15 seconds, token count is 1. - mCurrentTime = 1 * FIFTEEN_SECONDS; + currentTime = 1 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); // clock is 30 seconds, count is 0. - mCurrentTime = 2 * FIFTEEN_SECONDS; + currentTime = 2 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); // clock is 45 seconds, count is 0. - mCurrentTime = 3 * FIFTEEN_SECONDS; + currentTime = 3 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isFalse(); assertThat(limiter.check(network)).isFalse(); // clock is 60 seconds, count is 0 - mCurrentTime = 4 * FIFTEEN_SECONDS; + currentTime = 4 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); // clock is 75 seconds, count is 0, - mCurrentTime = 5 * FIFTEEN_SECONDS; + currentTime = 5 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isFalse(); assertThat(limiter.check(network)).isFalse(); // clock is 90 seconds, count is 0 - mCurrentTime = 6 * FIFTEEN_SECONDS; + currentTime = 6 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); // clock is 105 seconds, count is 0 - mCurrentTime = 7 * FIFTEEN_SECONDS; + currentTime = 7 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isFalse(); assertThat(limiter.check(network)).isFalse(); // clock is 120 seconds, count is 0, - mCurrentTime = 8 * FIFTEEN_SECONDS; + currentTime = 8 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); // clock is 135 seconds, count is 0, - mCurrentTime = 9 * FIFTEEN_SECONDS; + currentTime = 9 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isFalse(); assertThat(limiter.check(network)).isFalse(); // clock is 150 seconds, count is 0, - mCurrentTime = 10 * FIFTEEN_SECONDS; + currentTime = 10 * FIFTEEN_SECONDS; assertThat(limiter.check(trace)).isTrue(); assertThat(limiter.check(network)).isTrue(); } @@ -410,36 +410,36 @@ public void testChangeRate() { new RateLimiterImpl(2.0d / 60, 2, mClock, mockConfigResolver, TRACE, false); PerfMetric metric = PerfMetric.getDefaultInstance(); // clock is 15 seconds, token count is 1. - mCurrentTime = 1 * FIFTEEN_SECONDS; + currentTime = 1 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 30 seconds, count is 0. - mCurrentTime = 2 * FIFTEEN_SECONDS; + currentTime = 2 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 45 seconds, count is 0. - mCurrentTime = 3 * FIFTEEN_SECONDS; + currentTime = 3 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isFalse(); // clock is 60 seconds, count is 0 - mCurrentTime = 4 * FIFTEEN_SECONDS; + currentTime = 4 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // change rate to 4/minute limiter.setRate(4.0d / 60); // clock is 75 seconds, count is 0, - mCurrentTime = 5 * FIFTEEN_SECONDS; + currentTime = 5 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 90 seconds, count is 0 - mCurrentTime = 6 * FIFTEEN_SECONDS; + currentTime = 6 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 105 seconds, count is 0 - mCurrentTime = 7 * FIFTEEN_SECONDS; + currentTime = 7 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 120 seconds, count is 0, - mCurrentTime = 8 * FIFTEEN_SECONDS; + currentTime = 8 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 135 seconds, count is 0, - mCurrentTime = 9 * FIFTEEN_SECONDS; + currentTime = 9 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); // clock is 150 seconds, count is 0, - mCurrentTime = 10 * FIFTEEN_SECONDS; + currentTime = 10 * FIFTEEN_SECONDS; assertThat(limiter.check(metric)).isTrue(); } diff --git a/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java b/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java index 8e699b31cc5..07834aeaec1 100644 --- a/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java +++ b/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java @@ -21,7 +21,7 @@ /** Fake executor service that simply executes the runnable in the same thread. */ public class FakeDirectExecutorService extends AbstractExecutorService { - private boolean shutdown = false; + private boolean IsShutdown = false; public void execute(Runnable command) { command.run(); @@ -34,22 +34,22 @@ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedE @Override public boolean isShutdown() { - return shutdown; + return IsShutdown; } @Override public void shutdown() { - shutdown = true; + IsShutdown = true; } @Override public List shutdownNow() { - shutdown = true; + IsShutdown = true; return Arrays.asList(); } @Override public boolean isTerminated() { - return shutdown; + return IsShutdown; } } diff --git a/firebase-perf/src/test/java/com/google/testing/timing/FakeScheduledExecutorService.java b/firebase-perf/src/test/java/com/google/testing/timing/FakeScheduledExecutorService.java index f4c66911fd2..b4a5cdc7b66 100644 --- a/firebase-perf/src/test/java/com/google/testing/timing/FakeScheduledExecutorService.java +++ b/firebase-perf/src/test/java/com/google/testing/timing/FakeScheduledExecutorService.java @@ -52,7 +52,7 @@ public class FakeScheduledExecutorService extends AbstractExecutorService new PriorityBlockingQueue>(); private volatile long nextSequenceId = 0; // for ordering scheduled actions - private volatile boolean running = true; + private volatile boolean isRunning = true; public FakeScheduledExecutorService() { this.clock = new MockClock(); @@ -60,7 +60,7 @@ public FakeScheduledExecutorService() { @Override public boolean isShutdown() { - return !running; + return !isRunning; } @Override @@ -70,12 +70,12 @@ public boolean isTerminated() { @Override public void shutdown() { - running = false; + isRunning = false; } @Override public List shutdownNow() { - running = false; + isRunning = false; List commands = Lists.newArrayList(); commands.addAll(executeQueue); commands.addAll(scheduledQueue); @@ -96,7 +96,7 @@ public List shutdownNow() { */ @Override public boolean awaitTermination(long timeout, TimeUnit unit) { - checkState(!running); + checkState(!isRunning); while (!executeQueue.isEmpty()) { runNext(); } @@ -111,7 +111,7 @@ public void execute(Runnable command) { } private void assertRunning() { - if (!running) { + if (!isRunning) { throw new RejectedExecutionException(); } } From 3b1990c7046682ca926a88c5df00a3eecaeae87b Mon Sep 17 00:00:00 2001 From: Ramanpreet Singh Date: Wed, 24 Mar 2021 19:09:21 -0700 Subject: [PATCH 2/5] Updating "networkRequestBuilder" to "networkMetricBuilder" to align with "perfMetricBuilder" and "traceMetricBuilder" --- .../NetworkRequestMetricBuilderTest.java | 152 +++++++++--------- .../network/InstrHttpInputStreamTest.java | 42 ++--- .../network/InstrHttpOutputStreamTest.java | 26 +-- .../network/InstrHttpURLConnectionTest.java | 110 ++++++------- .../network/InstrHttpsURLConnectionTest.java | 126 +++++++-------- .../network/InstrURLConnectionBaseTest.java | 24 +-- 6 files changed, 240 insertions(+), 240 deletions(-) diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java index 8530d1ebdad..e3cf6abb53b 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java @@ -48,12 +48,12 @@ public class NetworkRequestMetricBuilderTest extends FirebasePerformanceTestBase @Mock private GaugeManager mockGaugeManager; @Mock private AppStateMonitor mockAppStateMonitor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { initMocks(this); - networkRequestBuilder = + networkMetricBuilder = new NetworkRequestMetricBuilder( mockTransportManager, mockAppStateMonitor, mockGaugeManager); } @@ -61,127 +61,127 @@ public void setUp() { @Test public void testSetUrl() { String url = "www.google.com"; - NetworkRequestMetric metric = networkRequestBuilder.setUrl(url).build(); + NetworkRequestMetric metric = networkMetricBuilder.setUrl(url).build(); assertThat(metric.getUrl()).isEqualTo(url); } @Test public void testIsReportSent() { - assertThat(networkRequestBuilder.isReportSent()).isFalse(); + assertThat(networkMetricBuilder.isReportSent()).isFalse(); } @Test public void testSetReportSent() { - networkRequestBuilder.setReportSent(); - assertThat(networkRequestBuilder.isReportSent()).isTrue(); + networkMetricBuilder.setReportSent(); + assertThat(networkMetricBuilder.isReportSent()).isTrue(); } @Test public void testSetHttpMethod() { String type = "GET"; - NetworkRequestMetric metric = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric.getHttpMethod()).isEqualTo(HttpMethod.GET); type = "PUT"; - NetworkRequestMetric metric1 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric1 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric1.getHttpMethod()).isEqualTo(HttpMethod.PUT); type = "POST"; - NetworkRequestMetric metric2 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric2 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric2.getHttpMethod()).isEqualTo(HttpMethod.POST); type = "DELETE"; - NetworkRequestMetric metric3 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric3 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric3.getHttpMethod()).isEqualTo(HttpMethod.DELETE); type = "POST"; - NetworkRequestMetric metric4 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric4 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric4.getHttpMethod()).isEqualTo(HttpMethod.POST); type = "HEAD"; - NetworkRequestMetric metric5 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric5 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric5.getHttpMethod()).isEqualTo(HttpMethod.HEAD); type = "PATCH"; - NetworkRequestMetric metric6 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric6 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric6.getHttpMethod()).isEqualTo(HttpMethod.PATCH); type = "OPTIONS"; - NetworkRequestMetric metric7 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric7 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric7.getHttpMethod()).isEqualTo(HttpMethod.OPTIONS); type = "TRACE"; - NetworkRequestMetric metric8 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric8 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric8.getHttpMethod()).isEqualTo(HttpMethod.TRACE); type = "CONNECT"; - NetworkRequestMetric metric9 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric9 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric9.getHttpMethod()).isEqualTo(HttpMethod.CONNECT); type = "UNKNOWN"; - NetworkRequestMetric metric10 = networkRequestBuilder.setHttpMethod(type).build(); + NetworkRequestMetric metric10 = networkMetricBuilder.setHttpMethod(type).build(); assertThat(metric10.getHttpMethod()).isEqualTo(HttpMethod.HTTP_METHOD_UNKNOWN); } @Test public void testSetRequestPayloadBytes() { long bytes = 256; - NetworkRequestMetric metric = networkRequestBuilder.setRequestPayloadBytes(bytes).build(); + NetworkRequestMetric metric = networkMetricBuilder.setRequestPayloadBytes(bytes).build(); assertThat(metric.getRequestPayloadBytes()).isEqualTo(bytes); } @Test public void testSetResponsePayloadBytes() { long bytes = 256; - NetworkRequestMetric metric = networkRequestBuilder.setResponsePayloadBytes(bytes).build(); + NetworkRequestMetric metric = networkMetricBuilder.setResponsePayloadBytes(bytes).build(); assertThat(metric.getResponsePayloadBytes()).isEqualTo(bytes); } @Test public void testSetHttpResponseCode() { int code = 200; - NetworkRequestMetric metric = networkRequestBuilder.setHttpResponseCode(code).build(); + NetworkRequestMetric metric = networkMetricBuilder.setHttpResponseCode(code).build(); assertThat(metric.getHttpResponseCode()).isEqualTo(code); } @Test public void testSetResponseContentType() { String contentType = "text/html"; - NetworkRequestMetric metric = networkRequestBuilder.setResponseContentType(contentType).build(); + NetworkRequestMetric metric = networkMetricBuilder.setResponseContentType(contentType).build(); assertThat(metric.getResponseContentType()).isEqualTo(contentType); } @Test public void testSetRequestStartTimeMicros() { long time = 2000; - NetworkRequestMetric metric = networkRequestBuilder.setRequestStartTimeMicros(time).build(); + NetworkRequestMetric metric = networkMetricBuilder.setRequestStartTimeMicros(time).build(); assertThat(metric.getClientStartTimeUs()).isEqualTo(time); } @Test public void testSetRequestEndTimeMicros() { long time = 2000; - NetworkRequestMetric metric = networkRequestBuilder.setTimeToRequestCompletedMicros(time).build(); + NetworkRequestMetric metric = networkMetricBuilder.setTimeToRequestCompletedMicros(time).build(); assertThat(metric.getTimeToRequestCompletedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseInitiatedMicros() { long time = 2000; - NetworkRequestMetric metric = networkRequestBuilder.setTimeToResponseInitiatedMicros(time).build(); + NetworkRequestMetric metric = networkMetricBuilder.setTimeToResponseInitiatedMicros(time).build(); assertThat(metric.getTimeToResponseInitiatedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseCompletedMicros() { long time = 2000; - NetworkRequestMetric metric = networkRequestBuilder.setTimeToResponseCompletedMicros(time).build(); + NetworkRequestMetric metric = networkMetricBuilder.setTimeToResponseCompletedMicros(time).build(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(time); } @Test public void testAllNullFields() { - NetworkRequestMetric metric = networkRequestBuilder.build(); + NetworkRequestMetric metric = networkMetricBuilder.build(); assertThat(metric.hasUrl()).isFalse(); assertThat(metric.hasHttpMethod()).isFalse(); @@ -198,19 +198,19 @@ public void testAllNullFields() { @Test public void testNoSessionIdsInNetworkRequestMetricWhenNotStarted() { - networkRequestBuilder.setUrl(/* url= */ "www.google.com"); + networkMetricBuilder.setUrl(/* url= */ "www.google.com"); - assertThat(networkRequestBuilder.getSessions()).isNotNull(); - assertThat(networkRequestBuilder.getSessions()).isEmpty(); + assertThat(networkMetricBuilder.getSessions()).isNotNull(); + assertThat(networkMetricBuilder.getSessions()).isEmpty(); } @Test public void testSessionIdsInNetworkRequestMetricAfterStarted() { - networkRequestBuilder.setUrl(/* url= */ "www.google.com"); - networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); + networkMetricBuilder.setUrl(/* url= */ "www.google.com"); + networkMetricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(networkRequestBuilder.getSessions()).isNotNull(); - assertThat(networkRequestBuilder.getSessions()).isNotEmpty(); + assertThat(networkMetricBuilder.getSessions()).isNotNull(); + assertThat(networkMetricBuilder.getSessions()).isNotEmpty(); } @Test @@ -219,8 +219,8 @@ public void testSessionIdAdditionInNetworkRequestMetric() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); - assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); + assertThat(this.networkMetricBuilder.getSessions()).isNotNull(); + assertThat(this.networkMetricBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); SessionManager.getInstance().updatePerfSession(ApplicationProcessState.FOREGROUND); @@ -234,8 +234,8 @@ public void testSessionIdNotAddedIfPerfSessionIsNull() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); - assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); + assertThat(this.networkMetricBuilder.getSessions()).isNotNull(); + assertThat(this.networkMetricBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); @@ -251,8 +251,8 @@ public void testSessionIdNotAddedForBackgroundInNetworkRequestMetric() { NetworkRequestMetricBuilder.builder(mockTransportManager); metricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(this.networkRequestBuilder.getSessions()).isNotNull(); - assertThat(this.networkRequestBuilder.getSessions()).isEmpty(); + assertThat(this.networkMetricBuilder.getSessions()).isNotNull(); + assertThat(this.networkMetricBuilder.getSessions()).isEmpty(); int numberOfSessionIds = metricBuilder.getSessions().size(); SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.BACKGROUND); @@ -262,7 +262,7 @@ public void testSessionIdNotAddedForBackgroundInNetworkRequestMetric() { @Test public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSession() { forceVerboseSession(); - networkRequestBuilder.setRequestStartTimeMicros(2000).build(); + networkMetricBuilder.setRequestStartTimeMicros(2000).build(); verify(mockGaugeManager).collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -270,7 +270,7 @@ public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSe public void testSetRequestStartTimeMicrosDoesNotSingleTriggerGaugeCollectionOnNonVerboseSession() { forceNonVerboseSession(); - networkRequestBuilder.setRequestStartTimeMicros(2000).build(); + networkMetricBuilder.setRequestStartTimeMicros(2000).build(); verify(mockGaugeManager, never()) .collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -278,7 +278,7 @@ public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSe @Test public void testSetTimeToResponseCompletedMicrosTriggerSingleGaugeCollectionOnVerboseSession() { forceVerboseSession(); - networkRequestBuilder.setTimeToResponseCompletedMicros(3000).build(); + networkMetricBuilder.setTimeToResponseCompletedMicros(3000).build(); verify(mockGaugeManager).collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @@ -286,70 +286,70 @@ public void testSetTimeToResponseCompletedMicrosTriggerSingleGaugeCollectionOnVe public void testSetTimeToResponseCompletedMicrosDoesNotTriggerSingleGaugeCollectionOnNonVerboseSession() { forceNonVerboseSession(); - networkRequestBuilder.setTimeToResponseCompletedMicros(3000).build(); + networkMetricBuilder.setTimeToResponseCompletedMicros(3000).build(); verify(mockGaugeManager, never()) .collectGaugeMetricOnce(ArgumentMatchers.nullable(Timer.class)); } @Test public void testSettingInvalidContentType() { - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType(""); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType(""); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isTrue(); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType("a\u001f"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType("a\u001f"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isFalse(); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType("a\u0020"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType("a\u0020"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isTrue(); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType("a\u007f"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType("a\u007f"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isTrue(); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType("a\u0080"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType("a\u0080"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isFalse(); byte[] bytes = new byte[Constants.MAX_CONTENT_TYPE_LENGTH]; Arrays.fill(bytes, (byte) 'x'); String str = new String(bytes, StandardCharsets.UTF_8); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType(str); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType(str); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isTrue(); - networkRequestBuilder.clearBuilderFields(); - networkRequestBuilder.setResponseContentType(str + "x"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); + networkMetricBuilder.clearBuilderFields(); + networkMetricBuilder.setResponseContentType(str + "x"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isFalse(); } @Test public void testSettingNullForContentTypeClearsIt() { - networkRequestBuilder.setResponseContentType("application/json"); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isTrue(); + networkMetricBuilder.setResponseContentType("application/json"); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isTrue(); - networkRequestBuilder.setResponseContentType(null); - assertThat(networkRequestBuilder.build().hasResponseContentType()).isFalse(); + networkMetricBuilder.setResponseContentType(null); + assertThat(networkMetricBuilder.build().hasResponseContentType()).isFalse(); } @Test public void testUpdateSessionWithValidSessionIsAdded() { - networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); + networkMetricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(networkRequestBuilder.getSessions()).hasSize(1); - networkRequestBuilder.updateSession(PerfSession.create()); - assertThat(networkRequestBuilder.getSessions()).hasSize(2); + assertThat(networkMetricBuilder.getSessions()).hasSize(1); + networkMetricBuilder.updateSession(PerfSession.create()); + assertThat(networkMetricBuilder.getSessions()).hasSize(2); } @Test public void testUpdateSessionWithNullIsNotAdded() { - networkRequestBuilder.setRequestStartTimeMicros(/* time= */ 2000); + networkMetricBuilder.setRequestStartTimeMicros(/* time= */ 2000); - assertThat(networkRequestBuilder.getSessions()).hasSize(1); - networkRequestBuilder.updateSession(null); - assertThat(networkRequestBuilder.getSessions()).hasSize(1); + assertThat(networkMetricBuilder.getSessions()).hasSize(1); + networkMetricBuilder.updateSession(null); + assertThat(networkMetricBuilder.getSessions()).hasSize(1); } } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java index ba74063052f..0b2f03bcb7f 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java @@ -49,21 +49,21 @@ public class InstrHttpInputStreamTest extends FirebasePerformanceTestBase { @Mock Timer timer; @Captor ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(timer.getMicros()).thenReturn((long) 1000); when(timer.getDurationMicros()).thenReturn((long) 2000); - networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); + networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testAvailable() throws IOException { int availableVal = 7; when(mInputStream.available()).thenReturn(availableVal); - int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).available(); + int ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).available(); assertThat(ret).isEqualTo(availableVal); verify(mInputStream).available(); @@ -71,7 +71,7 @@ public void testAvailable() throws IOException { @Test public void testClose() throws IOException { - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).close(); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).close(); verify(mInputStream).close(); verify(transportManager) @@ -83,7 +83,7 @@ public void testClose() throws IOException { public void testMark() throws IOException { int markInput = 256; - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).mark(markInput); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).mark(markInput); verify(mInputStream).mark(markInput); } @@ -91,7 +91,7 @@ public void testMark() throws IOException { @Test public void testMarkSupported() throws IOException { when(mInputStream.markSupported()).thenReturn(true); - boolean ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).markSupported(); + boolean ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).markSupported(); assertThat(ret).isTrue(); verify(mInputStream).markSupported(); @@ -101,7 +101,7 @@ public void testMarkSupported() throws IOException { public void testRead() throws IOException { int readVal = 256; when(mInputStream.read()).thenReturn(readVal); - int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(); + int ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(); assertThat(ret).isEqualTo(readVal); verify(mInputStream).read(); @@ -114,7 +114,7 @@ public void testReadBufferOffsetCount() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(readLength); int ret = - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer, offset, readLength); assertThat(ret).isEqualTo(readLength); verify(mInputStream).read(buffer, offset, readLength); @@ -126,7 +126,7 @@ public void testReadBuffer() throws IOException { byte[] buffer = new byte[] {(byte) 0xe6}; int readLength = 256; when(mInputStream.read(buffer)).thenReturn(readLength); - int ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer); + int ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer); assertThat(ret).isEqualTo(readLength); verify(mInputStream).read(buffer); @@ -134,7 +134,7 @@ public void testReadBuffer() throws IOException { @Test public void testReset() throws IOException { - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).reset(); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).reset(); verify(mInputStream).reset(); } @@ -143,7 +143,7 @@ public void testReset() throws IOException { public void testSkip() throws IOException { int skipLength = 64; when(mInputStream.skip(skipLength)).thenReturn((long) skipLength); - long ret = new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).skip(skipLength); + long ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).skip(skipLength); assertThat(ret).isEqualTo(skipLength); verify(mInputStream).skip(skipLength); @@ -154,7 +154,7 @@ public void availableThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).available(); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).available()); + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).available()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -166,7 +166,7 @@ public void availableThrowsIOException() throws IOException { public void closeThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).close(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).close()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).close()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -178,7 +178,7 @@ public void closeThrowsIOException() throws IOException { public void readThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).read(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -195,7 +195,7 @@ public void readByteOffsetCountThrowsIOException() throws IOException { assertThrows( IOException.class, () -> - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer) + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer) .read(buffer, offset, readLength)); verify(transportManager) @@ -210,7 +210,7 @@ public void readByteThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).read(buffer); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer)); + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -222,7 +222,7 @@ public void readByteThrowsIOException() throws IOException { public void resetThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).reset(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).reset()); + IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).reset()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -236,7 +236,7 @@ public void skipThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).skip(byteCount); assertThrows( IOException.class, - () -> new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).skip(byteCount)); + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).skip(byteCount)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -248,7 +248,7 @@ public void skipThrowsIOException() throws IOException { public void readEOFLogsMetric() throws IOException { when(mInputStream.read()).thenReturn(-1); - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -261,7 +261,7 @@ public void readByteEOFLogsMetric() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; when(mInputStream.read(buffer)).thenReturn(-1); - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -276,7 +276,7 @@ public void readByteOffsetCountEOFLogsMetric() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(-1); - new InstrHttpInputStream(mInputStream, networkRequestBuilder, timer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer, offset, readLength); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java index 98ffdeded4d..ab76a4ff3cb 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java @@ -48,35 +48,35 @@ public class InstrHttpOutputStreamTest extends FirebasePerformanceTestBase { @Mock Timer timer; @Captor ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(timer.getMicros()).thenReturn((long) 1000); when(timer.getDurationMicros()).thenReturn((long) 2000); - networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); + networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testClose() throws IOException { - new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).close(); + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).close(); - NetworkRequestMetric metric = networkRequestBuilder.build(); + NetworkRequestMetric metric = networkMetricBuilder.build(); assertThat(metric.getTimeToRequestCompletedUs()).isEqualTo(2000); verify(outputStream).close(); } @Test public void testFlush() throws IOException { - new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).flush(); + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).flush(); verify(outputStream).flush(); } @Test public void testWriteInt() throws IOException { - new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(8); + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(8); verify(outputStream).write(8); } @@ -85,7 +85,7 @@ public void testWriteInt() throws IOException { public void testWriteByteArray() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer); + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(buffer); verify(outputStream).write(buffer); } @@ -94,7 +94,7 @@ public void testWriteByteArray() throws IOException { public void testWriteByteArrayOffLength() throws IOException { byte[] buffer = new byte[] {(byte) 0xe0}; - new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer, 0, 1); + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(buffer, 0, 1); verify(outputStream).write(buffer, 0, 1); } @@ -105,7 +105,7 @@ public void closeThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).close()); + () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).close()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -119,7 +119,7 @@ public void flushThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).flush()); + () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).flush()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -133,7 +133,7 @@ public void writeIntThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(8)); + () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(8)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -148,7 +148,7 @@ public void writeByteThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer)); + () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(buffer)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); verifyErrorNetworkMetric(networkArgumentCaptor.getValue()); @@ -162,7 +162,7 @@ public void writeByteOffsetLengthThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkRequestBuilder, timer).write(buffer, 0, 1)); + () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(buffer, 0, 1)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java index e3d95ff255e..b69e6512d5c 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java @@ -57,21 +57,21 @@ public class InstrHttpURLConnectionTest extends FirebasePerformanceTestBase { @Mock private Timer timer; @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { initMocks(this); when(timer.getMicros()).thenReturn((long) 1000); when(timer.getDurationMicros()).thenReturn((long) 2000); - networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); + networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testConnect() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).connect(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).connect(); verify(urlConnection).connect(); } @@ -80,7 +80,7 @@ public void testConnect() throws IOException { public void testDisconnect() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).disconnect(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).disconnect(); verify(urlConnection).disconnect(); verify(transportManager) @@ -96,7 +96,7 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); + Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(); @@ -118,7 +118,7 @@ public void testGetContentIOException() throws IOException { when(urlConnection.getDoOutput()).thenReturn(true); when(urlConnection.getContent()).thenThrow(new IOException()); - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); verify(urlConnection).getContent(); verify(transportManager) @@ -141,7 +141,7 @@ public void testGetContentClasses() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent(classes)).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContent(classes); + Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(classes); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(classes); @@ -161,7 +161,7 @@ public void testGetInputStream() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getInputStream(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getInputStream(); verify(urlConnection).getInputStream(); } @@ -172,7 +172,7 @@ public void testGetLastModified() throws IOException { when(urlConnection.getDoOutput()).thenReturn(false); long lastModified = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getLastModified(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getLastModified(); assertEquals(6000, lastModified); verify(urlConnection).getLastModified(); @@ -185,7 +185,7 @@ public void testGetOutputStream() throws IOException { when(urlConnection.getOutputStream()).thenReturn(outputStream); OutputStream retOutputStream = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getOutputStream(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getOutputStream(); assertTrue(retOutputStream instanceof InstrHttpOutputStream); verify(urlConnection).getOutputStream(); @@ -198,7 +198,7 @@ public void testGetPermission() throws IOException { when(urlConnection.getPermission()).thenReturn(permission); Permission retPermission = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getPermission(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getPermission(); assertEquals(permission, retPermission); verify(urlConnection).getPermission(); @@ -208,7 +208,7 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - int retCode = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getResponseCode(); + int retCode = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); assertEquals(200, retCode); verify(urlConnection).getResponseCode(); @@ -220,7 +220,7 @@ public void testGetResponseMessage() throws IOException { when(urlConnection.getResponseMessage()).thenReturn("return message"); String retMessage = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getResponseMessage(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getResponseMessage(); assertEquals("return message", retMessage); verify(urlConnection).getResponseMessage(); @@ -232,7 +232,7 @@ public void testGetExpiration() throws IOException { when(urlConnection.getExpiration()).thenReturn((long) 1000); long retExpiration = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getExpiration(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getExpiration(); assertEquals(1000, retExpiration); verify(urlConnection).getExpiration(); @@ -244,7 +244,7 @@ public void testGetHeaderField() throws IOException { when(urlConnection.getHeaderField(1)).thenReturn("text/html"); String retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField(1); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField(1); assertEquals("text/html", retHeader); verify(urlConnection).getHeaderField(1); @@ -256,7 +256,7 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField("content-type"); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField("content-type"); assertEquals("text/html", retHeader); verify(urlConnection).getHeaderField("content-type"); @@ -268,7 +268,7 @@ public void testGetHeaderFieldInt() throws IOException { when(urlConnection.getHeaderFieldInt("content-type", 1)).thenReturn(2); int retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder) + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) .getHeaderFieldInt("content-type", 1); assertEquals(2, retHeader); @@ -281,7 +281,7 @@ public void testGetHeaderFieldLong() throws IOException { when(urlConnection.getHeaderFieldLong("content-type", 1)).thenReturn((long) 2); long retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder) + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) .getHeaderFieldLong("content-type", 1); assertEquals(2, retHeader); @@ -294,7 +294,7 @@ public void testGetHeaderFieldKey() throws IOException { when(urlConnection.getHeaderFieldKey(1)).thenReturn("content-type"); String retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFieldKey(1); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderFieldKey(1); assertEquals("content-type", retHeader); verify(urlConnection).getHeaderFieldKey(1); @@ -308,7 +308,7 @@ public void testGetHeaderFields() throws IOException { when(urlConnection.getHeaderFields()).thenReturn(values); Map> ret = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFields(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderFields(); assertEquals(values, ret); verify(urlConnection).getHeaderFields(); @@ -319,7 +319,7 @@ public void testGetContentEncoding() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentEncoding(); + String ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentEncoding(); assertEquals("ascii", ret); verify(urlConnection).getContentEncoding(); @@ -330,7 +330,7 @@ public void testGetContentLength() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentLength(); + int ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); assertEquals(256, ret); // 2 times, one for updating the request info and one for the return value @@ -342,7 +342,7 @@ public void testGetContentLengthLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentLengthLong(); + long ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentLengthLong(); assertEquals(256, ret); verify(urlConnection).getContentLengthLong(); @@ -353,7 +353,7 @@ public void testGetContentType() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getContentType(); + String ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); assertEquals("text/html", ret); verify(urlConnection).getContentType(); @@ -364,7 +364,7 @@ public void testGetDate() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDate()).thenReturn((long) 1000); - long ret = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDate(); + long ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDate(); assertEquals(1000, ret); verify(urlConnection).getDate(); @@ -376,7 +376,7 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).addRequestProperty(key, value); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -387,7 +387,7 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getAllowUserInteraction(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getAllowUserInteraction(); assertEquals(true, res); verify(urlConnection).getAllowUserInteraction(); @@ -399,7 +399,7 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getConnectTimeout(); + int res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); assertEquals(timeout, res); verify(urlConnection).getConnectTimeout(); @@ -410,7 +410,7 @@ public void testGetDefaultUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDefaultUseCaches()).thenReturn(false); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDefaultUseCaches(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDefaultUseCaches(); assertFalse(res); verify(urlConnection).getDefaultUseCaches(); @@ -421,7 +421,7 @@ public void testGetDoInput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDoInput(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); assertEquals(true, res); verify(urlConnection).getDoInput(); @@ -432,7 +432,7 @@ public void testGetDoOutput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getDoOutput(); + boolean result = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); assertFalse(result); verify(urlConnection).getDoOutput(); @@ -444,7 +444,7 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); + InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -455,7 +455,7 @@ public void testGetErrorStreamNull() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); + InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -467,7 +467,7 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getIfModifiedSince(); + long res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getIfModifiedSince(); assertEquals(modifiedSince, res); verify(urlConnection).getIfModifiedSince(); @@ -479,7 +479,7 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getInstanceFollowRedirects(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getInstanceFollowRedirects(); assertEquals(true, res); verify(urlConnection).getInstanceFollowRedirects(); @@ -491,7 +491,7 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getReadTimeout(); + int res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); assertEquals(timeout, res); verify(urlConnection).getReadTimeout(); @@ -503,7 +503,7 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestMethod(); + String res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); assertEquals(method, res); verify(urlConnection).getRequestMethod(); @@ -517,7 +517,7 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperties(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperties(); assertEquals(input, res); verify(urlConnection).getRequestProperties(); @@ -531,7 +531,7 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperty(property); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperty(property); assertEquals(value, res); verify(urlConnection).getRequestProperty(property); @@ -543,7 +543,7 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).getUseCaches(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); assertEquals(useCaches, res); verify(urlConnection).getUseCaches(); @@ -554,7 +554,7 @@ public void testSetAllowUserInteraction() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setAllowUserInteraction(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -564,7 +564,7 @@ public void testSetChunkedStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 134; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setChunkedStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -574,7 +574,7 @@ public void testSetConnectTimeout() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 150; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setConnectTimeout(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setConnectTimeout(val); verify(urlConnection).setConnectTimeout(val); } @@ -584,7 +584,7 @@ public void testSetDefaultUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDefaultUseCaches(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setDefaultUseCaches(val); verify(urlConnection).setDefaultUseCaches(val); } @@ -594,7 +594,7 @@ public void testSetDoInput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDoInput(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setDoInput(val); verify(urlConnection).setDoInput(val); } @@ -604,7 +604,7 @@ public void testSetDoOutput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setDoOutput(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setDoOutput(val); verify(urlConnection).setDoOutput(val); } @@ -614,7 +614,7 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 200; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -624,7 +624,7 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); long val = 142; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -634,7 +634,7 @@ public void testSetIfModifiedSince() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); long val = 72; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setIfModifiedSince(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setIfModifiedSince(val); verify(urlConnection).setIfModifiedSince(val); } @@ -644,7 +644,7 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setInstanceFollowRedirects(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -654,7 +654,7 @@ public void testSetReadTimeout() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 63; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setReadTimeout(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setReadTimeout(val); verify(urlConnection).setReadTimeout(val); } @@ -664,7 +664,7 @@ public void testSetRequestMethod() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); String val = "GET"; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setRequestMethod(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setRequestMethod(val); verify(urlConnection).setRequestMethod(val); } @@ -675,7 +675,7 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setRequestProperty(key, val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -685,7 +685,7 @@ public void testSetUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = true; - new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).setUseCaches(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setUseCaches(val); verify(urlConnection).setUseCaches(val); } @@ -696,7 +696,7 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkRequestBuilder).usingProxy(); + boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); assertEquals(val, res); verify(urlConnection).usingProxy(); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java index fa92a4d0173..b8247062467 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java @@ -62,21 +62,21 @@ public class InstrHttpsURLConnectionTest extends FirebasePerformanceTestBase { @Mock private Timer timer; @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { initMocks(this); when(timer.getMicros()).thenReturn((long) 1000); when(timer.getDurationMicros()).thenReturn((long) 2000); - networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); + networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test public void testConnect() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).connect(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).connect(); verify(urlConnection).connect(); } @@ -84,7 +84,7 @@ public void testConnect() throws IOException { @Test public void testDisconnect() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).disconnect(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).disconnect(); verify(urlConnection).disconnect(); verify(transportManager) @@ -100,7 +100,7 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContent(); + Object retObj = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); assertThat(retObj).isEqualTo(fakeObject); verify(urlConnection).getContent(); @@ -125,7 +125,7 @@ public void testGetContentClasses() throws IOException { when(urlConnection.getContent(classes)).thenReturn(fakeObject); Object retObj = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContent(classes); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContent(classes); assertThat(retObj).isEqualTo(fakeObject); verify(urlConnection).getContent(classes); @@ -145,7 +145,7 @@ public void testGetInputStream() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getInputStream(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getInputStream(); verify(urlConnection).getInputStream(); } @@ -156,7 +156,7 @@ public void testGetLastModified() throws IOException { when(urlConnection.getDoOutput()).thenReturn(false); long lastModified = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLastModified(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getLastModified(); assertThat(lastModified).isEqualTo(6000); verify(urlConnection).getLastModified(); @@ -169,7 +169,7 @@ public void testGetOutputStream() throws IOException { when(urlConnection.getOutputStream()).thenReturn(outputStream); OutputStream retOutputStream = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getOutputStream(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getOutputStream(); assertThat(retOutputStream).isInstanceOf(InstrHttpOutputStream.class); verify(urlConnection).getOutputStream(); @@ -182,7 +182,7 @@ public void testGetPermission() throws IOException { when(urlConnection.getPermission()).thenReturn(permission); Permission retPermission = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getPermission(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getPermission(); assertThat(permission).isEqualTo(retPermission); verify(urlConnection).getPermission(); @@ -192,7 +192,7 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - int retCode = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getResponseCode(); + int retCode = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); assertThat(retCode).isEqualTo(200); verify(urlConnection).getResponseCode(); @@ -204,7 +204,7 @@ public void testGetResponseMessage() throws IOException { when(urlConnection.getResponseMessage()).thenReturn("return message"); String retMessage = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getResponseMessage(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getResponseMessage(); assertThat(retMessage).isEqualTo("return message"); verify(urlConnection).getResponseMessage(); @@ -216,7 +216,7 @@ public void testGetExpiration() throws IOException { when(urlConnection.getExpiration()).thenReturn((long) 1000); long retExpiration = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getExpiration(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getExpiration(); assertThat(retExpiration).isEqualTo(1000); verify(urlConnection).getExpiration(); @@ -228,7 +228,7 @@ public void testGetHeaderField() throws IOException { when(urlConnection.getHeaderField(1)).thenReturn("text/html"); String retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField(1); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField(1); assertThat(retHeader).isEqualTo("text/html"); verify(urlConnection).getHeaderField(1); @@ -240,7 +240,7 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderField("content-type"); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField("content-type"); assertThat(retHeader).isEqualTo("text/html"); verify(urlConnection).getHeaderField("content-type"); @@ -252,7 +252,7 @@ public void testGetHeaderFieldInt() throws IOException { when(urlConnection.getHeaderFieldInt("content-type", 1)).thenReturn(2); int retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) .getHeaderFieldInt("content-type", 1); assertThat(retHeader).isEqualTo(2); @@ -265,7 +265,7 @@ public void testGetHeaderFieldLong() throws IOException { when(urlConnection.getHeaderFieldLong("content-type", 1)).thenReturn((long) 2); long retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) .getHeaderFieldLong("content-type", 1); assertThat(retHeader).isEqualTo(2); @@ -278,7 +278,7 @@ public void testGetHeaderFieldKey() throws IOException { when(urlConnection.getHeaderFieldKey(1)).thenReturn("content-type"); String retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFieldKey(1); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderFieldKey(1); assertThat(retHeader).isEqualTo("content-type"); verify(urlConnection).getHeaderFieldKey(1); @@ -292,7 +292,7 @@ public void testGetHeaderFields() throws IOException { when(urlConnection.getHeaderFields()).thenReturn(values); Map> ret = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHeaderFields(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderFields(); assertThat(ret).isEqualTo(values); verify(urlConnection).getHeaderFields(); @@ -303,7 +303,7 @@ public void testGetContentEncoding() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentEncoding(); + String ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentEncoding(); assertThat(ret).isEqualTo("ascii"); verify(urlConnection).getContentEncoding(); @@ -314,7 +314,7 @@ public void testGetContentLength() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentLength(); + int ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); assertThat(ret).isEqualTo(256); // 2 times, one for updating the request info and one for the return value @@ -326,7 +326,7 @@ public void testGetContentLengthLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentLengthLong(); + long ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentLengthLong(); assertThat(ret).isEqualTo(256); verify(urlConnection).getContentLengthLong(); @@ -337,7 +337,7 @@ public void testGetContentType() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getContentType(); + String ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); assertThat(ret).isEqualTo("text/html"); verify(urlConnection).getContentType(); @@ -348,7 +348,7 @@ public void testGetDate() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDate()).thenReturn((long) 1000); - long ret = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDate(); + long ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDate(); assertThat(ret).isEqualTo(1000); verify(urlConnection).getDate(); @@ -360,7 +360,7 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).addRequestProperty(key, value); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -371,7 +371,7 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getAllowUserInteraction(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getAllowUserInteraction(); assertThat(res).isTrue(); verify(urlConnection).getAllowUserInteraction(); @@ -383,7 +383,7 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getConnectTimeout(); + int res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getConnectTimeout(); @@ -395,7 +395,7 @@ public void testGetDefaultUseCaches() throws IOException { when(urlConnection.getDefaultUseCaches()).thenReturn(false); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDefaultUseCaches(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDefaultUseCaches(); assertThat(res).isFalse(); verify(urlConnection).getDefaultUseCaches(); @@ -406,7 +406,7 @@ public void testGetDoInput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDoInput(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); assertThat(res).isTrue(); verify(urlConnection).getDoInput(); @@ -417,7 +417,7 @@ public void testGetDoOutput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getDoOutput(); + boolean result = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); assertThat(result).isFalse(); verify(urlConnection).getDoOutput(); @@ -429,7 +429,7 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); + InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -440,7 +440,7 @@ public void testGetErrorStreamNull() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getErrorStream(); + InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -452,7 +452,7 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getIfModifiedSince(); + long res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getIfModifiedSince(); assertThat(res).isEqualTo(modifiedSince); verify(urlConnection).getIfModifiedSince(); @@ -464,7 +464,7 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getInstanceFollowRedirects(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getInstanceFollowRedirects(); assertThat(res).isTrue(); verify(urlConnection).getInstanceFollowRedirects(); @@ -476,7 +476,7 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getReadTimeout(); + int res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getReadTimeout(); @@ -488,7 +488,7 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestMethod(); + String res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); assertThat(res).isEqualTo(method); verify(urlConnection).getRequestMethod(); @@ -502,7 +502,7 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperties(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperties(); assertThat(res).isEqualTo(input); verify(urlConnection).getRequestProperties(); @@ -516,7 +516,7 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getRequestProperty(property); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperty(property); assertThat(res).isEqualTo(value); verify(urlConnection).getRequestProperty(property); @@ -528,7 +528,7 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getUseCaches(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); assertThat(res).isEqualTo(useCaches); verify(urlConnection).getUseCaches(); @@ -539,7 +539,7 @@ public void testSetAllowUserInteraction() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setAllowUserInteraction(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -549,7 +549,7 @@ public void testSetChunkedStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 134; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setChunkedStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -559,7 +559,7 @@ public void testSetConnectTimeout() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 150; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setConnectTimeout(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setConnectTimeout(val); verify(urlConnection).setConnectTimeout(val); } @@ -569,7 +569,7 @@ public void testSetDefaultUseCaches() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDefaultUseCaches(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setDefaultUseCaches(val); verify(urlConnection).setDefaultUseCaches(val); } @@ -579,7 +579,7 @@ public void testSetDoInput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDoInput(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setDoInput(val); verify(urlConnection).setDoInput(val); } @@ -589,7 +589,7 @@ public void testSetDoOutput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setDoOutput(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setDoOutput(val); verify(urlConnection).setDoOutput(val); } @@ -599,7 +599,7 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 200; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -609,7 +609,7 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); long val = 142; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -619,7 +619,7 @@ public void testSetIfModifiedSince() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); long val = 72; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setIfModifiedSince(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setIfModifiedSince(val); verify(urlConnection).setIfModifiedSince(val); } @@ -629,7 +629,7 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setInstanceFollowRedirects(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -639,7 +639,7 @@ public void testSetReadTimeout() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 63; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setReadTimeout(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setReadTimeout(val); verify(urlConnection).setReadTimeout(val); } @@ -649,7 +649,7 @@ public void testSetRequestMethod() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); String val = "GET"; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setRequestMethod(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setRequestMethod(val); verify(urlConnection).setRequestMethod(val); } @@ -660,7 +660,7 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setRequestProperty(key, val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -670,7 +670,7 @@ public void testSetUseCaches() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setUseCaches(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setUseCaches(val); verify(urlConnection).setUseCaches(val); } @@ -681,7 +681,7 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).usingProxy(); + boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); assertThat(res).isEqualTo(val); verify(urlConnection).usingProxy(); @@ -693,7 +693,7 @@ public void testGetCipherSuite() throws IOException { String val = "CipherSuite"; when(urlConnection.getCipherSuite()).thenReturn(val); - String res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getCipherSuite(); + String res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getCipherSuite(); assertThat(res).isEqualTo(val); verify(urlConnection).getCipherSuite(); @@ -713,7 +713,7 @@ public boolean verify(String hostname, SSLSession session) { when(urlConnection.getHostnameVerifier()).thenReturn(hostnameVerifier); HostnameVerifier res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getHostnameVerifier(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHostnameVerifier(); assertThat(res).isEqualTo(hostnameVerifier); verify(urlConnection).getHostnameVerifier(); @@ -727,7 +727,7 @@ public void testGetLocalCertificates() throws IOException { when(urlConnection.getLocalCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLocalCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getLocalCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getLocalCertificates(); @@ -746,7 +746,7 @@ public String getName() { when(urlConnection.getLocalPrincipal()).thenReturn(principal); Principal res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getLocalPrincipal(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getLocalPrincipal(); assertThat(res).isEqualTo(principal); verify(urlConnection).getLocalPrincipal(); @@ -764,7 +764,7 @@ public String getName() { }; when(urlConnection.getPeerPrincipal()).thenReturn(principal); - Principal res = new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getPeerPrincipal(); + Principal res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getPeerPrincipal(); assertThat(res).isEqualTo(principal); verify(urlConnection).getPeerPrincipal(); @@ -778,7 +778,7 @@ public void testGetServerCertificates() throws IOException { when(urlConnection.getServerCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getServerCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getServerCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getServerCertificates(); @@ -832,7 +832,7 @@ public Socket createSocket( when(urlConnection.getSSLSocketFactory()).thenReturn(factory); SSLSocketFactory res = - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).getSSLSocketFactory(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getSSLSocketFactory(); assertThat(res).isEqualTo(factory); verify(urlConnection).getSSLSocketFactory(); @@ -850,7 +850,7 @@ public boolean verify(String hostname, SSLSession session) { } }; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder) + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) .setHostnameVerifier(hostnameVerifier); verify(urlConnection).setHostnameVerifier(hostnameVerifier); @@ -902,7 +902,7 @@ public Socket createSocket( } }; - new InstrHttpsURLConnection(urlConnection, timer, networkRequestBuilder).setSSLSocketFactory(factory); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setSSLSocketFactory(factory); verify(urlConnection).setSSLSocketFactory(factory); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java index 6a61f329afe..a4d3a79ab30 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java @@ -49,14 +49,14 @@ public class InstrURLConnectionBaseTest extends FirebasePerformanceTestBase { @Mock private Timer timer; @Captor private ArgumentCaptor networkArgumentCaptor; - private NetworkRequestMetricBuilder networkRequestBuilder; + private NetworkRequestMetricBuilder networkMetricBuilder; @Before public void setUp() { initMocks(this); when(timer.getMicros()).thenReturn((long) 1000); when(timer.getDurationMicros()).thenReturn((long) 2000); - networkRequestBuilder = NetworkRequestMetricBuilder.builder(transportManager); + networkMetricBuilder = NetworkRequestMetricBuilder.builder(transportManager); } @Test @@ -65,7 +65,7 @@ public void testConnectThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).connect(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).connect()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).connect()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -81,7 +81,7 @@ public void testGetContentClassesThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getContent(classes); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getContent(classes)); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getContent(classes)); verify(urlConnection).getContent(classes); verify(transportManager) @@ -96,7 +96,7 @@ public void testGetInputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getInputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getInputStream()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getInputStream()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -109,7 +109,7 @@ public void testGetOutputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getOutputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getOutputStream()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getOutputStream()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -122,7 +122,7 @@ public void testGetPermissionThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getPermission(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getPermission()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getPermission()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -135,7 +135,7 @@ public void testGetResponseCodeThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseCode(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getResponseCode()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getResponseCode()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -148,7 +148,7 @@ public void testGetResponseMessageThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseMessage(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getResponseMessage()); + () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getResponseMessage()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -163,7 +163,7 @@ public void testGetHeaderFieldDate() { when(urlConnection.getHeaderFieldDate("content-date", defaultDate)).thenReturn(expectedDate); Long retDate = - new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder) + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) .getHeaderFieldDate("content-date", defaultDate); assertThat(retDate).isEqualTo(expectedDate); @@ -173,7 +173,7 @@ public void testGetHeaderFieldDate() { public void testGetUrl() throws MalformedURLException { HttpURLConnection urlConnection = mockHttpUrlConnection(); URL expectedURL = new URL("http://www.google.com"); - URL retURL = new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).getURL(); + URL retURL = new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getURL(); assertThat(retURL).isEqualTo(expectedURL); } @@ -182,7 +182,7 @@ public void testToString() { HttpURLConnection urlConnection = mockHttpUrlConnection(); String expectedStringRepr = "expectedStringRepr"; when(urlConnection.toString()).thenReturn(expectedStringRepr); - String retStringRepr = new InstrURLConnectionBase(urlConnection, timer, networkRequestBuilder).toString(); + String retStringRepr = new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).toString(); assertThat(retStringRepr).isEqualTo(expectedStringRepr); } From 7e0439ec1cb481d718496fe9cf5428d2e1f58e1c Mon Sep 17 00:00:00 2001 From: Ramanpreet Singh Date: Wed, 24 Mar 2021 19:18:27 -0700 Subject: [PATCH 3/5] Running google java formatter. --- .../perf/application/AppStateMonitorTest.java | 3 +- .../perf/metrics/AppStartTraceTest.java | 12 +- .../firebase/perf/metrics/HttpMetricTest.java | 60 ++++++--- .../NetworkRequestMetricBuilderTest.java | 9 +- .../FirebasePerfUrlConnectionTest.java | 9 +- .../network/InstrHttpInputStreamTest.java | 18 ++- .../network/InstrHttpOutputStreamTest.java | 4 +- .../network/InstrHttpURLConnectionTest.java | 92 +++++++++----- .../network/InstrHttpsURLConnectionTest.java | 120 ++++++++++++------ .../network/InstrURLConnectionBaseTest.java | 26 +++- 10 files changed, 244 insertions(+), 109 deletions(-) diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java index 9e3f27447c1..e144eac460a 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java @@ -160,8 +160,7 @@ public void testIncrementCount() { monitor.onActivityResumed(activity1); monitor.onActivityStopped(activity1); - verify(transportManager) - .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); + verify(transportManager).log(argTraceMetric.capture(), nullable(ApplicationProcessState.class)); TraceMetric metric = argTraceMetric.getValue(); Map counters = metric.getCountersMap(); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java index 6cb4313b41e..4c5749006f2 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java @@ -124,7 +124,9 @@ private void verifyFinalState( Assert.assertEquals(startTime, trace.getOnStartTime().getMicros()); Assert.assertEquals(resumeTime, trace.getOnResumeTime().getMicros()); verify(transportManager, times(1)) - .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + traceArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); TraceMetric metric = traceArgumentCaptor.getValue(); Assert.assertEquals(Constants.TraceNames.APP_START_TRACE_NAME.toString(), metric.getName()); @@ -201,7 +203,9 @@ public void testDelayedAppStart() { Assert.assertNull(trace.getOnResumeTime()); // There should be no trace sent. verify(transportManager, times(0)) - .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + traceArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); } @Test @@ -218,7 +222,9 @@ public void testStartFromBackground() { Assert.assertNull(trace.getOnResumeTime()); // There should be no trace sent. verify(transportManager, times(0)) - .log(traceArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + traceArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); } @Test diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java index 63c4bf0c99a..7b7e6a0072b 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/HttpMetricTest.java @@ -58,7 +58,9 @@ public void startStop() { metric.start(); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); verifyMetric(networkArgumentCaptor.getValue()); } @@ -70,7 +72,9 @@ public void setHttpResponseCode() { metric.setHttpResponseCode(200); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getHttpResponseCode()).isEqualTo(200); @@ -84,7 +88,9 @@ public void setRequestSize() { metric.setRequestPayloadSize(256); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getRequestPayloadBytes()).isEqualTo(256); @@ -98,7 +104,9 @@ public void setResponseSize() { metric.setResponsePayloadSize(256); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getResponsePayloadBytes()).isEqualTo(256); @@ -112,7 +120,9 @@ public void setResponseContentType() { metric.setResponseContentType("text/html"); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); verifyMetric(metricValue); assertThat(metricValue.getResponseContentType()).isEqualTo("text/html"); @@ -126,7 +136,9 @@ public void markRequestComplete() { metric.markRequestComplete(); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -144,7 +156,9 @@ public void markResponseStart() { metric.markResponseStart(); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -162,7 +176,9 @@ public void putAttribute() { metric.putAttribute("attr1", "free"); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -181,7 +197,9 @@ public void putInvalidAttribute() { metric.putAttribute("_invalidattr1", "free"); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -199,7 +217,9 @@ public void putAttributeAfterHttpMetricIsStopped() { metric.stop(); metric.putAttribute("attr1", "free"); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -222,7 +242,9 @@ public void removeAttribute() { assertThat(attributes.size()).isEqualTo(0); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -241,7 +263,9 @@ public void removeAttributeAfterStopped() { metric.stop(); metric.removeAttribute("attr1"); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -261,7 +285,9 @@ public void addAttributeWithSameName() { metric.putAttribute("attr1", "paid"); metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -285,7 +311,9 @@ public void testMaxAttributes() { } metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) @@ -311,7 +339,9 @@ public void testMoreThanMaxAttributes() { } metric.stop(); verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), + ArgumentMatchers.nullable(ApplicationProcessState.class)); NetworkRequestMetric metricValue = networkArgumentCaptor.getValue(); assertThat(metricValue.getUrl()).isEqualTo("https://www.google.com/"); assertThat(metricValue.getHttpMethod()) diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java index e3cf6abb53b..462ddea7eea 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java @@ -161,21 +161,24 @@ public void testSetRequestStartTimeMicros() { @Test public void testSetRequestEndTimeMicros() { long time = 2000; - NetworkRequestMetric metric = networkMetricBuilder.setTimeToRequestCompletedMicros(time).build(); + NetworkRequestMetric metric = + networkMetricBuilder.setTimeToRequestCompletedMicros(time).build(); assertThat(metric.getTimeToRequestCompletedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseInitiatedMicros() { long time = 2000; - NetworkRequestMetric metric = networkMetricBuilder.setTimeToResponseInitiatedMicros(time).build(); + NetworkRequestMetric metric = + networkMetricBuilder.setTimeToResponseInitiatedMicros(time).build(); assertThat(metric.getTimeToResponseInitiatedUs()).isEqualTo(time); } @Test public void testSetTimeToResponseCompletedMicros() { long time = 2000; - NetworkRequestMetric metric = networkMetricBuilder.setTimeToResponseCompletedMicros(time).build(); + NetworkRequestMetric metric = + networkMetricBuilder.setTimeToResponseCompletedMicros(time).build(); assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(time); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java index e161aa19436..bdf9111bdaf 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfUrlConnectionTest.java @@ -65,7 +65,8 @@ public void testOpenStreamHttpConnectionError() throws IOException { fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -82,7 +83,8 @@ public void testGetContentError() throws IOException { fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } @@ -101,7 +103,8 @@ public void testGetContentClasses() throws IOException { fail("expected IOException"); } catch (IOException e) { verify(transportManager) - .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); + .log( + networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); verifyNetworkRequestMetric(metric); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java index 0b2f03bcb7f..8a7ecb2131b 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java @@ -91,7 +91,8 @@ public void testMark() throws IOException { @Test public void testMarkSupported() throws IOException { when(mInputStream.markSupported()).thenReturn(true); - boolean ret = new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).markSupported(); + boolean ret = + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).markSupported(); assertThat(ret).isTrue(); verify(mInputStream).markSupported(); @@ -114,7 +115,8 @@ public void testReadBufferOffsetCount() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(readLength); int ret = - new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer) + .read(buffer, offset, readLength); assertThat(ret).isEqualTo(readLength); verify(mInputStream).read(buffer, offset, readLength); @@ -166,7 +168,8 @@ public void availableThrowsIOException() throws IOException { public void closeThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).close(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).close()); + IOException.class, + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).close()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -178,7 +181,8 @@ public void closeThrowsIOException() throws IOException { public void readThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).read(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read()); + IOException.class, + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -222,7 +226,8 @@ public void readByteThrowsIOException() throws IOException { public void resetThrowsIOException() throws IOException { doThrow(new IOException()).when(mInputStream).reset(); assertThrows( - IOException.class, () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).reset()); + IOException.class, + () -> new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).reset()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); @@ -276,7 +281,8 @@ public void readByteOffsetCountEOFLogsMetric() throws IOException { int readLength = 256; when(mInputStream.read(buffer, offset, readLength)).thenReturn(-1); - new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer).read(buffer, offset, readLength); + new InstrHttpInputStream(mInputStream, networkMetricBuilder, timer) + .read(buffer, offset, readLength); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java index ab76a4ff3cb..3d049a6a746 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java @@ -162,7 +162,9 @@ public void writeByteOffsetLengthThrowsIOException() throws IOException { assertThrows( IOException.class, - () -> new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer).write(buffer, 0, 1)); + () -> + new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer) + .write(buffer, 0, 1)); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java index b69e6512d5c..1a12f87e9be 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java @@ -96,7 +96,8 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); + Object retObj = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(); @@ -141,7 +142,8 @@ public void testGetContentClasses() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent(classes)).thenReturn(fakeObject); - Object retObj = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(classes); + Object retObj = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContent(classes); assertEquals(fakeObject, retObj); verify(urlConnection).getContent(classes); @@ -208,7 +210,8 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); - int retCode = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); + int retCode = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); assertEquals(200, retCode); verify(urlConnection).getResponseCode(); @@ -256,7 +259,8 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField("content-type"); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getHeaderField("content-type"); assertEquals("text/html", retHeader); verify(urlConnection).getHeaderField("content-type"); @@ -319,7 +323,8 @@ public void testGetContentEncoding() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentEncoding(); + String ret = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentEncoding(); assertEquals("ascii", ret); verify(urlConnection).getContentEncoding(); @@ -330,7 +335,8 @@ public void testGetContentLength() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); + int ret = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); assertEquals(256, ret); // 2 times, one for updating the request info and one for the return value @@ -342,7 +348,9 @@ public void testGetContentLengthLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentLengthLong(); + long ret = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getContentLengthLong(); assertEquals(256, ret); verify(urlConnection).getContentLengthLong(); @@ -353,7 +361,8 @@ public void testGetContentType() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); + String ret = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); assertEquals("text/html", ret); verify(urlConnection).getContentType(); @@ -376,7 +385,8 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).addRequestProperty(key, value); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -387,7 +397,8 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getAllowUserInteraction(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getAllowUserInteraction(); assertEquals(true, res); verify(urlConnection).getAllowUserInteraction(); @@ -399,7 +410,8 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); + int res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); assertEquals(timeout, res); verify(urlConnection).getConnectTimeout(); @@ -410,7 +422,9 @@ public void testGetDefaultUseCaches() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDefaultUseCaches()).thenReturn(false); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDefaultUseCaches(); + boolean res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getDefaultUseCaches(); assertFalse(res); verify(urlConnection).getDefaultUseCaches(); @@ -421,7 +435,8 @@ public void testGetDoInput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); + boolean res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); assertEquals(true, res); verify(urlConnection).getDoInput(); @@ -432,7 +447,8 @@ public void testGetDoOutput() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); + boolean result = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); assertFalse(result); verify(urlConnection).getDoOutput(); @@ -444,7 +460,8 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); + InputStream res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -455,7 +472,8 @@ public void testGetErrorStreamNull() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); + InputStream res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -467,7 +485,8 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getIfModifiedSince(); + long res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getIfModifiedSince(); assertEquals(modifiedSince, res); verify(urlConnection).getIfModifiedSince(); @@ -479,7 +498,8 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getInstanceFollowRedirects(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getInstanceFollowRedirects(); assertEquals(true, res); verify(urlConnection).getInstanceFollowRedirects(); @@ -491,7 +511,8 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); + int res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); assertEquals(timeout, res); verify(urlConnection).getReadTimeout(); @@ -503,7 +524,8 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); + String res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); assertEquals(method, res); verify(urlConnection).getRequestMethod(); @@ -517,7 +539,8 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperties(); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getRequestProperties(); assertEquals(input, res); verify(urlConnection).getRequestProperties(); @@ -531,7 +554,8 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperty(property); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .getRequestProperty(property); assertEquals(value, res); verify(urlConnection).getRequestProperty(property); @@ -543,7 +567,8 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); + boolean res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); assertEquals(useCaches, res); verify(urlConnection).getUseCaches(); @@ -554,7 +579,8 @@ public void testSetAllowUserInteraction() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setAllowUserInteraction(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -564,7 +590,8 @@ public void testSetChunkedStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 134; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setChunkedStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -614,7 +641,8 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); int val = 200; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -624,7 +652,8 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); long val = 142; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -644,7 +673,8 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpURLConnection urlConnection = mockHttpUrlConnection(); boolean val = false; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setInstanceFollowRedirects(val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -675,7 +705,8 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).setRequestProperty(key, val); + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder) + .setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -696,7 +727,8 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); + boolean res = + new InstrHttpURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); assertEquals(val, res); verify(urlConnection).usingProxy(); diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java index b8247062467..96fa6a89b9d 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java @@ -100,7 +100,8 @@ public void testGetContent() throws IOException { Object fakeObject = new Object(); when(urlConnection.getContent()).thenReturn(fakeObject); - Object retObj = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); + Object retObj = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContent(); assertThat(retObj).isEqualTo(fakeObject); verify(urlConnection).getContent(); @@ -192,7 +193,8 @@ public void testGetPermission() throws IOException { public void testGetResponseCode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); - int retCode = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); + int retCode = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getResponseCode(); assertThat(retCode).isEqualTo(200); verify(urlConnection).getResponseCode(); @@ -204,7 +206,8 @@ public void testGetResponseMessage() throws IOException { when(urlConnection.getResponseMessage()).thenReturn("return message"); String retMessage = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getResponseMessage(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getResponseMessage(); assertThat(retMessage).isEqualTo("return message"); verify(urlConnection).getResponseMessage(); @@ -240,7 +243,8 @@ public void testGetHeaderFieldString() throws IOException { when(urlConnection.getHeaderField("content-type")).thenReturn("text/html"); String retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderField("content-type"); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getHeaderField("content-type"); assertThat(retHeader).isEqualTo("text/html"); verify(urlConnection).getHeaderField("content-type"); @@ -278,7 +282,8 @@ public void testGetHeaderFieldKey() throws IOException { when(urlConnection.getHeaderFieldKey(1)).thenReturn("content-type"); String retHeader = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHeaderFieldKey(1); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getHeaderFieldKey(1); assertThat(retHeader).isEqualTo("content-type"); verify(urlConnection).getHeaderFieldKey(1); @@ -303,7 +308,9 @@ public void testGetContentEncoding() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentEncoding()).thenReturn("ascii"); - String ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentEncoding(); + String ret = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getContentEncoding(); assertThat(ret).isEqualTo("ascii"); verify(urlConnection).getContentEncoding(); @@ -314,7 +321,8 @@ public void testGetContentLength() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLength()).thenReturn(256); - int ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); + int ret = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentLength(); assertThat(ret).isEqualTo(256); // 2 times, one for updating the request info and one for the return value @@ -326,7 +334,9 @@ public void testGetContentLengthLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentLengthLong()).thenReturn((long) 256); - long ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentLengthLong(); + long ret = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getContentLengthLong(); assertThat(ret).isEqualTo(256); verify(urlConnection).getContentLengthLong(); @@ -337,7 +347,8 @@ public void testGetContentType() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getContentType()).thenReturn("text/html"); - String ret = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); + String ret = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getContentType(); assertThat(ret).isEqualTo("text/html"); verify(urlConnection).getContentType(); @@ -360,7 +371,8 @@ public void testAddRequestProperty() throws IOException { String key = "test"; String value = "one"; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).addRequestProperty(key, value); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .addRequestProperty(key, value); verify(urlConnection).addRequestProperty(key, value); } @@ -371,7 +383,8 @@ public void testGetAllowUserInteraction() throws IOException { when(urlConnection.getAllowUserInteraction()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getAllowUserInteraction(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getAllowUserInteraction(); assertThat(res).isTrue(); verify(urlConnection).getAllowUserInteraction(); @@ -383,7 +396,8 @@ public void testGetConnectTimeout() throws IOException { int timeout = 8; when(urlConnection.getConnectTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); + int res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getConnectTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getConnectTimeout(); @@ -395,7 +409,8 @@ public void testGetDefaultUseCaches() throws IOException { when(urlConnection.getDefaultUseCaches()).thenReturn(false); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDefaultUseCaches(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getDefaultUseCaches(); assertThat(res).isFalse(); verify(urlConnection).getDefaultUseCaches(); @@ -406,7 +421,8 @@ public void testGetDoInput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoInput()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); + boolean res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoInput(); assertThat(res).isTrue(); verify(urlConnection).getDoInput(); @@ -417,7 +433,8 @@ public void testGetDoOutput() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getDoOutput()).thenReturn(false); - boolean result = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); + boolean result = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getDoOutput(); assertThat(result).isFalse(); verify(urlConnection).getDoOutput(); @@ -429,7 +446,8 @@ public void testGetErrorStream() throws IOException { InputStream inputStream = mock(InputStream.class); when(urlConnection.getErrorStream()).thenReturn(inputStream); - InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); + InputStream res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isInstanceOf(InstrHttpInputStream.class); verify(urlConnection).getErrorStream(); @@ -440,7 +458,8 @@ public void testGetErrorStreamNull() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); when(urlConnection.getErrorStream()).thenReturn(null); - InputStream res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); + InputStream res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getErrorStream(); assertThat(res).isNull(); verify(urlConnection).getErrorStream(); @@ -452,7 +471,9 @@ public void testGetIfModifiedSince() throws IOException { long modifiedSince = 3000; when(urlConnection.getIfModifiedSince()).thenReturn(modifiedSince); - long res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getIfModifiedSince(); + long res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getIfModifiedSince(); assertThat(res).isEqualTo(modifiedSince); verify(urlConnection).getIfModifiedSince(); @@ -464,7 +485,8 @@ public void testGetInstanceFollowRedirects() throws IOException { when(urlConnection.getInstanceFollowRedirects()).thenReturn(true); boolean res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getInstanceFollowRedirects(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getInstanceFollowRedirects(); assertThat(res).isTrue(); verify(urlConnection).getInstanceFollowRedirects(); @@ -476,7 +498,8 @@ public void testGetReadTimeout() throws IOException { int timeout = 9; when(urlConnection.getReadTimeout()).thenReturn(timeout); - int res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); + int res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getReadTimeout(); assertThat(res).isEqualTo(timeout); verify(urlConnection).getReadTimeout(); @@ -488,7 +511,8 @@ public void testGetRequestMethod() throws IOException { String method = "POST"; when(urlConnection.getRequestMethod()).thenReturn(method); - String res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); + String res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestMethod(); assertThat(res).isEqualTo(method); verify(urlConnection).getRequestMethod(); @@ -502,7 +526,8 @@ public void testGetRequestProperties() throws IOException { when(urlConnection.getRequestProperties()).thenReturn(input); Map> res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperties(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getRequestProperties(); assertThat(res).isEqualTo(input); verify(urlConnection).getRequestProperties(); @@ -516,7 +541,8 @@ public void testGetRequestProperty() throws IOException { when(urlConnection.getRequestProperty(property)).thenReturn(value); String res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getRequestProperty(property); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getRequestProperty(property); assertThat(res).isEqualTo(value); verify(urlConnection).getRequestProperty(property); @@ -528,7 +554,8 @@ public void testGetUseCaches() throws IOException { boolean useCaches = false; when(urlConnection.getUseCaches()).thenReturn(useCaches); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); + boolean res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getUseCaches(); assertThat(res).isEqualTo(useCaches); verify(urlConnection).getUseCaches(); @@ -539,7 +566,8 @@ public void testSetAllowUserInteraction() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setAllowUserInteraction(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setAllowUserInteraction(val); verify(urlConnection).setAllowUserInteraction(val); } @@ -549,7 +577,8 @@ public void testSetChunkedStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 134; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setChunkedStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setChunkedStreamingMode(val); verify(urlConnection).setChunkedStreamingMode(val); } @@ -569,7 +598,8 @@ public void testSetDefaultUseCaches() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = true; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setDefaultUseCaches(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setDefaultUseCaches(val); verify(urlConnection).setDefaultUseCaches(val); } @@ -599,7 +629,8 @@ public void testSetFixedLengthStreamingMode() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); int val = 200; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -609,7 +640,8 @@ public void testSetFixedLengthStreamingModeLong() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); long val = 142; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setFixedLengthStreamingMode(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setFixedLengthStreamingMode(val); verify(urlConnection).setFixedLengthStreamingMode(val); } @@ -629,7 +661,8 @@ public void testSetInstanceFollowRedirects() throws IOException { HttpsURLConnection urlConnection = mockHttpsUrlConnection(); boolean val = false; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setInstanceFollowRedirects(val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setInstanceFollowRedirects(val); verify(urlConnection).setInstanceFollowRedirects(val); } @@ -660,7 +693,8 @@ public void testSetRequestProperty() throws IOException { String key = "content-length"; String val = "256"; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setRequestProperty(key, val); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setRequestProperty(key, val); verify(urlConnection).setRequestProperty(key, val); } @@ -681,7 +715,8 @@ public void testUsingProxy() throws IOException { boolean val = true; when(urlConnection.usingProxy()).thenReturn(true); - boolean res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); + boolean res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).usingProxy(); assertThat(res).isEqualTo(val); verify(urlConnection).usingProxy(); @@ -693,7 +728,8 @@ public void testGetCipherSuite() throws IOException { String val = "CipherSuite"; when(urlConnection.getCipherSuite()).thenReturn(val); - String res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getCipherSuite(); + String res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getCipherSuite(); assertThat(res).isEqualTo(val); verify(urlConnection).getCipherSuite(); @@ -713,7 +749,8 @@ public boolean verify(String hostname, SSLSession session) { when(urlConnection.getHostnameVerifier()).thenReturn(hostnameVerifier); HostnameVerifier res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getHostnameVerifier(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getHostnameVerifier(); assertThat(res).isEqualTo(hostnameVerifier); verify(urlConnection).getHostnameVerifier(); @@ -727,7 +764,8 @@ public void testGetLocalCertificates() throws IOException { when(urlConnection.getLocalCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getLocalCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getLocalCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getLocalCertificates(); @@ -764,7 +802,8 @@ public String getName() { }; when(urlConnection.getPeerPrincipal()).thenReturn(principal); - Principal res = new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getPeerPrincipal(); + Principal res = + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getPeerPrincipal(); assertThat(res).isEqualTo(principal); verify(urlConnection).getPeerPrincipal(); @@ -778,7 +817,8 @@ public void testGetServerCertificates() throws IOException { when(urlConnection.getServerCertificates()).thenReturn(certificate); Certificate[] res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getServerCertificates(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getServerCertificates(); assertThat(res).isEqualTo(certificate); verify(urlConnection).getServerCertificates(); @@ -832,7 +872,8 @@ public Socket createSocket( when(urlConnection.getSSLSocketFactory()).thenReturn(factory); SSLSocketFactory res = - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).getSSLSocketFactory(); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .getSSLSocketFactory(); assertThat(res).isEqualTo(factory); verify(urlConnection).getSSLSocketFactory(); @@ -902,7 +943,8 @@ public Socket createSocket( } }; - new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder).setSSLSocketFactory(factory); + new InstrHttpsURLConnection(urlConnection, timer, networkMetricBuilder) + .setSSLSocketFactory(factory); verify(urlConnection).setSSLSocketFactory(factory); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java index a4d3a79ab30..424f8d9a4f4 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java @@ -81,7 +81,9 @@ public void testGetContentClassesThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getContent(classes); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getContent(classes)); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) + .getContent(classes)); verify(urlConnection).getContent(classes); verify(transportManager) @@ -96,7 +98,9 @@ public void testGetInputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getInputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getInputStream()); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) + .getInputStream()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -109,7 +113,9 @@ public void testGetOutputStreamThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getOutputStream(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getOutputStream()); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) + .getOutputStream()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -122,7 +128,8 @@ public void testGetPermissionThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getPermission(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getPermission()); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getPermission()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -135,7 +142,9 @@ public void testGetResponseCodeThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseCode(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getResponseCode()); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) + .getResponseCode()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -148,7 +157,9 @@ public void testGetResponseMessageThrowsIOException() throws IOException { doThrow(IOException.class).when(urlConnection).getResponseMessage(); assertThrows( IOException.class, - () -> new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getResponseMessage()); + () -> + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder) + .getResponseMessage()); verify(transportManager) .log(networkArgumentCaptor.capture(), ArgumentMatchers.any(ApplicationProcessState.class)); NetworkRequestMetric metric = networkArgumentCaptor.getValue(); @@ -182,7 +193,8 @@ public void testToString() { HttpURLConnection urlConnection = mockHttpUrlConnection(); String expectedStringRepr = "expectedStringRepr"; when(urlConnection.toString()).thenReturn(expectedStringRepr); - String retStringRepr = new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).toString(); + String retStringRepr = + new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).toString(); assertThat(retStringRepr).isEqualTo(expectedStringRepr); } From c0b96a23bf373be58f72cd06cfb128733af48caf Mon Sep 17 00:00:00 2001 From: Ramanpreet Singh Date: Thu, 25 Mar 2021 10:18:36 -0700 Subject: [PATCH 4/5] Addressing review comment on camelcasing for one of the variable. --- .../testing/timing/FakeDirectExecutorService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java b/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java index 07834aeaec1..30961683921 100644 --- a/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java +++ b/firebase-perf/src/test/java/com/google/testing/timing/FakeDirectExecutorService.java @@ -21,7 +21,7 @@ /** Fake executor service that simply executes the runnable in the same thread. */ public class FakeDirectExecutorService extends AbstractExecutorService { - private boolean IsShutdown = false; + private boolean isShutdown = false; public void execute(Runnable command) { command.run(); @@ -34,22 +34,22 @@ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedE @Override public boolean isShutdown() { - return IsShutdown; + return isShutdown; } @Override public void shutdown() { - IsShutdown = true; + isShutdown = true; } @Override public List shutdownNow() { - IsShutdown = true; + isShutdown = true; return Arrays.asList(); } @Override public boolean isTerminated() { - return IsShutdown; + return isShutdown; } } From 1e17889215b5b8462fce8b0b33b2009662898838 Mon Sep 17 00:00:00 2001 From: Ramanpreet Singh Date: Thu, 25 Mar 2021 10:31:22 -0700 Subject: [PATCH 5/5] Fixing tests broken because the variable name was not updated in child classes. --- .../perf/config/DeviceCacheManagerTest.java | 34 +++++++++---------- .../firebase/perf/metrics/TraceTest.java | 4 +-- .../perf/session/PerfSessionTest.java | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java index af436b906c6..a537f15536c 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java @@ -39,7 +39,7 @@ public void setUp() { @Test public void getBoolean_valueIsNotSet_returnsEmpty() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.getBoolean("some_key").isAvailable()).isFalse(); @@ -53,7 +53,7 @@ public void getBoolean_contextAndValueNotSet_returnsEmpty() { @Test public void getBoolean_valueIsSet_returnsSetValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", true); @@ -62,7 +62,7 @@ public void getBoolean_valueIsSet_returnsSetValue() { @Test public void clear_setBooleanThenCleared_returnsEmpty() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", true); @@ -85,7 +85,7 @@ public void getBoolean_firebaseAppNotExist_returnsEmpty() { @Test public void setValueBoolean_setTwice_canGetLatestValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", true); assertThat(deviceCacheManager.getBoolean("some_key").get()).isTrue(); @@ -108,7 +108,7 @@ public void setValueBoolean_keyIsNull_returnsFalse() { @Test public void getString_valueIsNotSet_returnsEmpty() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.getString("some_key").isAvailable()).isFalse(); @@ -121,7 +121,7 @@ public void getString_contextAndValueNotSet_returnsEmpty() { @Test public void getString_valueIsSet_returnsSetValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", "specialValue"); @@ -140,7 +140,7 @@ public void getString_firebaseAppNotExist_returnsEmpty() { @Test public void setValueString_setTwice_canGetLatestValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", "EarliestValue"); assertThat(deviceCacheManager.getString("some_key").get()).isEqualTo("EarliestValue"); @@ -157,7 +157,7 @@ public void setValueString_contextNotSet_returnsEmpty() { @Test public void setValueString_setNullString_returnsEmpty() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", null); assertThat(deviceCacheManager.getString("some_key").isAvailable()).isFalse(); @@ -165,14 +165,14 @@ public void setValueString_setNullString_returnsEmpty() { @Test public void setValueString_keyIsNull_returnsFalse() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.setValue(null, "value")).isFalse(); } @Test public void getFloat_valueIsNotSet_returnsEmpty() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.getFloat("some_key").isAvailable()).isFalse(); @@ -189,7 +189,7 @@ public void getFloat_contextAndValueNotSet_returnsEmpty() { @Test public void getFloat_valueIsSet_returnsSetValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", 1.2f); @@ -209,7 +209,7 @@ public void getFloat_firebaseAppNotExist_returnsEmpty() { @Test public void setValueFloat_setTwice_canGetLatestValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", 1.01f); assertThat(deviceCacheManager.getFloat("some_key").get()).isEqualTo(1.01f); @@ -226,7 +226,7 @@ public void setValueFloat_contextNotSet_returnsEmpty() { @Test public void setValueFloat_keyIsNull_returnsFalse() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.setValue(null, 10.0f)).isFalse(); } @@ -235,7 +235,7 @@ public void setValueFloat_keyIsNull_returnsFalse() { public void getLong_valueIsNotSet_returnsEmpty() { DeviceCacheManager.clearInstance(); deviceCacheManager = new DeviceCacheManager(fakeScheduledExecutorService); - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(fakeScheduledExecutorService.isEmpty()).isTrue(); @@ -253,7 +253,7 @@ public void getLong_contextAndValueNotSet_returnsEmpty() { @Test public void getLong_valueIsSet_returnsSetValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", 1L); @@ -272,7 +272,7 @@ public void getLong_firebaseAppNotExist_returnsEmpty() { @Test public void setValueLong_setTwice_canGetLatestValue() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); deviceCacheManager.setValue("some_key", 2L); assertThat(deviceCacheManager.getLong("some_key").get()).isEqualTo(2L); @@ -290,7 +290,7 @@ public void setValueLong_contextNotSet_returnsEmpty() { @Test public void setValueLong_keyIsNull_returnsFalse() { - deviceCacheManager.setContext(context); + deviceCacheManager.setContext(appContext); fakeScheduledExecutorService.runAll(); assertThat(deviceCacheManager.setValue(null, 10.0f)).isFalse(); } diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java index a723e27c7e0..62308edb4fe 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java @@ -80,10 +80,10 @@ public void setUp() { DeviceCacheManager.clearInstance(); ConfigResolver.clearInstance(); - context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().clear().commit(); + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().clear().commit(); ConfigResolver configResolver = ConfigResolver.getInstance(); configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService())); - configResolver.setApplicationContext(context); + configResolver.setApplicationContext(appContext); } @Test diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java index a03fa39c97e..ff923a1151c 100644 --- a/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java +++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java @@ -53,8 +53,8 @@ public void setUp() { DeviceCacheManager.clearInstance(); ConfigResolver.clearInstance(); - context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().clear().commit(); - ConfigResolver.getInstance().setApplicationContext(context); + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().clear().commit(); + ConfigResolver.getInstance().setApplicationContext(appContext); } @Test