From 1e2f0a5e4a5dfa7401c4c7bb34f76f91076a36cc Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Tue, 1 Oct 2024 22:37:42 +0530 Subject: [PATCH 1/7] added spotless and formated files --- .settings/org.eclipse.buildship.core.prefs | 13 +++ .settings/org.eclipse.jdt.core.prefs | 4 + build.gradle | 32 ++++-- local.properties | 8 ++ .../github/lambdatest/gradle/AppUploader.java | 42 ++++--- .../github/lambdatest/gradle/Constants.java | 6 +- .../lambdatest/gradle/LambdaTestTask.java | 15 ++- .../lambdatest/gradle/TestExecutor.java | 104 +++++++++++++----- .../lambdatest/gradle/TestSuiteUploader.java | 56 ++++++---- 9 files changed, 192 insertions(+), 88 deletions(-) create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 local.properties diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..87fdc02 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments=--init-script /home/taz/.cache/jdtls/config/org.eclipse.osgi/148/0/.cp/gradle/init/init.gradle +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/usr/lib/jvm/java-17-openjdk +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..626e0e1 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.source=17 diff --git a/build.gradle b/build.gradle index 442d027..23aaf7f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java-gradle-plugin' id 'com.gradle.plugin-publish' version '1.1.0' + id 'com.diffplug.spotless' version '6.25.0' } version = '1.0.5' @@ -19,18 +20,25 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-core:2.24.1' } - - gradlePlugin { - website = 'https://www.lambdatest.com' - vcsUrl = 'https://github.com/LambdaTest/lambdatest-gradle-plugin' - plugins { - lambdatestPlugin { - id = 'io.github.lambdatest.gradle' - implementationClass = 'io.github.lambdatest.gradle.LambdaTestPlugin' - displayName = 'LambdaTest Gradle Plugin' - description = 'Runs Espresso tests on LambdaTest' - tags.set(['espresso', 'test', 'lambdatest', 'app', 'automation', 'appautomation']) + website = 'https://www.lambdatest.com' + vcsUrl = 'https://github.com/LambdaTest/lambdatest-gradle-plugin' + plugins { + lambdatestPlugin { + id = 'io.github.lambdatest.gradle' + implementationClass = 'io.github.lambdatest.gradle.LambdaTestPlugin' + displayName = 'LambdaTest Gradle Plugin' + description = 'Runs Espresso tests on LambdaTest' + tags.set(['espresso', 'test', 'lambdatest', 'app', 'automation', 'appautomation']) + } } - } } + +spotless { + java { + importOrder() + removeUnusedImports() + googleJavaFormat().aosp() + formatAnnotations() + } +} \ No newline at end of file diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..9a46c90 --- /dev/null +++ b/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Tue Oct 01 22:36:40 IST 2024 +sdk.dir=/Users/taz/Library/Android/sdk diff --git a/src/main/java/io/github/lambdatest/gradle/AppUploader.java b/src/main/java/io/github/lambdatest/gradle/AppUploader.java index c1bf35c..e94a9f4 100644 --- a/src/main/java/io/github/lambdatest/gradle/AppUploader.java +++ b/src/main/java/io/github/lambdatest/gradle/AppUploader.java @@ -27,22 +27,32 @@ public AppUploader(String username, String accessKey, String appFilePath) { } public CompletableFuture uploadAppAsync() { - return CompletableFuture.supplyAsync(() -> { - try { - OkHttpClient client = new OkHttpClient().newBuilder().build(); - MediaType mediaType = MediaType.parse("application/octet-stream"); - RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM) - .addFormDataPart("appFile", appFilePath, - RequestBody.create(mediaType, new java.io.File(appFilePath))) - .addFormDataPart("type", "espresso-android") - .build(); - Request request = new Request.Builder() - .url(Constants.API_URL) - .method("POST", body) - .addHeader("Authorization", Credentials.basic(username, accessKey)) - .build(); - try (Response response = client.newCall(request).execute()) { - if (!response.isSuccessful()) throw new IOException("Unexpected code " + response); + return CompletableFuture.supplyAsync( + () -> { + try { + OkHttpClient client = new OkHttpClient().newBuilder().build(); + MediaType mediaType = MediaType.parse("application/octet-stream"); + RequestBody body = + new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart( + "appFile", + appFilePath, + RequestBody.create( + mediaType, new java.io.File(appFilePath))) + .addFormDataPart("type", "espresso-android") + .build(); + Request request = + new Request.Builder() + .url(Constants.API_URL) + .method("POST", body) + .addHeader( + "Authorization", + Credentials.basic(username, accessKey)) + .build(); + try (Response response = client.newCall(request).execute()) { + if (!response.isSuccessful()) + throw new IOException("Unexpected code " + response); // Parse the JSON response and extract the app_id String responseBody = response.body().string(); diff --git a/src/main/java/io/github/lambdatest/gradle/Constants.java b/src/main/java/io/github/lambdatest/gradle/Constants.java index b13e265..25d30d7 100644 --- a/src/main/java/io/github/lambdatest/gradle/Constants.java +++ b/src/main/java/io/github/lambdatest/gradle/Constants.java @@ -2,6 +2,8 @@ public class Constants { public static final String API_URL = "https://manual-api.lambdatest.com/app/uploadFramework"; - public static final String BUILD_URL = "https://mobile-api.lambdatest.com/framework/v1/espresso/build"; - public static final String FLUTTER_BUILD_URL = "https://mobile-api.lambdatest.com/framework/v1/flutter/build"; + public static final String BUILD_URL = + "https://mobile-api.lambdatest.com/framework/v1/espresso/build"; + public static final String FLUTTER_BUILD_URL = + "https://mobile-api.lambdatest.com/framework/v1/flutter/build"; } diff --git a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java index 617355d..830df75 100644 --- a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java +++ b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java @@ -5,11 +5,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; +import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; -import java.util.HashMap; -import java.util.List; +import org.gradle.api.DefaultTask; +import org.gradle.api.tasks.TaskAction; public class LambdaTestTask extends DefaultTask { @@ -73,12 +75,12 @@ public void runLambdaTest() { logger.error("Failed to execute tasks: {}", e); throw new RuntimeException(e); } - + // Execute tests logger.info("Executing tests..."); TestExecutor testExecutor = new TestExecutor(username, accessKey, appId, testSuiteId, device, isFlutter); Map params = new HashMap<>(); - + if (build != null) params.put("build", build); if (deviceLog != null) params.put("deviceLog", deviceLog.toString()); if (idleTimeout != null) params.put("IdleTimeout", idleTimeout.toString()); @@ -89,7 +91,8 @@ public void runLambdaTest() { if (geoLocation != null) params.put("geoLocation", geoLocation); if (disableAnimation != null) params.put("disableAnimation", disableAnimation.toString()); if (clearPackageData != null) params.put("clearPackageData", clearPackageData.toString()); - if (singleRunnerInvocation != null) params.put("singleRunnerInvocation", singleRunnerInvocation.toString()); + if (singleRunnerInvocation != null) + params.put("singleRunnerInvocation", singleRunnerInvocation.toString()); if (globalHttpProxy != null) params.put("globalHttpProxy", globalHttpProxy.toString()); if (fixedIp != null) params.put("fixedIp", fixedIp); if (queueTimeout != null) params.put("queueTimeout", queueTimeout.toString()); @@ -156,7 +159,7 @@ public void setTunnelName(String tunnelName) { public void setGeoLocation(String geoLocation) { this.geoLocation = geoLocation; } - + public void setDisableAnimation(Boolean disableAnimation) { this.disableAnimation = disableAnimation; } diff --git a/src/main/java/io/github/lambdatest/gradle/TestExecutor.java b/src/main/java/io/github/lambdatest/gradle/TestExecutor.java index 2e938ae..38c6635 100644 --- a/src/main/java/io/github/lambdatest/gradle/TestExecutor.java +++ b/src/main/java/io/github/lambdatest/gradle/TestExecutor.java @@ -4,9 +4,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; +import okhttp3.*; public class TestExecutor { private static final Logger logger = LogManager.getLogger(TestExecutor.class); @@ -18,7 +19,13 @@ public class TestExecutor { private List device; private Boolean isFlutter; - public TestExecutor(String username, String accessKey, String appId, String testSuiteId, List device, Boolean isFlutter) { + public TestExecutor( + String username, + String accessKey, + String appId, + String testSuiteId, + List device, + Boolean isFlutter) { this.username = username; this.accessKey = accessKey; this.appId = appId; @@ -32,30 +39,66 @@ public void executeTests(Map params) throws IOException { OkHttpClient client = new OkHttpClient().newBuilder().build(); MediaType mediaType = MediaType.parse("application/json"); - String devicesJsonArray = device.stream() - .map(device -> "\"" + device + "\"") - .collect(Collectors.joining(",", "[", "]")); - - StringBuilder jsonBodyBuilder = new StringBuilder(String.format("{\n" - + " \"app\" : \"%s\",\n" - + " \"testSuite\": \"%s\",\n" - + " \"device\" : %s", appId, testSuiteId, devicesJsonArray)); + String devicesJsonArray = + device.stream() + .map(device -> "\"" + device + "\"") + .collect(Collectors.joining(",", "[", "]")); + StringBuilder jsonBodyBuilder = + new StringBuilder( + String.format( + "{\n" + + " \"app\" : \"%s\",\n" + + " \"testSuite\": \"%s\",\n" + + " \"device\" : %s", + appId, testSuiteId, devicesJsonArray)); - if (params.get("build") != null) jsonBodyBuilder.append(String.format(",\n \"build\": \"%s\"", params.get("build"))); - if (params.get("deviceLog") != null) jsonBodyBuilder.append(String.format(",\n \"deviceLog\": %s", params.get("deviceLog"))); - if (params.get("IdleTimeout") != null) jsonBodyBuilder.append(String.format(",\n \"IdleTimeout\": %s", params.get("IdleTimeout"))); - if (params.get("queueTimeout") != null) jsonBodyBuilder.append(String.format(",\n \"queueTimeout\": %s", params.get("queueTimeout"))); - if (params.get("video") != null) jsonBodyBuilder.append(String.format(",\n \"video\": %s", params.get("video"))); - if (params.get("network") != null) jsonBodyBuilder.append(String.format(",\n \"network\": %s", params.get("network"))); - if (params.get("tunnel") != null) jsonBodyBuilder.append(String.format(",\n \"tunnel\": %s", params.get("tunnel"))); - if (params.get("tunnelName") != null) jsonBodyBuilder.append(String.format(",\n \"tunnelName\": \"%s\"", params.get("tunnelName"))); - if (params.get("geoLocation") != null) jsonBodyBuilder.append(String.format(",\n \"geoLocation\": \"%s\"", params.get("geoLocation"))); - if (params.get("fixedIp") != null) jsonBodyBuilder.append(String.format(",\n \"fixedIp\": \"%s\"", params.get("fixedIp"))); - if (params.get("globalHttpProxy") != null) jsonBodyBuilder.append(String.format(",\n \"globalHttpProxy\": %s", params.get("globalHttpProxy"))); - if (params.get("singleRunnerInvocation") != null) jsonBodyBuilder.append(String.format(",\n \"singleRunnerInvocation\": %s", params.get("singleRunnerInvocation"))); - if (params.get("clearPackageData") != null) jsonBodyBuilder.append(String.format(",\n \"clearPackageData\": %s", params.get("clearPackageData"))); - if (params.get("disableAnimation") != null) jsonBodyBuilder.append(String.format(",\n \"disableAnimation\": %s", params.get("disableAnimation"))); + if (params.get("build") != null) + jsonBodyBuilder.append( + String.format(",\n \"build\": \"%s\"", params.get("build"))); + if (params.get("deviceLog") != null) + jsonBodyBuilder.append( + String.format(",\n \"deviceLog\": %s", params.get("deviceLog"))); + if (params.get("IdleTimeout") != null) + jsonBodyBuilder.append( + String.format(",\n \"IdleTimeout\": %s", params.get("IdleTimeout"))); + if (params.get("queueTimeout") != null) + jsonBodyBuilder.append( + String.format(",\n \"queueTimeout\": %s", params.get("queueTimeout"))); + if (params.get("video") != null) + jsonBodyBuilder.append(String.format(",\n \"video\": %s", params.get("video"))); + if (params.get("network") != null) + jsonBodyBuilder.append( + String.format(",\n \"network\": %s", params.get("network"))); + if (params.get("tunnel") != null) + jsonBodyBuilder.append( + String.format(",\n \"tunnel\": %s", params.get("tunnel"))); + if (params.get("tunnelName") != null) + jsonBodyBuilder.append( + String.format(",\n \"tunnelName\": \"%s\"", params.get("tunnelName"))); + if (params.get("geoLocation") != null) + jsonBodyBuilder.append( + String.format(",\n \"geoLocation\": \"%s\"", params.get("geoLocation"))); + if (params.get("fixedIp") != null) + jsonBodyBuilder.append( + String.format(",\n \"fixedIp\": \"%s\"", params.get("fixedIp"))); + if (params.get("globalHttpProxy") != null) + jsonBodyBuilder.append( + String.format( + ",\n \"globalHttpProxy\": %s", params.get("globalHttpProxy"))); + if (params.get("singleRunnerInvocation") != null) + jsonBodyBuilder.append( + String.format( + ",\n \"singleRunnerInvocation\": %s", + params.get("singleRunnerInvocation"))); + if (params.get("clearPackageData") != null) + jsonBodyBuilder.append( + String.format( + ",\n \"clearPackageData\": %s", params.get("clearPackageData"))); + if (params.get("disableAnimation") != null) + jsonBodyBuilder.append( + String.format( + ",\n \"disableAnimation\": %s", params.get("disableAnimation"))); jsonBodyBuilder.append("\n}"); logger.info("Capabilities: {}", jsonBodyBuilder); @@ -63,12 +106,13 @@ public void executeTests(Map params) throws IOException { String url = (isFlutter == null || !isFlutter) ? Constants.BUILD_URL : Constants.FLUTTER_BUILD_URL; RequestBody body = RequestBody.create(mediaType, jsonBodyBuilder.toString()); - Request request = new Request.Builder() - .url(url) - .method("POST", body) - .addHeader("Authorization", Credentials.basic(username, accessKey)) - .addHeader("Content-Type", "application/json") - .build(); + Request request = + new Request.Builder() + .url(url) + .method("POST", body) + .addHeader("Authorization", Credentials.basic(username, accessKey)) + .addHeader("Content-Type", "application/json") + .build(); Response response = client.newCall(request).execute(); logger.info("Running Tests"); diff --git a/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java b/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java index b79b3b8..bb27f84 100644 --- a/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java +++ b/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java @@ -1,12 +1,12 @@ package io.github.lambdatest.gradle; -import okhttp3.*; -import java.io.IOException; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import java.io.IOException; import java.util.concurrent.CompletableFuture; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import okhttp3.*; public class TestSuiteUploader { @@ -23,26 +23,38 @@ public TestSuiteUploader(String username, String accessKey, String testSuiteFile } public CompletableFuture uploadTestSuiteAsync() { - return CompletableFuture.supplyAsync(() -> { - try { - OkHttpClient client = new OkHttpClient().newBuilder().build(); - MediaType mediaType = MediaType.parse("application/octet-stream"); - RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM) - .addFormDataPart("appFile", testSuiteFilePath, - RequestBody.create(mediaType, new java.io.File(testSuiteFilePath))) - .addFormDataPart("type", "espresso-android") - .build(); - Request request = new Request.Builder() - .url(Constants.API_URL) - .method("POST", body) - .addHeader("Authorization", Credentials.basic(username, accessKey)) - .build(); - try (Response response = client.newCall(request).execute()) { - if (!response.isSuccessful()) throw new IOException("Unexpected code " + response); - - String responseBody = response.body().string(); - JsonObject jsonObject = JsonParser.parseString(responseBody).getAsJsonObject(); - String testSuiteId = jsonObject.get("app_id").getAsString(); + return CompletableFuture.supplyAsync( + () -> { + try { + OkHttpClient client = new OkHttpClient().newBuilder().build(); + MediaType mediaType = MediaType.parse("application/octet-stream"); + RequestBody body = + new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart( + "appFile", + testSuiteFilePath, + RequestBody.create( + mediaType, + new java.io.File(testSuiteFilePath))) + .addFormDataPart("type", "espresso-android") + .build(); + Request request = + new Request.Builder() + .url(Constants.API_URL) + .method("POST", body) + .addHeader( + "Authorization", + Credentials.basic(username, accessKey)) + .build(); + try (Response response = client.newCall(request).execute()) { + if (!response.isSuccessful()) + throw new IOException("Unexpected code " + response); + + String responseBody = response.body().string(); + JsonObject jsonObject = + JsonParser.parseString(responseBody).getAsJsonObject(); + String testSuiteId = jsonObject.get("app_id").getAsString(); logger.info("Uploaded test suite ID: {}", testSuiteId); return testSuiteId; From 143ac2311f7f39eb28846aebd858d278ed3e92b6 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Tue, 1 Oct 2024 22:38:40 +0530 Subject: [PATCH 2/7] remove unnecessary files --- local.properties | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 local.properties diff --git a/local.properties b/local.properties deleted file mode 100644 index 9a46c90..0000000 --- a/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Tue Oct 01 22:36:40 IST 2024 -sdk.dir=/Users/taz/Library/Android/sdk From 777dd2b09cdaddcb605969dbba321ba70fa8e9ef Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Wed, 2 Oct 2024 09:44:03 +0530 Subject: [PATCH 3/7] added workflow --- .github/workflows/format-check.yml | 24 ++++++++++++++++++++++++ CONTRIBUTING.md | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/workflows/format-check.yml diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml new file mode 100644 index 0000000..5cbc30f --- /dev/null +++ b/.github/workflows/format-check.yml @@ -0,0 +1,24 @@ +name: Check Format + +on: + push: + branches: [ 'release', 'development' ] + pull_request: + branches: [ 'release', 'development' ] + +jobs: + check: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'oracle' + + - name: Build with Gradle + run: ./gradlew spotlessCheck \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 60eb2ab..2f23a97 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,6 +52,12 @@ so all code changes happen through pull requests. 6. Rebase `dev` with your branch and push your changes. 7. Raise a pull request against the master branch of the main repository. +### Formatting code + +We use spotless to manage proper and consistent formatting throughout the project. +- `./gradlew spotlessCheck` will check your code for formatting issues +- `./gradlew spotlessApply` will fix the formatting issues (if any) + ## **Committing Code** The repository contains one important (protected) branch: From 6b54b764fc22ccc7f25ff461e2b607afb0719fc3 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Wed, 2 Oct 2024 09:45:20 +0530 Subject: [PATCH 4/7] fix branch name --- .github/workflows/format-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 5cbc30f..d21ab5e 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,9 +2,9 @@ name: Check Format on: push: - branches: [ 'release', 'development' ] + branches: [ 'main' ] pull_request: - branches: [ 'release', 'development' ] + branches: [ 'main' ] jobs: check: From 71e1f63d6b7c029e5997f46777bcb22206d65d63 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Wed, 2 Oct 2024 12:38:03 +0530 Subject: [PATCH 5/7] added newlines --- .github/workflows/format-check.yml | 3 ++- build.gradle | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index d21ab5e..23cbb9d 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -21,4 +21,5 @@ jobs: distribution: 'oracle' - name: Build with Gradle - run: ./gradlew spotlessCheck \ No newline at end of file + run: ./gradlew spotlessCheck + diff --git a/build.gradle b/build.gradle index 23aaf7f..5ff6b02 100644 --- a/build.gradle +++ b/build.gradle @@ -41,4 +41,5 @@ spotless { googleJavaFormat().aosp() formatAnnotations() } -} \ No newline at end of file +} + From 3f6eb78cb6ab8b6b752e263a4f88e9cb9c643042 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Thu, 3 Oct 2024 14:31:42 +0530 Subject: [PATCH 6/7] cr --- .github/workflows/format-check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 23cbb9d..8268fb8 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,9 +2,9 @@ name: Check Format on: push: - branches: [ 'main' ] + branches: [ main ] pull_request: - branches: [ 'main' ] + branches: [ main ] jobs: check: @@ -17,8 +17,8 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '17' distribution: 'oracle' + java-version: '17' - name: Build with Gradle run: ./gradlew spotlessCheck From 7572f9762367c066bcd7388e2f4be312dfc5d5d1 Mon Sep 17 00:00:00 2001 From: Tanish Azad Date: Thu, 3 Oct 2024 22:09:27 +0530 Subject: [PATCH 7/7] removed useless files and apply spotless --- .settings/org.eclipse.buildship.core.prefs | 13 --------- .settings/org.eclipse.jdt.core.prefs | 4 --- .../github/lambdatest/gradle/AppUploader.java | 29 ++++++++++--------- .../lambdatest/gradle/LambdaTestTask.java | 12 ++++---- .../lambdatest/gradle/TestExecutor.java | 10 ++++--- .../lambdatest/gradle/TestSuiteUploader.java | 18 ++++++------ 6 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 .settings/org.eclipse.buildship.core.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 87fdc02..0000000 --- a/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments=--init-script /home/taz/.cache/jdtls/config/org.eclipse.osgi/148/0/.cp/gradle/init/init.gradle -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home=/usr/lib/jvm/java-17-openjdk -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 626e0e1..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.source=17 diff --git a/src/main/java/io/github/lambdatest/gradle/AppUploader.java b/src/main/java/io/github/lambdatest/gradle/AppUploader.java index e94a9f4..22e0e89 100644 --- a/src/main/java/io/github/lambdatest/gradle/AppUploader.java +++ b/src/main/java/io/github/lambdatest/gradle/AppUploader.java @@ -2,11 +2,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import java.io.IOException; +import java.util.concurrent.CompletableFuture; import okhttp3.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.IOException; -import java.util.concurrent.CompletableFuture; public class AppUploader { @@ -54,18 +54,19 @@ public CompletableFuture uploadAppAsync() { if (!response.isSuccessful()) throw new IOException("Unexpected code " + response); - // Parse the JSON response and extract the app_id - String responseBody = response.body().string(); - JsonObject jsonObject = JsonParser.parseString(responseBody).getAsJsonObject(); - String appId = jsonObject.get("app_id").getAsString(); + // Parse the JSON response and extract the app_id + String responseBody = response.body().string(); + JsonObject jsonObject = + JsonParser.parseString(responseBody).getAsJsonObject(); + String appId = jsonObject.get("app_id").getAsString(); - logger.info("Uploaded app ID: {}", appId); - return appId; - } - } catch (IOException e) { - logger.error("Error uploading app: {}", e.getMessage()); - throw new RuntimeException(e); - } - }); + logger.info("Uploaded app ID: {}", appId); + return appId; + } + } catch (IOException e) { + logger.error("Error uploading app: {}", e.getMessage()); + throw new RuntimeException(e); + } + }); } } diff --git a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java index 830df75..405bab4 100644 --- a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java +++ b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java @@ -1,15 +1,13 @@ package io.github.lambdatest.gradle; -import org.gradle.api.DefaultTask; -import org.gradle.api.tasks.TaskAction; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; @@ -56,7 +54,8 @@ public void runLambdaTest() { if (testSuiteId == null && testSuiteFilePath != null) { logger.info("Uploading test suite..."); - TestSuiteUploader testSuiteUploader = new TestSuiteUploader(username, accessKey, testSuiteFilePath); + TestSuiteUploader testSuiteUploader = + new TestSuiteUploader(username, accessKey, testSuiteFilePath); testSuiteIdFuture = testSuiteUploader.uploadTestSuiteAsync(); } @@ -78,7 +77,8 @@ public void runLambdaTest() { // Execute tests logger.info("Executing tests..."); - TestExecutor testExecutor = new TestExecutor(username, accessKey, appId, testSuiteId, device, isFlutter); + TestExecutor testExecutor = + new TestExecutor(username, accessKey, appId, testSuiteId, device, isFlutter); Map params = new HashMap<>(); if (build != null) params.put("build", build); diff --git a/src/main/java/io/github/lambdatest/gradle/TestExecutor.java b/src/main/java/io/github/lambdatest/gradle/TestExecutor.java index 38c6635..34ea4b5 100644 --- a/src/main/java/io/github/lambdatest/gradle/TestExecutor.java +++ b/src/main/java/io/github/lambdatest/gradle/TestExecutor.java @@ -1,13 +1,12 @@ package io.github.lambdatest.gradle; -import okhttp3.*; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import okhttp3.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class TestExecutor { private static final Logger logger = LogManager.getLogger(TestExecutor.class); @@ -103,7 +102,10 @@ public void executeTests(Map params) throws IOException { jsonBodyBuilder.append("\n}"); logger.info("Capabilities: {}", jsonBodyBuilder); - String url = (isFlutter == null || !isFlutter) ? Constants.BUILD_URL : Constants.FLUTTER_BUILD_URL; + String url = + (isFlutter == null || !isFlutter) + ? Constants.BUILD_URL + : Constants.FLUTTER_BUILD_URL; RequestBody body = RequestBody.create(mediaType, jsonBodyBuilder.toString()); Request request = diff --git a/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java b/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java index bb27f84..b41bf37 100644 --- a/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java +++ b/src/main/java/io/github/lambdatest/gradle/TestSuiteUploader.java @@ -4,9 +4,9 @@ import com.google.gson.JsonParser; import java.io.IOException; import java.util.concurrent.CompletableFuture; +import okhttp3.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import okhttp3.*; public class TestSuiteUploader { @@ -56,13 +56,13 @@ public CompletableFuture uploadTestSuiteAsync() { JsonParser.parseString(responseBody).getAsJsonObject(); String testSuiteId = jsonObject.get("app_id").getAsString(); - logger.info("Uploaded test suite ID: {}", testSuiteId); - return testSuiteId; - } - } catch (IOException e) { - logger.error("Error uploading test suite app: {}", e.getMessage()); - throw new RuntimeException(e); - } - }); + logger.info("Uploaded test suite ID: {}", testSuiteId); + return testSuiteId; + } + } catch (IOException e) { + logger.error("Error uploading test suite app: {}", e.getMessage()); + throw new RuntimeException(e); + } + }); } }