Commit 063e95c1 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Android] Use lambdas in FirstRunIntegrationTest

This CL replaces anonymous classes with lambdas in
FirstRunIntegrationTest without any changes to the behavior.

Bug: None
Change-Id: I0ab8e9bc38f6c1dec82c65480b2ccf71eda5538a
Reviewed-on: https://chromium-review.googlesource.com/955563Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541854}
parent 29d0dd5e
...@@ -68,15 +68,12 @@ public class FirstRunIntegrationTest { ...@@ -68,15 +68,12 @@ public class FirstRunIntegrationTest {
@SmallTest @SmallTest
public void testGenericViewIntentGoesToFirstRun() { public void testGenericViewIntentGoesToFirstRun() {
final String asyncClassName = ChromeLauncherActivity.class.getName(); final String asyncClassName = ChromeLauncherActivity.class.getName();
runFirstRunRedirectTestForActivity(asyncClassName, new Runnable() { runFirstRunRedirectTestForActivity(asyncClassName, () -> {
@Override
public void run() {
final Context context = InstrumentationRegistry.getTargetContext(); final Context context = InstrumentationRegistry.getTargetContext();
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://test.com")); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://test.com"));
intent.setPackage(context.getPackageName()); intent.setPackage(context.getPackageName());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent); context.startActivity(intent);
}
}); });
} }
...@@ -84,15 +81,12 @@ public class FirstRunIntegrationTest { ...@@ -84,15 +81,12 @@ public class FirstRunIntegrationTest {
@SmallTest @SmallTest
public void testRedirectCustomTabActivityToFirstRun() { public void testRedirectCustomTabActivityToFirstRun() {
final String asyncClassName = ChromeLauncherActivity.class.getName(); final String asyncClassName = ChromeLauncherActivity.class.getName();
runFirstRunRedirectTestForActivity(asyncClassName, new Runnable() { runFirstRunRedirectTestForActivity(asyncClassName, () -> {
@Override
public void run() {
Context context = InstrumentationRegistry.getTargetContext(); Context context = InstrumentationRegistry.getTargetContext();
CustomTabsIntent customTabIntent = new CustomTabsIntent.Builder().build(); CustomTabsIntent customTabIntent = new CustomTabsIntent.Builder().build();
customTabIntent.intent.setPackage(context.getPackageName()); customTabIntent.intent.setPackage(context.getPackageName());
customTabIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); customTabIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
customTabIntent.launchUrl(context, Uri.parse("http://test.com")); customTabIntent.launchUrl(context, Uri.parse("http://test.com"));
}
}); });
} }
...@@ -100,15 +94,12 @@ public class FirstRunIntegrationTest { ...@@ -100,15 +94,12 @@ public class FirstRunIntegrationTest {
@SmallTest @SmallTest
public void testRedirectChromeTabbedActivityToFirstRun() { public void testRedirectChromeTabbedActivityToFirstRun() {
final String asyncClassName = ChromeTabbedActivity.class.getName(); final String asyncClassName = ChromeTabbedActivity.class.getName();
runFirstRunRedirectTestForActivity(asyncClassName, new Runnable() { runFirstRunRedirectTestForActivity(asyncClassName, () -> {
@Override
public void run() {
final Context context = InstrumentationRegistry.getTargetContext(); final Context context = InstrumentationRegistry.getTargetContext();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClassName(context, asyncClassName); intent.setClassName(context, asyncClassName);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent); context.startActivity(intent);
}
}); });
} }
...@@ -116,15 +107,12 @@ public class FirstRunIntegrationTest { ...@@ -116,15 +107,12 @@ public class FirstRunIntegrationTest {
@SmallTest @SmallTest
public void testRedirectSearchActivityToFirstRun() { public void testRedirectSearchActivityToFirstRun() {
final String asyncClassName = SearchActivity.class.getName(); final String asyncClassName = SearchActivity.class.getName();
runFirstRunRedirectTestForActivity(asyncClassName, new Runnable() { runFirstRunRedirectTestForActivity(asyncClassName, () -> {
@Override
public void run() {
final Context context = InstrumentationRegistry.getTargetContext(); final Context context = InstrumentationRegistry.getTargetContext();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClassName(context, asyncClassName); intent.setClassName(context, asyncClassName);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent); context.startActivity(intent);
}
}); });
} }
...@@ -348,13 +336,10 @@ public class FirstRunIntegrationTest { ...@@ -348,13 +336,10 @@ public class FirstRunIntegrationTest {
} }
}); });
ThreadUtils.runOnUiThread(new Runnable() { ThreadUtils.runOnUiThread(() -> {
@Override
public void run() {
Button button = (Button) activity.findViewById(id); Button button = (Button) activity.findViewById(id);
Assert.assertNotNull(message, button); Assert.assertNotNull(message, button);
button.performClick(); button.performClick();
}
}); });
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment