Skip to content

Updating variable names from the test classes to follow Java's code convention (b/177441811) #2546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 25, 2021
Merged

Updating variable names from the test classes to follow Java's code convention (b/177441811) #2546

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67f419c
Fixing variable names from the test classes only.
ramanpreetSinghKhinda Mar 25, 2021
3b1990c
Updating "networkRequestBuilder" to "networkMetricBuilder" to align w…
ramanpreetSinghKhinda Mar 25, 2021
7e0439e
Running google java formatter.
ramanpreetSinghKhinda Mar 25, 2021
c0b96a2
Addressing review comment on camelcasing for one of the variable.
ramanpreetSinghKhinda Mar 25, 2021
1e17889
Fixing tests broken because the variable name was not updated in chil…
ramanpreetSinghKhinda Mar 25, 2021
53780bd
Merging from Master
ramanpreetSinghKhinda Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@ 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)
.setApiKey(FAKE_FIREBASE_API_KEY)
.setDatabaseUrl(FAKE_FIREBASE_DB_URL)
.setProjectId(FAKE_FIREBASE_PROJECT_ID)
.build();
FirebaseApp.initializeApp(context, options);
FirebaseApp.initializeApp(appContext, options);
}

@After
Expand Down
192 changes: 95 additions & 97 deletions firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 81 additions & 75 deletions firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TraceMetric> mArguments;
private ArgumentCaptor<TraceMetric> 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() {
Expand All @@ -73,48 +73,48 @@ public void setUp() {
new Answer<Timer>() {
@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(
Expand All @@ -124,18 +124,20 @@ 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());
Expand All @@ -156,69 +158,73 @@ 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
Expand Down
Loading