Skip to content

Commit

Permalink
Fix warnings in integration_tests:androidx_test
Browse files Browse the repository at this point in the history
This removes unused dependencies and addresses most warnings in `integration_tests:androidx_test`.
  • Loading branch information
MGaetan89 committed Dec 6, 2024
1 parent e8efda6 commit b616ede
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 62 deletions.
4 changes: 0 additions & 4 deletions integration_tests/androidx_test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ dependencies {

// Testing dependencies
testImplementation(project(":robolectric"))
testImplementation(libs.androidx.test.runner)
testImplementation(libs.junit4)
testImplementation(libs.androidx.test.rules)
testImplementation(libs.androidx.test.espresso.intents)
Expand All @@ -63,12 +62,9 @@ dependencies {
testImplementation(libs.truth)

androidTestImplementation(project(":annotations"))
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.junit4)
androidTestImplementation(libs.androidx.test.rules)
androidTestImplementation(libs.androidx.test.espresso.intents)
androidTestImplementation(libs.androidx.test.espresso.core)
androidTestImplementation(libs.androidx.test.ext.truth)
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(platform(libs.kotlin.bom))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import org.robolectric.integration.axt.R;

Expand All @@ -26,7 +27,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
menuClicked = true;
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.annotation.NonNull;
import org.robolectric.integration.axt.R;

/** {@link EspressoWithMenuTest} fixture activity that uses Android platform menu's */
Expand All @@ -26,7 +27,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
menuClicked = true;
return true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout"
android:layout_width="match_parent"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout"
android:layout_width="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="org.robolectric.integration.axt"/>
android:targetPackage="org.robolectric.integrationtests.axt"/>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public class ActivityScenarioTest {

private static final List<String> callbacks = new ArrayList<>();

/**
* @noinspection NewClassNamingConvention
*/
public static class TranscriptActivity extends Activity {

@Override
Expand Down Expand Up @@ -96,6 +99,9 @@ public void onWindowFocusChanged(boolean hasFocus) {
}
}

/**
* @noinspection NewClassNamingConvention
*/
public static class LifecycleOwnerActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle bundle) {
Expand All @@ -109,6 +115,9 @@ public void setUp() {
callbacks.clear();
}

/**
* @noinspection NewClassNamingConvention
*/
public static class ActivityWithCustomConstructor extends Activity {
private final int intValue;

Expand All @@ -121,6 +130,9 @@ public int getIntValue() {
}
}

/**
* @noinspection NewClassNamingConvention
*/
public static class CustomAppComponentFactory extends AppComponentFactory {

@Nonnull
Expand Down Expand Up @@ -324,20 +336,16 @@ public void onActivity_runsOnMainLooperThread() {
try (ActivityScenario<TranscriptActivity> activityScenario =
ActivityScenario.launch(TranscriptActivity.class)) {
activityScenario.onActivity(
activity -> {
assertThat(Looper.getMainLooper().getThread()).isEqualTo(Thread.currentThread());
});
activity ->
assertThat(Looper.getMainLooper().getThread()).isEqualTo(Thread.currentThread()));
}
}

@Test
public void getCallingActivity_empty() {
try (ActivityScenario<TranscriptActivity> activityScenario =
ActivityScenario.launch(TranscriptActivity.class)) {
activityScenario.onActivity(
activity -> {
assertThat(activity.getCallingActivity()).isNull();
});
activityScenario.onActivity(activity -> assertThat(activity.getCallingActivity()).isNull());
}
}

Expand All @@ -346,10 +354,9 @@ public void getCallingActivity_isSet() {
try (ActivityScenario<TranscriptActivity> activityScenario =
ActivityScenario.launchActivityForResult(TranscriptActivity.class)) {
activityScenario.onActivity(
activity -> {
assertThat(activity.getCallingActivity().getPackageName())
.isEqualTo("org.robolectric.integrationtests.axt");
});
activity ->
assertThat(activity.getCallingActivity().getPackageName())
.isEqualTo("org.robolectric.integrationtests.axt"));
}
}

Expand All @@ -359,10 +366,7 @@ public void launchActivityWithCustomConstructor() {
try (ActivityScenario<ActivityWithCustomConstructor> activityScenario =
ActivityScenario.launch(ActivityWithCustomConstructor.class)) {
assertThat(activityScenario.getState()).isEqualTo(State.RESUMED);
activityScenario.onActivity(
activity -> {
assertThat(activity.getIntValue()).isEqualTo(100);
});
activityScenario.onActivity(activity -> assertThat(activity.getIntValue()).isEqualTo(100));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ protected void afterActivityFinished() {
}
};

/**
* @noinspection NewClassNamingConvention
*/
public static class TranscriptActivity extends Activity {
Bundle receivedBundle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import androidx.fragment.app.FragmentActivity;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.Executor;
import javax.annotation.Nonnull;
import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import org.junit.Before;
Expand All @@ -33,22 +31,7 @@ public void biometricPromptAuthenticateShouldNotCrashWithNoSuchMethodError()
throws NoSuchPaddingException, NoSuchAlgorithmException {
BiometricPrompt biometricPrompt =
new BiometricPrompt(
fragmentActivity,
new Executor() {
@Override
public void execute(Runnable command) {}
},
new BiometricPrompt.AuthenticationCallback() {
@Override
public void onAuthenticationError(int errorCode, @Nonnull CharSequence errString) {}

@Override
public void onAuthenticationSucceeded(
@Nonnull BiometricPrompt.AuthenticationResult result) {}

@Override
public void onAuthenticationFailed() {}
});
fragmentActivity, command -> {}, new BiometricPrompt.AuthenticationCallback() {});

PromptInfo promptInfo =
new PromptInfo.Builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void teardown() {
}

@Test
public void onIdle_idlingResourceIsIdle_doesntBlock() {
public void onIdle_idlingResourceIsIdle_doesNotBlock() {
AtomicBoolean didCheckIdle = new AtomicBoolean();
idlingRegistry.register(
new NamedIdleResource("Test", /* isIdle= */ true) {
Expand Down Expand Up @@ -179,6 +179,9 @@ public void onIdle_looperPostsToMainThread_shouldWaitForTheTaskOnMainThreadToFin
}
}

/**
* @noinspection NewClassNamingConvention
*/
private static class NamedIdleResource implements IdlingResource {
final String name;
final AtomicBoolean isIdle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void setUp() {
public void launchActivity() {}

@Test
public void onIdle_doesnt_block() {
public void onIdle_does_not_block() {
Espresso.onIdle();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class EspressoWithSwitchCompatTest {
@Test
public void switchCompatTest() {
try (ActivityScenario<ActivityWithSwitchCompat> scenario =
try (ActivityScenario<ActivityWithSwitchCompat> ignored =
ActivityScenario.launch(ActivityWithSwitchCompat.class)) {
onView(withId(R.id.switch_compat_2)).check(matches(isCompletelyDisplayed())).perform(click());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ public class FragmentScenarioTest {
@Test
public void launchFragment() {
final AtomicReference<Fragment> loadedFragment = new AtomicReference<>();
FragmentScenario.launch(Fragment.class).onFragment(loadedFragment::set);
assertThat(loadedFragment.get()).isNotNull();
try (FragmentScenario<Fragment> scenario = FragmentScenario.launch(Fragment.class)) {
scenario.onFragment(loadedFragment::set);
assertThat(loadedFragment.get()).isNotNull();
}
}

/**
Expand All @@ -30,7 +32,9 @@ public void launchFragment() {
@Config(instrumentedPackages = "androidx.")
public void launchFragmentInstrumented() {
final AtomicReference<Fragment> loadedFragment = new AtomicReference<>();
FragmentScenario.launch(Fragment.class).onFragment(loadedFragment::set);
assertThat(loadedFragment.get()).isNotNull();
try (FragmentScenario<Fragment> scenario = FragmentScenario.launch(Fragment.class)) {
scenario.onFragment(loadedFragment::set);
assertThat(loadedFragment.get()).isNotNull();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ public void testIntendedSuccess_truthChainedCorrespondence() {
assertThat(getIntents()).comparingElementsUsing(all(action(), data())).contains(expectedIntent);
}

/** Activity that captures calls to {#onActivityResult() } */
/**
* Activity that captures calls to {@link Activity#onActivityResult(int, int, Intent)}
*
* @noinspection NewClassNamingConvention
*/
public static class ResultCapturingActivity extends Activity {

private ActivityResult activityResult;
Expand Down Expand Up @@ -165,25 +169,30 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}

/** Dummy activity whose calls we intent to we're stubbing out. */
/**
* Dummy activity whose calls we intent to we're stubbing out.
*
* @noinspection NewClassNamingConvention
*/
public static class DummyActivity extends Activity {}

@Test
public void intending_callsOnActivityResult() {
intending(hasComponent(hasClassName(DummyActivity.class.getName())))
.respondWith(new ActivityResult(Activity.RESULT_OK, new Intent().putExtra("key", 123)));

ActivityScenario<ResultCapturingActivity> activityScenario =
ActivityScenario.launch(ResultCapturingActivity.class);

activityScenario.onActivity(
activity -> activity.startActivityForResult(new Intent(activity, DummyActivity.class), 0));

activityScenario.onActivity(
activity -> {
assertThat(activity.activityResult.getResultCode()).isEqualTo(Activity.RESULT_OK);
assertThat(activity.activityResult.getResultData()).extras().containsKey("key");
});
try (ActivityScenario<ResultCapturingActivity> activityScenario =
ActivityScenario.launch(ResultCapturingActivity.class)) {
activityScenario.onActivity(
activity ->
activity.startActivityForResult(new Intent(activity, DummyActivity.class), 0));

activityScenario.onActivity(
activity -> {
assertThat(activity.activityResult.getResultCode()).isEqualTo(Activity.RESULT_OK);
assertThat(activity.activityResult.getResultData()).extras().containsKey("key");
});
}
}

@Test
Expand Down

0 comments on commit b616ede

Please sign in to comment.