test: fix ordering for NDK AGP4+

bugsnag · Aug 14, 2020 · cba71b7 · cba71b7
1 parent 7d7b1da
commit cba71b7
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/features/ndk_app_agp400.feature b/features/ndk_app_agp400.feature
@@ -5,57 +5,57 @@ Scenario: NDK apps send requests
     When I build the NDK app
     Then I should receive 6 requests
 
-    And the request 5 is valid for the Android Mapping API
-    And the payload field "apiKey" equals "your-api-key-here" for request 5
-
-    And the request 0 is valid for the Android NDK Mapping API
+    And the request 0 is valid for the Build API
+    And the payload field "appVersion" equals "1.0" for request 0
     And the payload field "apiKey" equals "your-api-key-here" for request 0
-    And the payload field "projectRoot" is not null for request 0
-    And the payload field "arch" equals "arm64-v8a" for request 0
+    And the payload field "builderName" is not null for request 0
+    And the payload field "buildTool" equals "gradle-android" for request 0
+    And the payload field "appVersionCode" equals "1" for request 0
 
     And the request 1 is valid for the Android NDK Mapping API
     And the payload field "apiKey" equals "your-api-key-here" for request 1
     And the payload field "projectRoot" is not null for request 1
-    And the payload field "arch" equals "armeabi-v7a" for request 1
+    And the payload field "arch" equals "arm64-v8a" for request 1
 
     And the request 2 is valid for the Android NDK Mapping API
     And the payload field "apiKey" equals "your-api-key-here" for request 2
     And the payload field "projectRoot" is not null for request 2
-    And the payload field "arch" equals "x86" for request 2
+    And the payload field "arch" equals "armeabi-v7a" for request 2
 
     And the request 3 is valid for the Android NDK Mapping API
     And the payload field "apiKey" equals "your-api-key-here" for request 3
     And the payload field "projectRoot" is not null for request 3
-    And the payload field "arch" equals "x86_64" for request 3
+    And the payload field "arch" equals "x86" for request 3
 
-    And the request 4 is valid for the Build API
-    And the payload field "appVersion" equals "1.0" for request 4
+    And the request 4 is valid for the Android NDK Mapping API
     And the payload field "apiKey" equals "your-api-key-here" for request 4
-    And the payload field "builderName" is not null for request 4
-    And the payload field "buildTool" equals "gradle-android" for request 4
-    And the payload field "appVersionCode" equals "1" for request 4
+    And the payload field "projectRoot" is not null for request 4
+    And the payload field "arch" equals "x86_64" for request 4
+
+    And the request 5 is valid for the Android Mapping API
+    And the payload field "apiKey" equals "your-api-key-here" for request 5
 
 @requires_agp4_0_or_higher
 Scenario: Custom projectRoot is added to payload
     When I set environment variable "PROJECT_ROOT" to "/repos/custom/my-app"
     When I build the NDK app
     Then I should receive 6 requests
 
-    And the request 5 is valid for the Android Mapping API
+    And the request 0 is valid for the Build API
+
+    And the request 1 is valid for the Android NDK Mapping API
+    And the payload field "projectRoot" equals "/repos/custom/my-app" for request 1
 
     And the request 2 is valid for the Android NDK Mapping API
     And the payload field "projectRoot" equals "/repos/custom/my-app" for request 2
 
     And the request 3 is valid for the Android NDK Mapping API
     And the payload field "projectRoot" equals "/repos/custom/my-app" for request 3
 
-    And the request 0 is valid for the Android NDK Mapping API
-    And the payload field "projectRoot" equals "/repos/custom/my-app" for request 0
+    And the request 4 is valid for the Android NDK Mapping API
+    And the payload field "projectRoot" equals "/repos/custom/my-app" for request 4
 
-    And the request 1 is valid for the Android NDK Mapping API
-    And the payload field "projectRoot" equals "/repos/custom/my-app" for request 1
-
-    And the request 4 is valid for the Build API
+    And the request 5 is valid for the Android Mapping API
 
 # Sets a non-existent objdump location for x86 and arm64-v8a, delivery should proceed as normal for other files
 @requires_agp4_0_or_higher
@@ -64,12 +64,12 @@ Scenario: Custom objdump location
     When I build the NDK app
     Then I should receive 4 requests
 
-    And the request 3 is valid for the Android Mapping API
-
-    And the request 0 is valid for the Android NDK Mapping API
-    And the payload field "arch" equals "armeabi-v7a" for request 0
+    And the request 0 is valid for the Build API
 
     And the request 1 is valid for the Android NDK Mapping API
-    And the payload field "arch" equals "x86_64" for request 1
+    And the payload field "arch" equals "armeabi-v7a" for request 1
 
-    And the request 2 is valid for the Build API
+    And the request 2 is valid for the Android NDK Mapping API
+    And the payload field "arch" equals "x86_64" for request 2
+
+    And the request 3 is valid for the Android Mapping API