Skip to content

Commit 3f2384c

Browse files
committed
gjf
1 parent aa4b5d4 commit 3f2384c

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
148148
fragmentActivity
149149
.getSupportFragmentManager()
150150
.registerFragmentLifecycleCallbacks(
151-
new FragmentStateMonitor(
152-
clock, transportManager, this, frameMetricsAggregator),
151+
new FragmentStateMonitor(clock, transportManager, this, frameMetricsAggregator),
153152
true);
154153
}
155154
}

firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.firebase.perf.transport.TransportManager;
2424
import com.google.firebase.perf.util.Clock;
2525
import com.google.firebase.perf.util.Constants;
26-
2726
import java.util.WeakHashMap;
2827

2928
public class FragmentStateMonitor extends FragmentManager.FragmentLifecycleCallbacks {
@@ -60,14 +59,18 @@ public void onFragmentResumed(@NonNull FragmentManager fm, @NonNull Fragment f)
6059
super.onFragmentResumed(fm, f);
6160
// Start Fragment screen trace
6261
logger.debug("FragmentMonitor %s.onFragmentResumed", f.getClass().getSimpleName());
63-
Trace fragmentTrace = new Trace(getFragmentScreenTraceName(f), transportManager, clock, appStateMonitor);
62+
Trace fragmentTrace =
63+
new Trace(getFragmentScreenTraceName(f), transportManager, clock, appStateMonitor);
6464
fragmentTrace.start();
6565

6666
if (f.getParentFragment() != null) {
67-
fragmentTrace.putAttribute(Constants.PARENT_FRAGMENT_ATTRIBUTE_KEY, f.getParentFragment().getClass().getSimpleName());
67+
fragmentTrace.putAttribute(
68+
Constants.PARENT_FRAGMENT_ATTRIBUTE_KEY,
69+
f.getParentFragment().getClass().getSimpleName());
6870
}
6971
if (f.getActivity() != null) {
70-
fragmentTrace.putAttribute(Constants.ACTIVITY_ATTRIBUTE_KEY, f.getActivity().getClass().getSimpleName());
72+
fragmentTrace.putAttribute(
73+
Constants.ACTIVITY_ATTRIBUTE_KEY, f.getActivity().getClass().getSimpleName());
7174
}
7275

7376
fragmentToTraceMap.put(f, fragmentTrace);
@@ -79,7 +82,8 @@ public void onFragmentPaused(@NonNull FragmentManager fm, @NonNull Fragment f) {
7982
// Stop Fragment screen trace
8083
logger.debug("FragmentMonitor %s.onFragmentPaused ", f.getClass().getSimpleName());
8184
if (!fragmentToTraceMap.containsKey(f)) {
82-
logger.error("FragmentMonitor: missed a fragment trace from %s", f.getClass().getSimpleName());
85+
logger.error(
86+
"FragmentMonitor: missed a fragment trace from %s", f.getClass().getSimpleName());
8387
}
8488

8589
Trace fragmentTrace = fragmentToTraceMap.get(f);

firebase-perf/src/test/java/com/google/firebase/perf/application/FragmentStateMonitorTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package com.google.firebase.perf.application;
22

33
import static org.mockito.ArgumentMatchers.any;
4-
import static org.mockito.ArgumentMatchers.eq;
54
import static org.mockito.Mockito.doAnswer;
65
import static org.mockito.Mockito.times;
76
import static org.mockito.Mockito.verify;
87
import static org.mockito.MockitoAnnotations.initMocks;
98

109
import android.app.Activity;
11-
1210
import androidx.appcompat.app.AppCompatActivity;
1311
import androidx.core.app.FrameMetricsAggregator;
1412
import androidx.fragment.app.Fragment;
1513
import androidx.fragment.app.FragmentManager;
16-
1714
import com.google.firebase.perf.FirebasePerformanceTestBase;
1815
import com.google.firebase.perf.config.ConfigResolver;
1916
import com.google.firebase.perf.config.DeviceCacheManager;
@@ -22,8 +19,6 @@
2219
import com.google.firebase.perf.util.Timer;
2320
import com.google.firebase.perf.v1.TraceMetric;
2421
import com.google.testing.timing.FakeDirectExecutorService;
25-
26-
import org.junit.Assert;
2722
import org.junit.Before;
2823
import org.junit.Test;
2924
import org.junit.runner.RunWith;
@@ -45,8 +40,7 @@ public class FragmentStateMonitorTest extends FirebasePerformanceTestBase {
4540
@Mock private AppStateMonitor appStateMonitor;
4641
@Mock private FrameMetricsAggregator fma;
4742

48-
@Captor
49-
private ArgumentCaptor<TraceMetric> argTraceMetric;
43+
@Captor private ArgumentCaptor<TraceMetric> argTraceMetric;
5044

5145
private long currentTime = 0;
5246

@@ -63,16 +57,16 @@ public void setUp() {
6357

6458
ConfigResolver configResolver = ConfigResolver.getInstance();
6559
configResolver.setDeviceCacheManager(new DeviceCacheManager(new FakeDirectExecutorService()));
66-
6760
}
6861

6962
@Test
7063
public void fragmentLifecycleCallbacks_logFragmentScreenTrace() {
71-
FragmentStateMonitor monitor = new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, fma);
64+
FragmentStateMonitor monitor =
65+
new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, fma);
7266
monitor.onFragmentResumed(mockfragmentManager, mockFragment);
7367
verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
7468

7569
monitor.onFragmentPaused(mockfragmentManager, mockFragment);
7670
verify(mockTransportManager, times(1)).log(any(TraceMetric.class), any());
7771
}
78-
}
72+
}

0 commit comments

Comments
 (0)