Converted Mojo Common Unittests to run as Apptests.
This removes a dependency from "//mojo/common_common_unittests" to
"//mojo/edk/".
BUG=None
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/1996463003 .
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 2b9c79e..3588348 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -60,12 +60,14 @@
testonly = true
deps = [
":public_tests",
- "//mojo/common:mojo_common_unittests",
+ "//mojo/common:mojo_common_apptests",
"//mojo/converters:mojo_converters_unittests",
"//mojo/dart:tests",
+ "//mojo/data_pipe_utils:mojo_data_pipe_utils_apptests",
"//mojo/edk:tests",
"//mojo/file_utils:file_utils_apptests",
"//mojo/gles2:mgl_unittests",
+ "//mojo/message_pump:mojo_message_pump_apptests",
"//mojo/public/cpp/bindings/tests:versioning_apptests",
"//mojo/public/platform/native:tests",
"//mojo/services/files/c:apptests",
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index 3410af2..527c4a1 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//mojo/public/mojo_application.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
@@ -40,13 +41,13 @@
]
}
-test("mojo_common_unittests") {
+mojo_native_application("mojo_common_apptests") {
+ testonly = true
+
deps = [
":tests",
- "//mojo/data_pipe_utils:tests",
- "//mojo/edk/test:run_all_unittests",
- "//mojo/environment:chromium",
- "//mojo/message_pump:tests",
+ "//mojo/application",
+ "//mojo/application:test_support",
]
}
diff --git a/mojo/data_pipe_utils/BUILD.gn b/mojo/data_pipe_utils/BUILD.gn
index 0798050..53d297d 100644
--- a/mojo/data_pipe_utils/BUILD.gn
+++ b/mojo/data_pipe_utils/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//mojo/public/mojo_application.gni")
+
source_set("data_pipe_utils") {
sources = [
"data_pipe_drainer.cc",
@@ -27,7 +29,7 @@
]
}
-source_set("tests") {
+mojo_native_application("mojo_data_pipe_utils_apptests") {
testonly = true
sources = [
@@ -37,6 +39,8 @@
deps = [
":data_pipe_utils",
"//base",
+ "//mojo/application",
+ "//mojo/application:test_support",
"//testing/gtest",
]
}
diff --git a/mojo/message_pump/BUILD.gn b/mojo/message_pump/BUILD.gn
index 14daad6..c039429 100644
--- a/mojo/message_pump/BUILD.gn
+++ b/mojo/message_pump/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//mojo/public/mojo_application.gni")
+
source_set("message_pump") {
sources = [
"handle_watcher.cc",
@@ -19,7 +21,7 @@
]
}
-source_set("tests") {
+mojo_native_application("mojo_message_pump_apptests") {
testonly = true
sources = [
@@ -30,8 +32,10 @@
deps = [
":message_pump",
"//base",
- "//base/test:test_support",
"//base:message_loop_tests",
+ "//base/test:test_support",
+ "//mojo/application",
+ "//mojo/application:test_support",
"//mojo/public/cpp/system",
"//mojo/public/cpp/test_support:test_utils",
"//testing/gtest",
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index 9a8af7c..b02c076 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -48,6 +48,15 @@
"test": "mojo:mojio_apptests",
},
{
+ "test": "mojo:mojo_common_apptests",
+ },
+ {
+ "test": "mojo:mojo_data_pipe_utils_apptests",
+ },
+ {
+ "test": "mojo:mojo_message_pump_apptests",
+ },
+ {
"test": "mojo:moterm_apptests",
},
{
diff --git a/mojo/tools/data/unittests b/mojo/tools/data/unittests
index 15fa4e7..0304fae 100644
--- a/mojo/tools/data/unittests
+++ b/mojo/tools/data/unittests
@@ -57,9 +57,6 @@
"test": "mojo_application_manager_unittests",
},
{
- "test": "mojo_common_unittests",
- },
- {
"test": "mojo_converters_unittests",
},
{
