Code refactors to simplify code and additional tests to improve coverage

Author: Kabilesh <kabilesh@dal.ca>
abstracta · Nov 23, 2023 · 387b9ae · 387b9ae
1 parent d809536
commit 387b9ae
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/jmeter-java-dsl-azure/src/main/java/us/abstracta/jmeter/javadsl/azure/AzureClient.java b/jmeter-java-dsl-azure/src/main/java/us/abstracta/jmeter/javadsl/azure/AzureClient.java
@@ -51,6 +51,7 @@ public class AzureClient extends BaseRemoteEngineApiClient {
 
   private static final Logger LOG = LoggerFactory.getLogger(AzureClient.class);
   private static final String USER_AGENT = getUserAgent();
+  private static final int HTTP_NOT_FOUND = 404;
 
   private final String tenantId;
   private final String clientId;
@@ -105,8 +106,9 @@ protected String buildAuthorizationHeaderValue(Request request) throws IOExcepti
     if (request.tag(RequestOrigin.class) == RequestOrigin.LOGIN) {
       return null;
     }
-    return "Bearer " + (request.tag(RequestOrigin.class) == RequestOrigin.MANAGEMENT
-        ? getFreshManagementToken() : getFreshLoadTestToken());
+    String bearerToken = (request.tag(RequestOrigin.class) == RequestOrigin.MANAGEMENT
+            ? getFreshManagementToken() : getFreshLoadTestToken());
+    return "Bearer " + bearerToken;
   }
 
   private enum RequestOrigin {
@@ -265,7 +267,7 @@ public ResourceGroup findResourceGroup(String name, Subscription subscription)
   private <T> Optional<T> execOptionalApiCall(Call<T> call) throws IOException {
     retrofit2.Response<T> response = call.execute();
     if (!response.isSuccessful()) {
-      if (response.code() == 404) {
+      if (response.code() == HTTP_NOT_FOUND) {
         return Optional.empty();
       }
       try (ResponseBody errorBody = response.errorBody()) {

diff --git a/...ashboard/src/test/java/us/abstracta/jmeter/javadsl/dashboard/DashboardVisualizerTest.java b/...ashboard/src/test/java/us/abstracta/jmeter/javadsl/dashboard/DashboardVisualizerTest.java
@@ -1,5 +1,6 @@
 package us.abstracta.jmeter.javadsl.dashboard;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.httpSampler;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.testPlan;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.threadGroup;
@@ -35,4 +36,11 @@ public void shouldDisplayGraphsAndSummaryWhenRunTestPlanWithDashboard(TestInfo t
     );
   }
 
+    @Test
+    public void shouldThrowUnsupportedOperationWhenShowInGuiOnDashboardVisualizer() {
+        DashboardVisualizer dashboardVisualizer = new DashboardVisualizer();
+
+        assertThrows(UnsupportedOperationException.class, dashboardVisualizer::showInGui);
+    }
+
 }
diff --git a/...-dsl-graphql/src/test/java/us/abstracta/jmeter/javadsl/graphql/DslGraphqlSamplerTest.java b/...-dsl-graphql/src/test/java/us/abstracta/jmeter/javadsl/graphql/DslGraphqlSamplerTest.java
@@ -6,6 +6,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.testPlan;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.threadGroup;
 import static us.abstracta.jmeter.javadsl.JmeterDsl.vars;
@@ -137,6 +138,19 @@ public void shouldSendGraphqlQueryToServerWhenGraphqlSamplerWithHttpGet()
     ).run();
     verify(getRequestedFor(anyUrl()).withQueryParam("query", equalTo(QUERY)));
   }
+  @Test
+  public void shouldThrowIllegalArgumentWhenGraphqlSamplerWithInvalidVariable() {
+    DslGraphqlSampler sampler = graphqlSampler("http://localhost", "{ user(id: 1){ name } }");
+    assertThrows(IllegalArgumentException.class, () -> sampler.variable("invalidVar", new Object()));
+  }
+
+  @Test
+  public void shouldHandleInvalidJsonInput() {
+    DslGraphqlSampler sampler = graphqlSampler("http://localhost", "{ user(id: 1){ name } }");
+    sampler.variablesJson("invalidJson");
+  }
+
+
 
   @Nested
   public class CodeBuilderTest extends MethodCallBuilderTest {

diff --git a/...sl/src/main/java/us/abstracta/jmeter/javadsl/core/threadgroups/DslDefaultThreadGroup.java b/...sl/src/main/java/us/abstracta/jmeter/javadsl/core/threadgroups/DslDefaultThreadGroup.java
@@ -285,11 +285,11 @@ public DslDefaultThreadGroup holdIterating(String iterations) {
   }
 
   private void checkIterationsPreConditions() {
-    if (!(stages.size() == 1 && !ZERO.equals(stages.get(0).threadCount())
-        || stages.size() == 2 && ZERO.equals(stages.get(0).threadCount())
-        && !ZERO.equals(stages.get(1).threadCount()))) {
-      throw new IllegalStateException(
-          "Holding for iterations is only supported after initial hold and ramp, or ramp.");
+    boolean isJustRamp = stages.size() == 1 && !ZERO.equals(stages.get(0).threadCount());
+    boolean isJustDelayAndRamp = stages.size() == 2 && ZERO.equals(stages.get(0).threadCount()) && !ZERO.equals(stages.get(1).threadCount());
+
+    if (!(isJustRamp || isJustDelayAndRamp)) {
+      throw new IllegalStateException("Holding for iterations is only supported after initial hold and ramp, or ramp.");
     }
     if (ZERO.equals(getLastStage().threadCount())) {
       throw new IllegalStateException("Can't hold for iterations with no threads.");