Skip to content

Commit

Permalink
Reformat Java files in the whole project
Browse files Browse the repository at this point in the history 
Following the merge of robolectric#9201, this commit reformats the whole project to adhere to `google-java-format` 1.22.0.
  • Loading branch information
@MGaetan89
MGaetan89 committed Jun 20, 2024
1 parent 385c5df commit 4606156
Show file tree
Hide file tree
Showing 668 changed files with 17,628 additions and 16,002 deletions.
3 changes: 1 addition & 2 deletions annotations/src/main/java/org/robolectric/annotation/internal/ConfigUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import org.robolectric.annotation.Config;

public class ConfigUtils {
private ConfigUtils() {
}
private ConfigUtils() {}

public static String[] parseStringArrayProperty(String property) {
if (property.isEmpty()) return new String[0];
Expand Down
8 changes: 4 additions & 4 deletions errorprone/src/main/java/org/robolectric/errorprone/bugpatterns/Helpers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ public static TypePredicate isCastableTo(String type) {

public static boolean isInShadowClass(TreePath path, VisitorState state) {
Tree leaf = path.getLeaf();
JCClassDecl classDecl = JCClassDecl.class.isInstance(leaf)
? (JCClassDecl) leaf
: findEnclosingNode(state.getPath(), JCClassDecl.class);
JCClassDecl classDecl =
JCClassDecl.class.isInstance(leaf)
? (JCClassDecl) leaf
: findEnclosingNode(state.getPath(), JCClassDecl.class);

return ASTHelpers.hasAnnotation(classDecl, Implements.class.getName(), state);
}
Expand All @@ -54,5 +55,4 @@ public boolean apply(Type type, VisitorState state) {
return ASTHelpers.isCastable(type, bound, state);
}
}

}
4 changes: 3 additions & 1 deletion errorprone/src/test/java/org/robolectric/errorprone/bugpatterns/RobolectricShadowTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/** @author christianw@google.com (Christian Williams) */
/**
* @author christianw@google.com (Christian Williams)
*/
@RunWith(JUnit4.class)
public class RobolectricShadowTest {
private BugCheckerRefactoringTestHelper testHelper;
Expand Down
3 changes: 1 addition & 2 deletions errorprone/src/test/java/xxx/XShadowLooper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ public String getSchedule() {
return null;
}

public void runToEndOfTasks() {
}
public void runToEndOfTasks() {}
}
3 changes: 1 addition & 2 deletions errorprone/src/test/java/xxx/XShadowNetworkInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
*/
@Implements(ConnectivityManager.class)
public class XShadowNetworkInfo {
public void setConnectionType(int connectionType) {
}
public void setConnectionType(int connectionType) {}
}
4 changes: 2 additions & 2 deletions errorprone/src/test/java/xxx/XShadows.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import java.util.Map;

/**
* Fake {@link org.robolectric.internal.ShadowProvider} for testing
* {@link org.robolectric.errorprone.bugpatterns.ShadowUsageCheck}.
* Fake {@link org.robolectric.internal.ShadowProvider} for testing {@link
* org.robolectric.errorprone.bugpatterns.ShadowUsageCheck}.
*/
public class XShadows implements org.robolectric.internal.ShadowProvider {
public static XShadowAlertDialog shadowOf(AlertDialog actual) {
Expand Down
4 changes: 1 addition & 3 deletions ...tsupport/src/main/java/org/robolectric/integrationtests/agp/testsupport/TestActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@
import android.app.Activity;

/** Activity for use in unit tests. */
public class TestActivity extends Activity {

}
public class TestActivity extends Activity {}
146 changes: 78 additions & 68 deletions ...ndroidx_test/src/test/java/org/robolectric/integrationtests/axt/ActivityScenarioTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,24 +139,29 @@ public Activity instantiateActivity(
public void launch_callbackSequence() {
try (ActivityScenario<TranscriptActivity> activityScenario =
ActivityScenario.launch(TranscriptActivity.class)) {
assertThat(activityScenario).isNotNull();
assertThat(callbacks)
.containsExactly(
"onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true");
assertThat(activityScenario).isNotNull();
assertThat(callbacks)
.containsExactly(
"onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true");
}
}

@Test
public void launch_pauseAndResume_callbackSequence() {
try (ActivityScenario<TranscriptActivity> activityScenario =
ActivityScenario.launch(TranscriptActivity.class)) {
assertThat(activityScenario).isNotNull();
activityScenario.moveToState(State.STARTED);
activityScenario.moveToState(State.RESUMED);
assertThat(callbacks)
.containsExactly(
"onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true",
"onPause", "onResume");
assertThat(activityScenario).isNotNull();
activityScenario.moveToState(State.STARTED);
activityScenario.moveToState(State.RESUMED);
assertThat(callbacks)
.containsExactly(
"onCreate",
"onStart",
"onPostCreate",
"onResume",
"onWindowFocusChanged true",
"onPause",
"onResume");
}
}

Expand All @@ -167,18 +172,18 @@ public void launch_stopAndResume_callbackSequence() {
assertThat(activityScenario).isNotNull();
activityScenario.moveToState(State.CREATED);
activityScenario.moveToState(State.RESUMED);
assertThat(callbacks)
.containsExactly(
"onCreate",
"onStart",
"onPostCreate",
"onResume",
"onWindowFocusChanged true",
"onPause",
"onStop false",
"onRestart",
"onStart",
"onResume");
assertThat(callbacks)
.containsExactly(
"onCreate",
"onStart",
"onPostCreate",
"onResume",
"onWindowFocusChanged true",
"onPause",
"onStop false",
"onRestart",
"onStart",
"onResume");
}
}

Expand All @@ -191,28 +196,31 @@ public void launchAlias_createTargetAndCallbackSequence() {
.setClassName(
context, "org.robolectric.integrationtests.axt.ActivityScenarioTestAlias"))) {

assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> assertThat(activity).isInstanceOf(TranscriptActivity.class));
assertThat(callbacks)
.containsExactly(
"onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true");
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> assertThat(activity).isInstanceOf(TranscriptActivity.class));
assertThat(callbacks)
.containsExactly(
"onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true");
}
}

@Test
public void launch_lifecycleOwnerActivity() {
try (ActivityScenario<LifecycleOwnerActivity> activityScenario =
ActivityScenario.launch(LifecycleOwnerActivity.class)) {
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.RESUMED));
activityScenario.moveToState(State.STARTED);
activityScenario.onActivity(
activity -> assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.STARTED));
activityScenario.moveToState(State.CREATED);
activityScenario.onActivity(
activity -> assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.CREATED));
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity ->
assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.RESUMED));
activityScenario.moveToState(State.STARTED);
activityScenario.onActivity(
activity ->
assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.STARTED));
activityScenario.moveToState(State.CREATED);
activityScenario.onActivity(
activity ->
assertThat(activity.getLifecycle().getCurrentState()).isEqualTo(State.CREATED));
}
}

Expand All @@ -222,22 +230,23 @@ public void recreate_retainFragmentHostingActivity() {
fragment.setRetainInstance(true);
try (ActivityScenario<LifecycleOwnerActivity> activityScenario =
ActivityScenario.launch(LifecycleOwnerActivity.class)) {
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> {
activity
.getSupportFragmentManager()
.beginTransaction()
.add(android.R.id.content, fragment)
.commitNow();
assertThat(activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isSameInstanceAs(fragment);
});
activityScenario.recreate();
activityScenario.onActivity(
activity ->
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> {
activity
.getSupportFragmentManager()
.beginTransaction()
.add(android.R.id.content, fragment)
.commitNow();
assertThat(activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isSameInstanceAs(fragment));
.isSameInstanceAs(fragment);
});
activityScenario.recreate();
activityScenario.onActivity(
activity ->
assertThat(
activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isSameInstanceAs(fragment));
}
}

Expand All @@ -247,22 +256,23 @@ public void recreate_nonRetainFragmentHostingActivity() {
fragment.setRetainInstance(false);
try (ActivityScenario<LifecycleOwnerActivity> activityScenario =
ActivityScenario.launch(LifecycleOwnerActivity.class)) {
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> {
activity
.getSupportFragmentManager()
.beginTransaction()
.add(android.R.id.content, fragment)
.commitNow();
assertThat(activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isSameInstanceAs(fragment);
});
activityScenario.recreate();
activityScenario.onActivity(
activity ->
assertThat(activityScenario).isNotNull();
activityScenario.onActivity(
activity -> {
activity
.getSupportFragmentManager()
.beginTransaction()
.add(android.R.id.content, fragment)
.commitNow();
assertThat(activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isNotSameInstanceAs(fragment));
.isSameInstanceAs(fragment);
});
activityScenario.recreate();
activityScenario.onActivity(
activity ->
assertThat(
activity.getSupportFragmentManager().findFragmentById(android.R.id.content))
.isNotSameInstanceAs(fragment));
}
}

Expand Down
11 changes: 7 additions & 4 deletions ...ndroidx_test/src/test/java/org/robolectric/integrationtests/axt/ActivityTestRuleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;

/** Integration tests for {@link ActivityTestRule} that verify it behaves consistently on device and
* Robolectric. */
/**
* Integration tests for {@link ActivityTestRule} that verify it behaves consistently on device and
* Robolectric.
*/
@RunWith(AndroidJUnit4.class)
public class ActivityTestRuleTest {

Expand Down Expand Up @@ -58,7 +60,7 @@ public void onCreate(Bundle savedInstanceState) {
@Override
public void onStart() {
super.onStart();
callbacks.add("onStart");
callbacks.add("onStart");
}

@Override
Expand Down Expand Up @@ -116,7 +118,8 @@ public void launchActivity_bundle() {
assertThat(activity.receivedBundle).isNull();
}

@Test public void launchActivity_intentExtras() {
@Test
public void launchActivity_intentExtras() {
Intent intent = new Intent();
intent.putExtra("Key", "Value");

Expand Down
1 change: 0 additions & 1 deletion ..._test/src/test/java/org/robolectric/integrationtests/axt/InstrumentationRegistryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ private void checkInstances() {
.isNotEqualTo(InstrumentationRegistry.getInstrumentation().getTargetContext());
}
}

}
3 changes: 1 addition & 2 deletions integration_tests/ctesque/src/sharedTest/java/android/content/pm/PackageManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ public void getPackageInfo_disabledApplication_withFlags_returnedEverything() th

PackageInfo packageInfo =
pm.getPackageInfo(
context.getPackageName(),
GET_SERVICES | GET_ACTIVITIES | MATCH_DISABLED_COMPONENTS);
context.getPackageName(), GET_SERVICES | GET_ACTIVITIES | MATCH_DISABLED_COMPONENTS);
ActivityInfo[] activities = filterExtraneous(packageInfo.activities);

assertThat(packageInfo.applicationInfo.enabled).isFalse();
Expand Down
7 changes: 2 additions & 5 deletions integration_tests/ctesque/src/sharedTest/java/android/content/res/AssetManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
import org.junit.runner.RunWith;
import org.robolectric.annotation.internal.DoNotInstrument;

/**
* Compatibility test for {@link AssetManager}
*/
/** Compatibility test for {@link AssetManager} */
@DoNotInstrument
@RunWith(AndroidJUnit4.class)
public class AssetManagerTest {
Expand All @@ -41,8 +39,7 @@ public void assetsPathListing() throws IOException {
.asList()
.containsAtLeast("assetsHome.txt", "robolectric.png", "myFont.ttf");

assertThat(assetManager.list("testing")).asList()
.contains("hello.txt");
assertThat(assetManager.list("testing")).asList().contains("hello.txt");

assertThat(assetManager.list("bogus-dir")).isEmpty();
}
Expand Down
Loading

0 comments on commit 4606156

Please sign in to comment.