Skip to content

Commit dcd2042

Browse files
Fireperf: fix unchecked operations in e2e FirebasePerformanceFragmentScreenTracesTest (#3637)
* attempt to fix unchecked operations * gjf * spelling
1 parent b564bee commit dcd2042

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceFragmentScreenTracesTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@
1919
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2020
import static com.google.common.truth.Truth.assertThat;
2121

22-
import android.app.Activity;
2322
import androidx.annotation.NonNull;
24-
import androidx.appcompat.app.AppCompatActivity;
2523
import androidx.fragment.app.Fragment;
24+
import androidx.fragment.app.FragmentActivity;
2625
import androidx.fragment.app.FragmentManager;
2726
import androidx.lifecycle.Lifecycle.State;
2827
import androidx.navigation.NavController;
2928
import androidx.navigation.Navigation;
3029
import androidx.test.core.app.ActivityScenario;
3130
import androidx.test.ext.junit.rules.ActivityScenarioRule;
31+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3232
import androidx.test.filters.MediumTest;
33-
import androidx.test.runner.AndroidJUnit4;
3433
import com.google.firebase.testing.fireperf.ui.fast.FastFragment;
3534
import com.google.firebase.testing.fireperf.ui.home.HomeFragment;
3635
import com.google.firebase.testing.fireperf.ui.slow.SlowFragment;
@@ -48,16 +47,16 @@
4847
public class FirebasePerformanceFragmentScreenTracesTest {
4948

5049
@Rule
51-
public ActivityScenarioRule<FragmentActivity> activityRule =
52-
new ActivityScenarioRule<>(FragmentActivity.class);
50+
public ActivityScenarioRule<FirebasePerfFragmentsActivity> activityRule =
51+
new ActivityScenarioRule<>(FirebasePerfFragmentsActivity.class);
5352

5453
@Test
5554
public void scrollAndCycleThroughAllFragments() throws InterruptedException {
5655
activityRule
5756
.getScenario()
5857
.onActivity(
5958
activity -> {
60-
((AppCompatActivity) activity)
59+
((FragmentActivity) activity)
6160
.getSupportFragmentManager()
6261
.registerFragmentLifecycleCallbacks(
6362
new FragmentManager.FragmentLifecycleCallbacks() {
@@ -99,15 +98,16 @@ private synchronized void notifyNavigationLock() {
9998
notify();
10099
}
101100

102-
static class NavigateAction implements ActivityScenario.ActivityAction {
101+
static class NavigateAction
102+
implements ActivityScenario.ActivityAction<FirebasePerfFragmentsActivity> {
103103
private final int destinationId;
104104

105105
public NavigateAction(int destinationId) {
106106
this.destinationId = destinationId;
107107
}
108108

109109
@Override
110-
public void perform(Activity activity) {
110+
public void perform(FirebasePerfFragmentsActivity activity) {
111111
NavController navController =
112112
Navigation.findNavController(activity, R.id.nav_host_fragment_activity_fragment);
113113
navController.navigate(destinationId);

firebase-perf/e2e-app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:usesCleartextTraffic="true"
1313
tools:ignore="HardcodedDebugMode,UnusedAttribute">
1414
<activity
15-
android:name=".FragmentActivity"
15+
android:name=".FirebasePerfFragmentsActivity"
1616
android:label="@string/title_activity_fragment"
1717
android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar" />
1818
<activity

firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FragmentActivity.java renamed to firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfFragmentsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import androidx.navigation.ui.NavigationUI;
2222
import com.google.android.material.bottomnavigation.BottomNavigationView;
2323

24-
public class FragmentActivity extends AppCompatActivity {
24+
public class FirebasePerfFragmentsActivity extends AppCompatActivity {
2525
@Override
2626
protected void onCreate(Bundle savedInstanceState) {
2727
super.onCreate(savedInstanceState);

firebase-perf/e2e-app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright 2021 Google Inc. All Rights Reserved. -->
22

33
<resources>
4-
<string name="title_activity_fragment">FragmentActivity</string>
4+
<string name="title_activity_fragment">FirebasePerfFragmentsActivity</string>
55
<string name="title_home">Home</string>
66
<string name="title_fast">Fast</string>
77
<string name="title_slow">Slow</string>

0 commit comments

Comments
 (0)