Add native skip

dev/e2e_app/android/app/src/androidTest/java/pl/leancode/patrol/e2e_app/MainActivityTest.java

@@ -28,4 +28,4 @@ public void runDartTest() {
         PatrolJUnitRunner instrumentation = (PatrolJUnitRunner) InstrumentationRegistry.getInstrumentation();
         instrumentation.runDartTest(dartTestName);
     }
-}
+}

dev/e2e_app/integration_test/android_app_test.dart

@@ -23,4 +23,34 @@ void main() {
 
     await $.native.pressBack();
   });
+
+  patrol('taps around 2', skip: true, ($) async {
+    await createApp($);
+
+    await $.native.pressHome();
+    await $.native.pressDoubleRecentApps();
+
+    await $.native.openNotifications();
+
+    await $.native.enableWifi();
+    await $.native.disableWifi();
+    await $.native.enableWifi();
+
+    await $.native.enableCellular();
+    await $.native.disableCellular();
+    await $.native.enableCellular();
+
+    await $.native.enableDarkMode();
+    await $.native.disableDarkMode();
+    await $.native.enableDarkMode();
+
+    await $.native.pressBack();
+  });
+
+  patrol('taps around 3', ($) async {
+    await createApp($);
+
+    await $.native.pressHome();
+    await $.native.pressDoubleRecentApps();
+  });
 }

dev/e2e_app/integration_test/macos/macos_app_test.dart

@@ -27,4 +27,29 @@ void main() {
       scrollDirection: AxisDirection.up,
     );
   });
+
+  patrol('taps around test to skip', skip: true, ($) async {
+    await createApp($);
+    await $.waitUntilVisible($(#counterText));
+
+    expect($(#counterText).text, '0');
+
+    await $(FloatingActionButton).tap();
+
+    expect($(#counterText).text, '1');
+
+    await $(#textField).enterText('Hello, Flutter!');
+    expect($('Hello, Flutter!'), findsOneWidget);
+
+    await $('Open scrolling screen').scrollTo().tap();
+    await $.waitUntilVisible($(#topText));
+
+    await $.scrollUntilVisible(finder: $(#bottomText));
+
+    await $.tap($(#backButton));
+    await $.scrollUntilVisible(
+      finder: $(#counterText),
+      scrollDirection: AxisDirection.up,
+    );
+  });
 }

dev/e2e_app/integration_test/open_app_test.dart

@@ -30,6 +30,31 @@ void main() {
     expect($(#counterText).text, '1');
   });
 
+  patrol('same open maps test that should be skipped', skip: true, ($) async {
+    final String mapsId;
+    if (io.Platform.isIOS) {
+      mapsId = 'com.apple.Maps';
+    } else if (io.Platform.isAndroid) {
+      mapsId = 'com.google.android.apps.maps';
+    } else {
+      throw UnsupportedError('Unsupported platform');
+    }
+
+    await createApp($);
+    await $.waitUntilVisible($(#counterText));
+
+    expect($(#counterText).text, '0');
+
+    await $(FloatingActionButton).tap();
+
+    await $.native.pressHome();
+    await $.native.openApp(appId: mapsId);
+    await $.native.pressHome();
+    await $.native.openApp();
+
+    expect($(#counterText).text, '1');
+  });
+
   patrol('open browser', ($) async {
     final String browserId;
     if (io.Platform.isIOS) {

dev/e2e_app/macos/Podfile.lock

@@ -47,7 +47,7 @@ SPEC CHECKSUMS:
   flutter_timezone: 6b906d1740654acb16e50b639835628fea851037
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   geolocator_apple: 72a78ae3f3e4ec0db62117bd93e34523f5011d58
-  patrol: 3e21d514020dbee24b3e3383caac9e8e051292ac
+  patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624
 
 PODFILE CHECKSUM: 4dcdd5fa8959bf7a21c4e3da36b083ff9ad52d38
 

packages/patrol/CHANGELOG.md

@@ -4,6 +4,7 @@
 - Implement `enableAirplaneMode` and `disableAirplaneMode` methods for Android. (#2254)
 - Implement `enableLocation` and `disableLocation` methods for Android. (#2259)
 - Fix opening settings app with clean state on iOS. (#2275)
+- Add native skip. (#2278)
 
 ## 3.9.0
 

packages/patrol/android/src/main/kotlin/pl/leancode/patrol/PatrolJUnitRunner.java

@@ -5,6 +5,8 @@
 
 package pl.leancode.patrol;
 
+import static org.junit.Assume.*;
+
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.os.Bundle;
@@ -16,7 +18,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
 import static pl.leancode.patrol.contracts.Contracts.DartGroupEntry;
@@ -29,6 +33,7 @@
  */
 public class PatrolJUnitRunner extends AndroidJUnitRunner {
     public PatrolAppServiceClient patrolAppServiceClient;
+    private Map<String, Boolean> dartTestCaseSkipMap = new HashMap<>();
 
     @Override
     protected boolean shouldWaitForActivitiesToComplete() {
@@ -110,6 +115,7 @@ public Object[] listDartTests() {
             List<DartGroupEntry> dartTestCases = ContractsExtensionsKt.listTestsFlat(dartTestGroup, "");
             List<String> dartTestCaseNamesList = new ArrayList<>();
             for (DartGroupEntry dartTestCase : dartTestCases) {
+                dartTestCaseSkipMap.put(dartTestCase.getName(), dartTestCase.getSkip());
                 dartTestCaseNamesList.add(dartTestCase.getName());
             }
             Object[] dartTestCaseNames = dartTestCaseNamesList.toArray();
@@ -127,6 +133,12 @@ public Object[] listDartTests() {
      */
     public RunDartTestResponse runDartTest(String name) {
         final String TAG = "PatrolJUnitRunner.runDartTest(" + name + "): ";
+
+        final Boolean skip = dartTestCaseSkipMap.get(name);
+        if (skip) {
+            Logger.INSTANCE.i(TAG + "Test skipped");
+            assumeFalse(skip);
+        }
 
         try {
             Logger.INSTANCE.i(TAG + "Requested execution");

packages/patrol/android/src/test/kotlin/pl/leancode/patrol/ContractsExtensionsTest.kt

@@ -9,11 +9,11 @@ fun dartTestGroup(
     name: String,
     entries: List<DartGroupEntry>,
 ): DartGroupEntry {
-    return DartGroupEntry(name, GroupEntryType.group, entries)
+    return DartGroupEntry(name, GroupEntryType.group, entries, false)
 }
 
 fun dartTestCase(name: String): DartGroupEntry {
-    return DartGroupEntry(name, GroupEntryType.test, listOf())
+    return DartGroupEntry(name, GroupEntryType.test, listOf(), false)
 }
 
 class DartTestGroupExtensionsTest {

packages/patrol/darwin/Classes/AutomatorServer/Contracts.swift

@@ -122,6 +122,7 @@ public struct DartGroupEntry: Codable {
   public var name: String
   public var type: GroupEntryType
   public var entries: [DartGroupEntry]
+  public var skip: Bool
 }
 
 public struct ListDartTestsResponse: Codable {

packages/patrol/darwin/Classes/AutomatorServer/PatrolAppServiceClient.swift

@@ -69,10 +69,6 @@ class PatrolAppServiceClient {
     urlconfig.timeoutIntervalForRequest = timeout
     urlconfig.timeoutIntervalForResource = timeout
 
-    urlconfig.connectionProxyDictionary = [
-        kCFNetworkProxiesHTTPEnable: false
-    ]
-
     var request = URLRequest(url: url)
     request.httpMethod = "POST"
     request.httpBody = body

packages/patrol/darwin/Classes/ObjCPatrolAppServiceClient.swift

@@ -48,15 +48,15 @@
     NSLog("PatrolAppServiceClient: created, port: \(port)")
   }
 
-  @objc public func listDartTests(completion: @escaping ([String]?, Error?) -> Void) {
+  @objc public func listDartTests(completion: @escaping ([[String: Any]]?, Error?) -> Void) {
     NSLog("PatrolAppServiceClient.listDartTests()")
 
     client.listDartTests { result in
       switch result {
       case .success(let result):
         NSLog("PatrolAppServiceClient.listDartTests(): succeeded")
         let output = result.group.listTestsFlat(parentGroupName: "").map {
-          $0.name
+          ["name": $0.name, "skip": $0.skip]
         }
         completion(output, nil)
       case .failure(let error):