[simple_browser] Split out target test
Our build system doesn't like multiple dart packages being defined in
the same directory. This happened to be okay for the simple_browser unit
test and target test until I tried making an unrelated Dart test
build-system change and then it wasn't.
This splits the target test into its own subdirectory.
Change-Id: Icc2e803e706617b6cb31779c5f321af5e1cd15ee
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/447654
Reviewed-by: Chase Latta <chaselatta@google.com>
Reviewed-by: Darren Chan <chandarren@google.com>
Testability-Review: Chase Latta <chaselatta@google.com>
Commit-Queue: Ian McKellar <ianloic@google.com>
diff --git a/bin/BUILD.gn b/bin/BUILD.gn
index e9ca2fd..192919d 100644
--- a/bin/BUILD.gn
+++ b/bin/BUILD.gn
@@ -9,7 +9,7 @@
group("dart_target_tests") {
testonly = true
- deps = [ "simple_browser:simple-browser-target-test" ]
+ deps = [ "simple_browser/target_test:simple-browser-target-test" ]
}
group("dart_unittests") {
@@ -18,7 +18,8 @@
# TODO(fxb/41505): Temporarily disable flutter_tester tests on mac hosts.
_flutter_tester_tests = []
if (host_os != "mac") {
- _flutter_tester_tests += [ "simple_browser:simple_browser_unittests($host_toolchain)" ]
+ _flutter_tester_tests +=
+ [ "simple_browser:simple_browser_unittests($host_toolchain)" ]
}
deps = _flutter_tester_tests
diff --git a/bin/simple_browser/BUILD.gn b/bin/simple_browser/BUILD.gn
index 84fbbce..b9da46b 100644
--- a/bin/simple_browser/BUILD.gn
+++ b/bin/simple_browser/BUILD.gn
@@ -7,11 +7,9 @@
import("//build/dart/fidl_move.gni")
import("//build/fidl/fidl.gni")
import("//build/flutter/flutter_component.gni")
-import("//build/flutter/flutter_test_component.gni")
import("//build/testing/environments.gni")
import("//build/testing/flutter_driver.gni")
import("//src/sys/build/components.gni")
-import("//src/sys/build/fuchsia_test_package.gni")
import("//topaz/runtime/dart/flutter_test.gni")
dart_library("lib") {
@@ -109,26 +107,6 @@
]
}
-flutter_test_component("target-test-component") {
- component_name = "simple-browser-target-test"
- manifest = "meta/simple_browser_target_test.cmx"
- sources = [ "simple_browser_target_test.dart" ]
-
- deps = [
- ":lib",
- "//third_party/dart-pkg/git/flutter/packages/flutter_test",
- "//third_party/dart-pkg/pub/test",
- ]
-}
-
-# fx test simple-browser-target-test
-fuchsia_test_package("simple-browser-target-test") {
- test_components = [ ":target-test-component" ]
- test_specs = {
- environments = basic_envs
- }
-}
-
config_data("web_engine_config") {
for_pkg = "web_engine"
diff --git a/bin/simple_browser/target_test/BUILD.gn b/bin/simple_browser/target_test/BUILD.gn
new file mode 100644
index 0000000..312db4e
--- /dev/null
+++ b/bin/simple_browser/target_test/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2020 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/flutter/flutter_test_component.gni")
+import("//src/sys/build/fuchsia_test_package.gni")
+
+flutter_test_component("target-test-component") {
+ component_name = "simple-browser-target-test"
+ manifest = "meta/simple_browser_target_test.cmx"
+ sources = [ "simple_browser_target_test.dart" ]
+
+ deps = [
+ "//src/experiences/bin/simple_browser:lib",
+ "//third_party/dart-pkg/git/flutter/packages/flutter_test",
+ "//third_party/dart-pkg/pub/test",
+ ]
+}
+
+# fx test simple-browser-target-test
+fuchsia_test_package("simple-browser-target-test") {
+ test_components = [ ":target-test-component" ]
+ test_specs = {
+ environments = basic_envs
+ }
+}
diff --git a/bin/simple_browser/target_test/analysis_options.yaml b/bin/simple_browser/target_test/analysis_options.yaml
new file mode 100644
index 0000000..ab9fb14
--- /dev/null
+++ b/bin/simple_browser/target_test/analysis_options.yaml
@@ -0,0 +1,5 @@
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+include: ../../../analysis_options.yaml
diff --git a/bin/simple_browser/meta/simple_browser_target_test.cmx b/bin/simple_browser/target_test/meta/simple_browser_target_test.cmx
similarity index 100%
rename from bin/simple_browser/meta/simple_browser_target_test.cmx
rename to bin/simple_browser/target_test/meta/simple_browser_target_test.cmx
diff --git a/bin/simple_browser/target_test/pubspec.yaml b/bin/simple_browser/target_test/pubspec.yaml
new file mode 100644
index 0000000..3d78ae3
--- /dev/null
+++ b/bin/simple_browser/target_test/pubspec.yaml
@@ -0,0 +1,13 @@
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: simple_browser
+description: A simple browser for Fuchsia
+
+flutter:
+ fonts:
+ - family: MaterialIcons
+ fonts:
+ - asset: fonts/MaterialIcons-Regular.otf
+ uses-material-design: true
diff --git a/bin/simple_browser/test/simple_browser_target_test.dart b/bin/simple_browser/target_test/test/simple_browser_target_test.dart
similarity index 100%
rename from bin/simple_browser/test/simple_browser_target_test.dart
rename to bin/simple_browser/target_test/test/simple_browser_target_test.dart
