Skip to content

Commit eeee17d

Browse files
authored
Remove stale test code (#252)
* Remove mock_engine-based tests * Use absolute paths * Install libflutter_engine.so * Let RunsAOTCompiledDartCode return false
1 parent d36feb5 commit eeee17d

File tree

5 files changed

+14
-380
lines changed

5 files changed

+14
-380
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ jobs:
253253
username: ${{ github.repository_owner }}
254254
password: ${{ secrets.GITHUB_TOKEN }}
255255

256+
- uses: actions/download-artifact@v2
257+
with:
258+
name: tizen-arm-release
259+
256260
- uses: actions/download-artifact@v2
257261
with:
258262
name: tizen-arm-unittests

shell/platform/tizen/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ executable("flutter_tizen_unittests") {
246246
"flutter_project_bundle_unittests.cc",
247247
"flutter_tizen_engine_unittest.cc",
248248
"flutter_tizen_texture_registrar_unittests.cc",
249-
"testing/mock_engine.cc",
250249
]
251250

252251
ldflags = [ "-Wl,--unresolved-symbols=ignore-in-shared-libs" ]

shell/platform/tizen/flutter_tizen_engine_unittest.cc

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ class FlutterTizenEngineTest : public ::testing::Test {
2626

2727
FlutterProjectBundle project(engine_prop);
2828
auto engine = std::make_unique<FlutterTizenEngine>(project);
29+
30+
EngineModifier modifier(engine.get());
31+
// Force the non-AOT path unless overridden by the test.
32+
modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
33+
2934
engine_ = engine.release();
3035
}
3136

@@ -39,51 +44,6 @@ class FlutterTizenEngineTest : public ::testing::Test {
3944
FlutterTizenEngine* engine_ = nullptr;
4045
};
4146

42-
class FlutterTizenEngineTestHeaded : public FlutterTizenEngineTest {
43-
protected:
44-
void SetUp() {
45-
FlutterTizenEngineTest::SetUp();
46-
engine_->InitializeRenderer(0, 0, 800, 600, false, true, false);
47-
}
48-
};
49-
50-
TEST_F(FlutterTizenEngineTest, Run) {
51-
EXPECT_TRUE(engine_ != nullptr);
52-
EXPECT_TRUE(engine_->RunEngine(nullptr));
53-
}
54-
55-
TEST_F(FlutterTizenEngineTest, Run_Twice) {
56-
EXPECT_TRUE(engine_->RunEngine(nullptr));
57-
EXPECT_FALSE(engine_->RunEngine(nullptr));
58-
}
59-
60-
TEST_F(FlutterTizenEngineTest, Stop) {
61-
EXPECT_TRUE(engine_->RunEngine(nullptr));
62-
EXPECT_TRUE(engine_->StopEngine());
63-
}
64-
65-
TEST_F(FlutterTizenEngineTest, Stop_Twice) {
66-
EXPECT_TRUE(engine_->RunEngine(nullptr));
67-
EXPECT_TRUE(engine_->StopEngine());
68-
EXPECT_FALSE(engine_->StopEngine());
69-
}
70-
71-
TEST_F(FlutterTizenEngineTest, GetPluginRegistrar) {
72-
EXPECT_TRUE(engine_->RunEngine(nullptr));
73-
EXPECT_TRUE(engine_->plugin_registrar() != nullptr);
74-
}
75-
76-
TEST_F(FlutterTizenEngineTest, GetTextureRegistrar) {
77-
EXPECT_TRUE(engine_->RunEngine(nullptr));
78-
EXPECT_TRUE(engine_->texture_registrar() == nullptr);
79-
}
80-
81-
// Disabled for headless testing.
82-
TEST_F(FlutterTizenEngineTestHeaded, DISABLED_GetTextureRegistrar) {
83-
EXPECT_TRUE(engine_->RunEngine(nullptr));
84-
EXPECT_TRUE(engine_->texture_registrar() != nullptr);
85-
}
86-
8747
TEST_F(FlutterTizenEngineTest, RunDoesExpectedInitialization) {
8848
EngineModifier modifier(engine_);
8949
bool run_called = false;
@@ -139,6 +99,8 @@ TEST_F(FlutterTizenEngineTest, RunDoesExpectedInitialization) {
13999
EXPECT_TRUE(run_called);
140100
EXPECT_TRUE(update_locales_called);
141101
EXPECT_TRUE(settings_message_sent);
102+
EXPECT_NE(engine_->plugin_registrar(), nullptr);
103+
EXPECT_EQ(engine_->texture_registrar(), nullptr);
142104

143105
modifier.embedder_api().Shutdown = [](auto engine) { return kSuccess; };
144106
}

shell/platform/tizen/flutter_tizen_texture_registrar_unittests.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class FlutterTizenTextureRegistrarTest : public ::testing::Test {
2323
protected:
2424
void SetUp() {
2525
FlutterDesktopEngineProperties engine_prop = {};
26-
engine_prop.assets_path = "foo/flutter_assets";
27-
engine_prop.icu_data_path = "foo/icudtl.dat";
28-
engine_prop.aot_library_path = "foo/libapp.so";
26+
engine_prop.assets_path = "/foo/flutter_assets";
27+
engine_prop.icu_data_path = "/foo/icudtl.dat";
28+
engine_prop.aot_library_path = "/foo/libapp.so";
2929

3030
FlutterProjectBundle project(engine_prop);
3131
auto engine = std::make_unique<FlutterTizenEngine>(project);

0 commit comments

Comments
 (0)