From 7b3530bcb41ab44ecd4b197ef3cb05be56530f20 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Wed, 27 May 2020 14:26:06 -0700 Subject: [PATCH] Revert "Minimal test harness for iOS (#13029)" This reverts commit 0622b051b63b399838eb7956bed97d76fc8bdf77. --- build/darwin/ios_app.gni | 22 ----------------- ci/licenses_golden/licenses_flutter | 2 -- shell/platform/darwin/ios/BUILD.gn | 24 ------------------- .../darwin/ios/FlutterTestsInfo.plist | 20 ---------------- .../platform/darwin/ios/flutter_unittests.mm | 19 --------------- 5 files changed, 87 deletions(-) delete mode 100644 build/darwin/ios_app.gni delete mode 100644 shell/platform/darwin/ios/FlutterTestsInfo.plist delete mode 100644 shell/platform/darwin/ios/flutter_unittests.mm diff --git a/build/darwin/ios_app.gni b/build/darwin/ios_app.gni deleted file mode 100644 index 13b94e5b5c311..0000000000000 --- a/build/darwin/ios_app.gni +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -template("ios_app") { - assert(is_ios) - - copy("${target_name}__info_plist") { - sources = [ - invoker.info_plist, - ] - outputs = [ - "$root_out_dir/${target_name}.app/Info.plist", - ] - } - executable("$target_name") { - forward_variables_from(invoker, "*") - output_name = "${target_name}.app/$target_name" - - deps += [ ":${target_name}__info_plist" ] - } -} diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index be2534491f587..a710923cb79d7 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -850,8 +850,6 @@ FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStan FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm -FILE: ../../../flutter/shell/platform/darwin/ios/FlutterTestsInfo.plist -FILE: ../../../flutter/shell/platform/darwin/ios/flutter_unittests.mm FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index a71cd79cc8ad0..9166eba9d85a7 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -5,7 +5,6 @@ assert(is_ios) import("//build/config/ios/ios_sdk.gni") -import("//flutter/build/darwin/ios_app.gni") import("//flutter/common/config.gni") import("//flutter/shell/gpu/gpu.gni") import("//flutter/shell/platform/darwin/common/framework_shared.gni") @@ -331,29 +330,6 @@ shared_library("copy_and_verify_framework_headers") { ] } -test_fixtures("flutter_tests_fixtures") { - fixtures = [] -} - -# Note: This currently isn't used, it might be removed. -ios_app("FlutterTests") { - testonly = true - - info_plist = "FlutterTestsInfo.plist" - - sources = [ - "flutter_unittests.mm", - ] - - libs = [ "Foundation.framework" ] - - deps = [ - ":flutter_tests_fixtures", - "//flutter/runtime:libdart", - "//flutter/testing", - ] -} - group("flutter_framework") { deps = [ ":copy_and_verify_framework_headers", diff --git a/shell/platform/darwin/ios/FlutterTestsInfo.plist b/shell/platform/darwin/ios/FlutterTestsInfo.plist deleted file mode 100644 index 8af0cac31d48e..0000000000000 --- a/shell/platform/darwin/ios/FlutterTestsInfo.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - FlutterTests - CFBundleIdentifier - io.flutter.FlutterTests - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - FlutterTests - CFBundleVersion - 1.0 - CFBundleShortVersionString - 1.0 - - diff --git a/shell/platform/darwin/ios/flutter_unittests.mm b/shell/platform/darwin/ios/flutter_unittests.mm deleted file mode 100644 index 35dce374b6cd5..0000000000000 --- a/shell/platform/darwin/ios/flutter_unittests.mm +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 The Flutter 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 - -#include "flutter/testing/testing.h" - -namespace flutter_tests { - -TEST(SmokeTest, Success) { - EXPECT_EQ(1, 1); -} - -TEST(SmokeTest, Fail) { - EXPECT_EQ(1, 2); -} - -}