From 77c07871b45121107069a92f10d660cb6fbd22ce Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Thu, 25 May 2017 13:49:31 -0700
Subject: [PATCH] Updated sample app production device labs task (#10326)

---
 dev/devicelab/lib/tasks/sample_catalog_generator.dart | 8 +++-----
 examples/catalog/bin/sample_page.dart                 | 4 ++++
 examples/catalog/bin/screenshot_test.dart.template    | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev/devicelab/lib/tasks/sample_catalog_generator.dart b/dev/devicelab/lib/tasks/sample_catalog_generator.dart
index d0ea57acc8..ecd4ce78c6 100644
--- a/dev/devicelab/lib/tasks/sample_catalog_generator.dart
+++ b/dev/devicelab/lib/tasks/sample_catalog_generator.dart
@@ -19,17 +19,15 @@ Future<TaskResult> samplePageCatalogGenerator() async {
   await inDirectory(catalogDirectory, () async {
     await flutter('packages', options: <String>['get']);
 
-    if (deviceOperatingSystem == DeviceOperatingSystem.ios) {
+    if (deviceOperatingSystem == DeviceOperatingSystem.ios)
       await prepareProvisioningCertificates(catalogDirectory.path);
-      // This causes an Xcode project to be created.
-      await flutter('build', options: <String>['ios', '--profile']);
-    }
 
     await dart(<String>['bin/sample_page.dart']);
 
     await flutter('drive', options: <String>[
+      '--target',
       'test_driver/screenshot.dart',
-      '-d',
+      '--device-id',
       deviceId,
     ]);
   });
diff --git a/examples/catalog/bin/sample_page.dart b/examples/catalog/bin/sample_page.dart
index af899f44ec..2ebbb471e1 100644
--- a/examples/catalog/bin/sample_page.dart
+++ b/examples/catalog/bin/sample_page.dart
@@ -161,6 +161,10 @@ void generate() {
     }
   });
 
+  samples.sort((SampleGenerator a, SampleGenerator b) {
+    return a.sourceName.compareTo(b.sourceName);
+  });
+
   writeExpandedTemplate(
     outputFile('screenshot.dart', driverDirectory),
     screenshotTemplate,
diff --git a/examples/catalog/bin/screenshot_test.dart.template b/examples/catalog/bin/screenshot_test.dart.template
index 4eb55bd498..93f5f73f8f 100644
--- a/examples/catalog/bin/screenshot_test.dart.template
+++ b/examples/catalog/bin/screenshot_test.dart.template
@@ -19,7 +19,7 @@ void main() {
     });
 
     test('take sample screenshots', () async {
-      String prefix = Platform.isMacOS ? 'ios_' : "";
+      final String prefix = Platform.isMacOS ? 'ios_' : "";
       final List<String> paths = <String>[
         @(paths)
       ];