From 7ce1db050abf86598e6c9d86db714450064af4b7 Mon Sep 17 00:00:00 2001 From: Anand Bagmar Date: Wed, 17 Mar 2021 18:52:09 +0530 Subject: [PATCH] use the uploaded apk name in the mobilab_capabilities file --- src/main/java/com/znsio/e2e/runner/Runner.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/znsio/e2e/runner/Runner.java b/src/main/java/com/znsio/e2e/runner/Runner.java index c97f53c57..f182d6d13 100644 --- a/src/main/java/com/znsio/e2e/runner/Runner.java +++ b/src/main/java/com/znsio/e2e/runner/Runner.java @@ -489,10 +489,10 @@ private void uploadAPKTopCloudy (String emailID, String authenticationKey) { String deviceLabURL = configs.get(DEVICE_LAB_URL); String authToken = getpCloudyAuthToken(emailID, authenticationKey, appPath, deviceLabURL); - uploadAPKToPCloudy(appPath, deviceLabURL, authToken); + configs.put(APP_PATH, uploadAPKToPCloudy(appPath, deviceLabURL, authToken)); } - private void uploadAPKToPCloudy (String appPath, String deviceLabURL, String authToken) { + private String uploadAPKToPCloudy (String appPath, String deviceLabURL, String authToken) { System.out.println("uploadAPKTopCloudy: Start: " + appPath); String[] listOfDevices = new String[]{ "curl", @@ -505,17 +505,20 @@ private void uploadAPKToPCloudy (String appPath, String deviceLabURL, String aut "-F", "\"token=" + authToken + "\"", "-F", - "\"filter=all\"", + "\"filter=apk\"", deviceLabURL + "/api/upload_file"}; CommandLineResponse uploadResponse = CommandLineExecutor.execCommand(listOfDevices); System.out.println("uploadResponse: " + uploadResponse.getStdOut()); - int uploadStatus = JsonFile.convertToMap(uploadResponse.getStdOut()).getAsJsonObject("result").get("code").getAsInt(); + JsonObject result = JsonFile.convertToMap(uploadResponse.getStdOut()).getAsJsonObject("result"); + int uploadStatus = result.get("code").getAsInt(); System.out.println("uploadResponse code: " + uploadStatus); if (200 != uploadStatus) { throw new EnvironmentSetupException(String.format("Unable to upload app: '%s' to '%s'%n%s", appPath, deviceLabURL, uploadResponse)); } - System.out.println("uploadAPKTopCloudy: Uploaded: " + appPath); + String uploadedFileName = result.get("file").getAsString(); + System.out.println("uploadAPKTopCloudy: Uploaded: " + uploadedFileName); + return uploadedFileName; } private String getpCloudyAuthToken (String emailID, String authenticationKey, String appPath, String deviceLabURL) {