Cronet smoke tests

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 725024e297a43e8c5c7280cbae71ad33bd4c765f..5b6c6999569ae794389a63a76bc402c54978c4fc 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -551,7 +551,10 @@ shared_library("cronet_tests") {
 
 android_resources("cronet_test_apk_resources") {
   testonly = true
-  resource_dirs = [ "test/res" ]
+  resource_dirs = [
+    "test/res",
+    "test/smoketests/res/quic",
+  ]
   android_manifest = "test/AndroidManifest.xml"
 }
 
@@ -586,6 +589,34 @@ android_library("cronet_test_apk_java") {
   run_findbugs_override = true
 }
 
+java_only_smoke_test_common_srcs = [

[mef, 2016/12/08 23:17:18]

naming nit: maybe start all those with cronet_smoketest like
'cronet_smoketest_java_only_common_srcs'?

[kapishnikov, 2016/12/19 19:31:10]

Done.

+  "test/smoketests/src/org/chromium/net/smoke/TestSupport.java",
+  "test/smoketests/src/org/chromium/net/smoke/ChromiumJavaOnlyTestSupport.java",
+  "test/smoketests/src/org/chromium/net/smoke/HttpTestServer.java",
+  "test/smoketests/src/org/chromium/net/smoke/CronetTestBase.java",

[mef, 2016/12/08 23:17:18]

nit: I'm not sure whether smoke_test or smoketests is better, but would like
some consistency.

[kapishnikov, 2016/12/19 19:31:10]

Renamed everywhere to smoketests.

+  "test/smoketests/src/org/chromium/net/smoke/TestUrlRequestCallback.java",
+]
+
+quic_smoke_test_common_srcs = java_only_smoke_test_common_srcs + [

[mef, 2016/12/08 23:17:18]

maybe add java_only_smoke_test_common_srcs explicitly to java_files below?

[kapishnikov, 2016/12/19 19:31:10]

quic_smoke_test_common_srcs depends on java_only_smoke_test_common_srcs, i.e. it
won't compile without it. Somebody may add quic_smoke_test_common_srcs but
forget java_only_smoke_test_common_srcs.

+                                "test/smoketests/src/org/chromium/net/smoke/NativeCronetTestBase.java",
+                                "test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java",
+                              ]
+
+android_library("cronet_quic_smoke_test_java") {
+  testonly = true
+  java_files = [
+                 "test/smoketests/src/org/chromium/net/smoke/QuicTest.java",
+                 "test/smoketests/src/org/chromium/net/smoke/H2Test.java",
+               ] + quic_smoke_test_common_srcs
+
+  deps = [
+    ":cronet_api_java",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+    "//third_party/netty4:netty_all_java",

[mef, 2016/12/08 23:17:18]

hrm, netty4 is for h2, why do we need it for quic?

[kapishnikov, 2016/12/19 19:31:10]

netty is required to compile ChromiumNativeTestSupport.java

+  ]
+}
+
 android_assets("cronet_test_apk_assets") {
   testonly = true
 
@@ -637,13 +668,21 @@ android_apk("cronet_test_apk") {
   loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ]
 
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_test_apk_assets",
-    ":cronet_test_apk_java",
     ":cronet_test_apk_resources",
     "//base:base_java",
     "//third_party/netty-tcnative:netty-tcnative-so",
   ]
 
+  proguard_enabled = true
+
+  proguard_configs = [
+    "$target_gen_dir/cronet_impl_native_proguard.cfg",
+    "cronet_impl_common_proguard.cfg",
+    "cronet_impl_platform_proguard.cfg",
+  ]
+
   run_findbugs_override = true
 }
 
@@ -707,6 +746,7 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
     ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_javatests",
+    ":cronet_quic_smoke_test_java",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -719,6 +759,121 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
     "//net:test_support",
   ]
 
+  proguard_enabled = true
+
+  proguard_configs = [
+    "test/smoketests/proguard.cfg",
+    "//base/android/proguard/chromium_apk.flags",

[mef, 2016/12/08 23:17:18]

This feels wrong. Why would cronet test depend on chromium apk proguard flags?
Should this be "$target_gen_dir/cronet_impl_native_proguard.cfg" instead?

[kapishnikov, 2016/12/19 19:31:10]

Only the test APK (i.e. not the instrumentation APK) should include the proguard
configs that are included by the embedder apps (cronet_impl_native_proguard.cfg
in this particular case). The instrumentation APK should only include configs
that are needed for the testing purpose. In particular, we would like to
preserve Netty server classes, test support classes and the source file / line
number table for easier debugging.

I changed test/smoketests/proguard.cfg to keep SourceFile & LineNumberTable and
removed the dependency on chromium_apk.flags from the Java Only test. However,
the native tests failing without chromium_apk.flags. I will investigate the
reason.

[kapishnikov, 2016/12/19 23:33:41]

//base/android/proguard/chromium_apk.flags is disabling
"class/merging/horizontal" proguard optimization. Enabling the optimization
causes some static methods be removed. That is why the native tests didn't pass.
I have updated the proguard files and got rid of
//base/android/proguard/chromium_apk.flags.

+  ]
+
+  run_findbugs_override = true
+}
+
+android_resources("cronet_java_only_smoke_test_apk_resources") {
+  testonly = true
+  resource_dirs = [ "test/smoketests/res/java_only" ]
+  android_manifest = "test/AndroidManifest.xml"
+}
+
+android_library("cronet_java_only_smoke_test_java") {
+  testonly = true
+  java_files =
+      [ "test/smoketests/src/org/chromium/net/smoke/JavaOnlyEngineTest.java" ] +
+      java_only_smoke_test_common_srcs
+  deps = [
+    ":cronet_api_java",
+    "//third_party/netty4:netty_all_java",
+  ]
+}
+
+android_apk("cronet_java_only_smoke_tests_apk") {
+  testonly = true
+  apk_name = "JavaOnlyEngineSmokeTest"
+  android_manifest = "test/AndroidManifest.xml"
+  java_files = [ "test/src/org/chromium/net/CronetTestApplication.java" ]
+
+  proguard_enabled = true
+  proguard_configs = [
+    "cronet_impl_common_proguard.cfg",
+    "cronet_impl_platform_proguard.cfg",
+  ]
+
+  deps = [
+    ":cronet_api_java",
+    ":cronet_impl_common_java",
+    ":cronet_impl_platform_java",
+    ":cronet_java_only_smoke_test_apk_resources",
+  ]
+  run_findbugs_override = true
+}
+
+instrumentation_test_apk("cronet_java_only_smoke_tests_instrumentation_apk") {
+  apk_name = "JavaOnlyEngineSmokeTestInstrumentation"
+  apk_under_test = ":cronet_java_only_smoke_tests_apk"
+  android_manifest = "test/javatests/AndroidManifest.xml"
+  deps = [
+    ":cronet_java_only_smoke_test_java",
+  ]
+
+  proguard_enabled = true
+
+  proguard_configs = [
+    "test/smoketests/proguard.cfg",
+    "//base/android/proguard/chromium_apk.flags",
+  ]
+  run_findbugs_override = true
+}
+
+android_library("cronet_broken_native_library_smoke_test_java") {
+  testonly = true
+  java_files = [ "test/smoketests/src/org/chromium/net/smoke/BrokenNativeLibraryTest.java" ] + quic_smoke_test_common_srcs
+  deps = [
+    ":cronet_api_java",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+    "//third_party/netty4:netty_all_java",
+  ]
+}
+
+android_apk("cronet_broken_native_library_smoke_tests_apk") {
+  testonly = true
+  apk_name = "BrokenNativeLibrarySmokeTest"
+  android_manifest = "test/AndroidManifest.xml"
+  deps = [
+    ":cronet_api_java",
+    ":cronet_combine_proguard_flags",
+    ":cronet_impl_common_java",
+    ":cronet_impl_platform_java",
+    ":cronet_test_apk_resources",
+  ]
+
+  proguard_enabled = true
+  proguard_configs = [
+    "$target_gen_dir/cronet_impl_native_proguard.cfg",
+    "cronet_impl_common_proguard.cfg",
+    "cronet_impl_platform_proguard.cfg",
+  ]
+
+  run_findbugs_override = true
+}
+
+instrumentation_test_apk(
+    "cronet_broken_native_library_smoke_tests_instrumentation_apk") {
+  apk_name = "BrokenNativeLibrarySmokeTestInstrumentation"
+  apk_under_test = ":cronet_broken_native_library_smoke_tests_apk"
+  android_manifest = "test/javatests/AndroidManifest.xml"
+
+  deps = [
+    ":cronet_broken_native_library_smoke_test_java",
+  ]
+
+  proguard_enabled = true
+
+  proguard_configs = [
+    "test/smoketests/proguard.cfg",
+    "//base/android/proguard/chromium_apk.flags",
+  ]
+
   run_findbugs_override = true
 }