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..aba83d9d533f0989ed4165ba9bb0781b6996bc08 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/native",
+  ]
   android_manifest = "test/AndroidManifest.xml"
 }
 
@@ -586,6 +589,34 @@ android_library("cronet_test_apk_java") {
   run_findbugs_override = true
 }
 
+cronet_smoketests_java_only_common_srcs = [

[mef, 2016/12/20 20:17:45]

nit: maybe s/java_only/platform_only/ here and elsewhere? I'm not very sure
about it though.

[kapishnikov, 2016/12/22 19:21:12]

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/20 20:17:45]

nit: sort.

[kapishnikov, 2016/12/22 19:21:13]

Done.

+  "test/smoketests/src/org/chromium/net/smoke/TestUrlRequestCallback.java",
+]
+
+cronet_smoketests_native_common_srcs = cronet_smoketests_java_only_common_srcs + [
+                                         "test/smoketests/src/org/chromium/net/smoke/NativeCronetTestBase.java",

[mef, 2016/12/20 20:17:45]

nit: sort.

[kapishnikov, 2016/12/22 19:21:13]

Done.

+                                         "test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java",
+                                       ]
+
+android_library("cronet_smoketests_native_java") {
+  testonly = true
+  java_files = [
+                 "test/smoketests/src/org/chromium/net/smoke/QuicTest.java",

[mef, 2016/12/20 20:17:45]

nit: sort.

[kapishnikov, 2016/12/22 19:21:13]

Done.

+                 "test/smoketests/src/org/chromium/net/smoke/Http2Test.java",
+               ] + cronet_smoketests_native_common_srcs
+
+  deps = [
+    ":cronet_api_java",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+    "//third_party/netty4:netty_all_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_smoketests_native_java",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -719,6 +759,112 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
     "//net:test_support",
   ]
 
+  proguard_enabled = true
+
+  proguard_configs = [ "test/smoketests/proguard.cfg" ]

[mef, 2016/12/20 20:17:45]

is it expected that |cronet_test_instrumentation_apk| gets "smoketest" proguard?

[kapishnikov, 2016/12/22 19:21:13]

This config is needed not only for two new smoke tests that are included in
'cronet_test_instrumentation_apk' but also for the existing tests since we
enabled proguarding. I agree that 'smoketests' looks weird here; therefore, I
moved 'test/smoketests/proguard.cfg' to 'test/proguard.cfg'. This also allows as
to get rid of 'test/javaperftests/proguard.cfg'.

+
+  run_findbugs_override = true
+}
+
+android_resources("cronet_smoketests_java_only_apk_resources") {
+  testonly = true
+  resource_dirs = [ "test/smoketests/res/java_only" ]
+  android_manifest = "test/AndroidManifest.xml"
+}
+
+android_library("cronet_smoketests_java_only_java") {
+  testonly = true
+  java_files =
+      [ "test/smoketests/src/org/chromium/net/smoke/JavaOnlyEngineTest.java" ] +
+      cronet_smoketests_java_only_common_srcs
+  deps = [
+    ":cronet_api_java",
+    "//third_party/netty4:netty_all_java",
+  ]
+}
+
+android_apk("cronet_smoketests_java_only_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_smoketests_java_only_apk_resources",
+  ]
+  run_findbugs_override = true
+}
+
+instrumentation_test_apk("cronet_smoketests_java_only_instrumentation_apk") {
+  apk_name = "JavaOnlyEngineSmokeTestInstrumentation"
+  apk_under_test = ":cronet_smoketests_java_only_apk"
+  android_manifest = "test/javatests/AndroidManifest.xml"
+  deps = [
+    ":cronet_smoketests_java_only_java",
+  ]
+
+  proguard_enabled = true
+
+  proguard_configs = [ "test/smoketests/proguard.cfg" ]
+  run_findbugs_override = true
+}
+
+android_library("cronet_smoketests_broken_native_library_java") {
+  testonly = true
+  java_files = [ "test/smoketests/src/org/chromium/net/smoke/BrokenNativeLibraryTest.java" ] + cronet_smoketests_native_common_srcs
+  deps = [
+    ":cronet_api_java",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+    "//third_party/netty4:netty_all_java",
+  ]
+}
+
+android_apk("cronet_smoketests_broken_native_library_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_smoketests_broken_native_library_instrumentation_apk") {
+  apk_name = "BrokenNativeLibrarySmokeTestInstrumentation"
+  apk_under_test = ":cronet_smoketests_broken_native_library_apk"
+  android_manifest = "test/javatests/AndroidManifest.xml"
+
+  deps = [
+    ":cronet_smoketests_broken_native_library_java",
+  ]
+
+  proguard_enabled = true
+
+  proguard_configs = [ "test/smoketests/proguard.cfg" ]
+
   run_findbugs_override = true
 }