From 167382480afdfa9eb8f217e084e7abdc6330dd69 Mon Sep 17 00:00:00 2001 From: Mikkel Nygaard Ravn Date: Thu, 23 Nov 2017 10:24:16 +0100 Subject: [PATCH] Clean up external_ui device lab test (#13177) --- .../external_ui/android/app/build.gradle | 2 +- .../external_ui/android/app/src/main/AndroidManifest.xml | 2 +- .../flutter}/externalui/MainActivity.java | 2 +- .../external_ui/ios/Runner.xcodeproj/project.pbxproj | 4 ++-- dev/integration_tests/external_ui/lib/main.dart | 4 +++- .../external_ui/test_driver/main_test.dart | 8 +++++--- 6 files changed, 13 insertions(+), 9 deletions(-) rename dev/integration_tests/external_ui/android/app/src/main/java/{com/yourcompany => io/flutter}/externalui/MainActivity.java (99%) diff --git a/dev/integration_tests/external_ui/android/app/build.gradle b/dev/integration_tests/external_ui/android/app/build.gradle index 3fce7313ade..30b9d455060 100644 --- a/dev/integration_tests/external_ui/android/app/build.gradle +++ b/dev/integration_tests/external_ui/android/app/build.gradle @@ -23,7 +23,7 @@ android { } defaultConfig { - applicationId "com.yourcompany.externalui" + applicationId "io.flutter.externalui" minSdkVersion 16 targetSdkVersion 25 versionCode 1 diff --git a/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml index dc488a964b0..faad01af5dd 100644 --- a/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="io.flutter.externalui"> diff --git a/dev/integration_tests/external_ui/android/app/src/main/java/com/yourcompany/externalui/MainActivity.java b/dev/integration_tests/external_ui/android/app/src/main/java/io/flutter/externalui/MainActivity.java similarity index 99% rename from dev/integration_tests/external_ui/android/app/src/main/java/com/yourcompany/externalui/MainActivity.java rename to dev/integration_tests/external_ui/android/app/src/main/java/io/flutter/externalui/MainActivity.java index e50f75993aa..e2bb58d67bf 100644 --- a/dev/integration_tests/external_ui/android/app/src/main/java/com/yourcompany/externalui/MainActivity.java +++ b/dev/integration_tests/external_ui/android/app/src/main/java/io/flutter/externalui/MainActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package com.yourcompany.externalui; +package io.flutter.externalui; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/dev/integration_tests/external_ui/ios/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/external_ui/ios/Runner.xcodeproj/project.pbxproj index 3099a2edd6a..27546cf488f 100644 --- a/dev/integration_tests/external_ui/ios/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/external_ui/ios/Runner.xcodeproj/project.pbxproj @@ -359,7 +359,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.externalUi; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.externalUi; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -381,7 +381,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.externalUi; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.externalUi; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/dev/integration_tests/external_ui/lib/main.dart b/dev/integration_tests/external_ui/lib/main.dart index 496a23b7fea..6b9cfcf1097 100644 --- a/dev/integration_tests/external_ui/lib/main.dart +++ b/dev/integration_tests/external_ui/lib/main.dart @@ -95,7 +95,9 @@ Widget builds: $_widgetBuilds'''; ticker.dispose(); setState(() { _flutterFrameRate = tickCount * 1000 / elapsed.inMilliseconds; - _summary = 'Flutter frame rate is ${_flutterFrameRate.toStringAsFixed(1)}fps.\nPress play to produce texture frames.'; + _summary = ''' +Flutter frame rate is ${_flutterFrameRate.toStringAsFixed(1)}fps. +Press play to produce texture frames.'''; _icon = Icons.play_arrow; _state = FrameState.initial; }); diff --git a/dev/integration_tests/external_ui/test_driver/main_test.dart b/dev/integration_tests/external_ui/test_driver/main_test.dart index fd762fc20b0..dd313c9a539 100644 --- a/dev/integration_tests/external_ui/test_driver/main_test.dart +++ b/dev/integration_tests/external_ui/test_driver/main_test.dart @@ -16,11 +16,13 @@ Future main() async { setUpAll(() async { driver = await FlutterDriver.connect(); - // TODO(mravn): the following pause appears necessary on iOS to avoid - // inflating elements too early (when there is no size). - await new Future.delayed(const Duration(seconds: 1)); }); + // This test verifies that we can consume texture frames at a rate + // close to the minimum of the rate at which they are produced + // and Flutter's frame rate. It also verifies that we do not rebuild the + // Widget tree during texture consumption. The test starts by measuring + // Flutter's frame rate. test('texture rendering', () async { final SerializableFinder fab = find.byValueKey('fab'); final SerializableFinder summary = find.byValueKey('summary');