[ermine] use the generated ermine library in tests
BUG: 48255
Change-Id: Ia035df4af751fe314d28d1eafa96335c64e7fd7b
diff --git a/session_shells/ermine/shell/BUILD.gn b/session_shells/ermine/shell/BUILD.gn
index 18a6d33..9cf7cdb 100644
--- a/session_shells/ermine/shell/BUILD.gn
+++ b/session_shells/ermine/shell/BUILD.gn
@@ -12,14 +12,14 @@
group("shell") {
public_deps = [
- ":ermine_app",
+ ":ermine",
":ermine_fonts",
]
}
tz_ids_path = "${target_gen_dir}/tz_ids.txt"
-flutter_app("ermine_app") {
+flutter_app("ermine") {
main_dart = "lib/main.dart"
fuchsia_package_name = "ermine"
@@ -36,42 +36,6 @@
manifest = "pubspec.yaml"
- deps = [
- ":ermine_library",
- ]
-
- non_dart_deps = [ ":time_zone_list" ]
-
- resources = [
- {
- path = rebase_path("config/keyboard_shortcuts.json")
- dest = "keyboard_shortcuts.json"
- },
- {
- path = rebase_path(tz_ids_path)
- dest = "tz_ids.txt"
- },
- ]
-}
-
-static_icu_data("time_zone_list") {
- command = "tz-ids"
- output = tz_ids_path
-
- # Put these time zones at the top for the convenience of Fuchsia developers.
- fixed_order_ids = [
- "America/Los_Angeles",
- "America/New_York",
- "Europe/Paris",
- "Australia/Sydney",
- ]
- fixed_order = string_join(",", fixed_order_ids)
- command_args = [ "--fixed-order=${fixed_order}" ]
-}
-
-dart_library("ermine_library") {
- package_name = "ermine_library"
-
sources = [
"main.dart",
"src/models/app_model.dart",
@@ -151,6 +115,34 @@
"//topaz/public/dart/widgets:lib.widgets",
"//zircon/system/fidl/fuchsia-device-manager",
]
+
+ non_dart_deps = [ ":time_zone_list" ]
+
+ resources = [
+ {
+ path = rebase_path("config/keyboard_shortcuts.json")
+ dest = "keyboard_shortcuts.json"
+ },
+ {
+ path = rebase_path(tz_ids_path)
+ dest = "tz_ids.txt"
+ },
+ ]
+}
+
+static_icu_data("time_zone_list") {
+ command = "tz-ids"
+ output = tz_ids_path
+
+ # Put these time zones at the top for the convenience of Fuchsia developers.
+ fixed_order_ids = [
+ "America/Los_Angeles",
+ "America/New_York",
+ "Europe/Paris",
+ "Australia/Sydney",
+ ]
+ fixed_order = string_join(",", fixed_order_ids)
+ command_args = [ "--fixed-order=${fixed_order}" ]
}
config_data("ermine_fonts") {
@@ -183,7 +175,7 @@
]
deps = [
- ":ermine_library",
+ ":ermine_dart_library",
"//third_party/dart-pkg/git/flutter/packages/flutter_test",
"//third_party/dart-pkg/pub/mockito",
"//third_party/dart-pkg/pub/test",
diff --git a/session_shells/ermine/shell/test/app_widget_test.dart b/session_shells/ermine/shell/test/app_widget_test.dart
index fc19e94..6361930 100644
--- a/session_shells/ermine/shell/test/app_widget_test.dart
+++ b/session_shells/ermine/shell/test/app_widget_test.dart
@@ -11,8 +11,8 @@
import 'package:mockito/mockito.dart';
// ignore_for_file: implementation_imports
-import 'package:ermine_library/src/models/app_model.dart';
-import 'package:ermine_library/src/widgets/app.dart';
+import 'package:ermine/src/models/app_model.dart';
+import 'package:ermine/src/widgets/app.dart';
void main() async {
setupLogger(name: 'ermine_unittests');
diff --git a/session_shells/ermine/shell/test/ask_model_test.dart b/session_shells/ermine/shell/test/ask_model_test.dart
index d137ead..2d22a4d 100644
--- a/session_shells/ermine/shell/test/ask_model_test.dart
+++ b/session_shells/ermine/shell/test/ask_model_test.dart
@@ -12,9 +12,9 @@
import 'package:mockito/mockito.dart';
// ignore_for_file: implementation_imports
-import 'package:ermine_library/src/models/ask_model.dart';
-import 'package:ermine_library/src/utils/suggestion.dart';
-import 'package:ermine_library/src/utils/suggestions.dart';
+import 'package:ermine/src/models/ask_model.dart';
+import 'package:ermine/src/utils/suggestion.dart';
+import 'package:ermine/src/utils/suggestions.dart';
void main() {
ValueNotifier<bool> visibility;
diff --git a/session_shells/ermine/shell/test/ask_widget_test.dart b/session_shells/ermine/shell/test/ask_widget_test.dart
index e16f655..8b8795a 100644
--- a/session_shells/ermine/shell/test/ask_widget_test.dart
+++ b/session_shells/ermine/shell/test/ask_widget_test.dart
@@ -10,9 +10,9 @@
import 'package:mockito/mockito.dart';
// ignore_for_file: implementation_imports
-import 'package:ermine_library/src/utils/suggestion.dart';
-import 'package:ermine_library/src/utils/suggestions.dart';
-import 'package:ermine_library/src/widgets/ask/ask.dart';
+import 'package:ermine/src/utils/suggestion.dart';
+import 'package:ermine/src/utils/suggestions.dart';
+import 'package:ermine/src/widgets/ask/ask.dart';
void main() {
testWidgets('Create Ask Widget', (tester) async {
diff --git a/session_shells/ermine/shell/test/ermine_story_test.dart b/session_shells/ermine/shell/test/ermine_story_test.dart
index e11d5c9..e2931ac 100644
--- a/session_shells/ermine/shell/test/ermine_story_test.dart
+++ b/session_shells/ermine/shell/test/ermine_story_test.dart
@@ -5,9 +5,9 @@
import 'dart:async';
// ignore_for_file: implementation_imports
-import 'package:ermine_library/src/models/ermine_story.dart';
-import 'package:ermine_library/src/utils/presenter.dart';
-import 'package:ermine_library/src/utils/suggestion.dart';
+import 'package:ermine/src/models/ermine_story.dart';
+import 'package:ermine/src/utils/presenter.dart';
+import 'package:ermine/src/utils/suggestion.dart';
import 'package:mockito/mockito.dart';
import 'package:test/test.dart';
