Commit 4a996f29 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

Fix h2o_junit_manifest_target_name on the bots

This CL:
- Makes the generated AndroidManifest.xml a data dependency of
h2o_junit_manifest_target_name
- Reenables LaunchTest.*

BUG=902325

Change-Id: I47e3c5c2226c78c696716712a4307127493c5903
Reviewed-on: https://chromium-review.googlesource.com/c/1324875Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606827}
parent 74c9dc10
...@@ -316,5 +316,8 @@ junit_binary("webapk_shell_apk_h2o_junit_tests") { ...@@ -316,5 +316,8 @@ junit_binary("webapk_shell_apk_h2o_junit_tests") {
"//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:common_java",
"//chrome/android/webapk/test:junit_test_support", "//chrome/android/webapk/test:junit_test_support",
] ]
data_deps = [
":${h2o_junit_manifest_target_name}",
]
android_manifest_path = h2o_junit_manifest_output android_manifest_path = h2o_junit_manifest_output
} }
...@@ -16,7 +16,6 @@ import android.net.Uri; ...@@ -16,7 +16,6 @@ import android.net.Uri;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
...@@ -66,7 +65,6 @@ public final class LaunchTest { ...@@ -66,7 +65,6 @@ public final class LaunchTest {
* the intent and the host browser getting launched. * the intent and the host browser getting launched.
*/ */
@Test @Test
@Ignore
public void testDeepLink() { public void testDeepLink() {
final String deepLinkUrl = "https://pwa.rocks/deep.html"; final String deepLinkUrl = "https://pwa.rocks/deep.html";
...@@ -100,7 +98,6 @@ public final class LaunchTest { ...@@ -100,7 +98,6 @@ public final class LaunchTest {
/** Test that the host browser is launched as a result of a main launch intent. */ /** Test that the host browser is launched as a result of a main launch intent. */
@Test @Test
@Ignore
public void testMainIntent() { public void testMainIntent() {
Intent launchIntent = new Intent(Intent.ACTION_MAIN); Intent launchIntent = new Intent(Intent.ACTION_MAIN);
launchIntent.setPackage(WEBAPK_PACKAGE_NAME); launchIntent.setPackage(WEBAPK_PACKAGE_NAME);
...@@ -133,7 +130,6 @@ public final class LaunchTest { ...@@ -133,7 +130,6 @@ public final class LaunchTest {
* browser getting launched. * browser getting launched.
*/ */
@Test @Test
@Ignore
public void testTargetShareActivityPreserved() { public void testTargetShareActivityPreserved() {
final String expectedStartUrl = "https://pwa.rocks/share_title.html?text=subject_value"; final String expectedStartUrl = "https://pwa.rocks/share_title.html?text=subject_value";
...@@ -160,7 +156,6 @@ public final class LaunchTest { ...@@ -160,7 +156,6 @@ public final class LaunchTest {
* the deep link getting handled and the host browser getting launched. * the deep link getting handled and the host browser getting launched.
*/ */
@Test @Test
@Ignore
public void testSourcePropagated() { public void testSourcePropagated() {
final String deepLinkUrl = "https://pwa.rocks/deep_link.html"; final String deepLinkUrl = "https://pwa.rocks/deep_link.html";
final int source = 2; final int source = 2;
......
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