improve getUrl method for proxy + tests

groupe-edf · Jul 28, 2021 · a90bdcf · a90bdcf
1 parent 5a65cfc
commit a90bdcf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/fr/edf/nexus/plugins/repository/dart/internal/DartProxyFacetImpl.java b/src/main/java/fr/edf/nexus/plugins/repository/dart/internal/DartProxyFacetImpl.java
@@ -103,7 +103,7 @@ protected String getUrl(Context context) {
         if (!params.isEmpty()) {
             builder.append('?');
             params.forEach(p -> builder.append(p.getKey()).append('=').append(p.getValue()).append('&'));
-            builder.substring(0, builder.lastIndexOf("&"));
+            builder.deleteCharAt(builder.lastIndexOf("&"));
         }
         return builder.toString();
     }

diff --git a/src/test/java/fr/edf/nexus/plugins/repository/dart/internal/DartProxyFacetImplTest.java b/src/test/java/fr/edf/nexus/plugins/repository/dart/internal/DartProxyFacetImplTest.java
@@ -28,6 +28,7 @@
 import org.sonatype.nexus.repository.storage.StorageTx;
 import org.sonatype.nexus.repository.view.Content;
 import org.sonatype.nexus.repository.view.Context;
+import org.sonatype.nexus.repository.view.Parameters;
 import org.sonatype.nexus.repository.view.Payload;
 import org.sonatype.nexus.repository.view.Request;
 import org.sonatype.nexus.repository.view.Response;
@@ -263,4 +264,26 @@ public void checkPathWithoutSlashTest() throws Exception {
 
         assertThat(result.equals(PACKAGES_PATH), is(true));
     }
+
+    @Test
+    public void getUrlTestWithoutParams() {
+        when(request.getPath()).thenReturn("/" + PACKAGES_PATH);
+        when(request.getParameters()).thenReturn(new Parameters());
+
+        String result = underTest.getUrl(context);
+
+        assertThat(result.equals(PACKAGES_PATH), is(true));
+    }
+
+    @Test
+    public void getUrlTestWithParams() {
+        when(request.getPath()).thenReturn("/" + PACKAGES_PATH);
+        Parameters params = new Parameters();
+        params.set("page", "1");
+        when(request.getParameters()).thenReturn(params);
+
+        String result = underTest.getUrl(context);
+
+        assertThat(result.equals(PACKAGES_PATH + "?page=1"), is(true));
+    }
 }