(sling-org-apache-sling-launchpad-integration-tests) branch master updated: SLING-12719 - Remove dependency to junit-addons (#29)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b48fb2  SLING-12719 - Remove dependency to junit-addons (#29)
3b48fb2 is described below

commit 3b48fb2be44946f3d4916235377611426ea6cb0e
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Thu Mar 27 19:06:03 2025 +0100

    SLING-12719 - Remove dependency to junit-addons (#29)
---
 pom.xml                                            |  6 ----
 .../webapp/integrationtest/WebdavDeleteTest.java   | 38 ++++++++++------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 328f03d..52e5fc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,12 +233,6 @@
             <version>1.6</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>junit-addons</groupId>
-            <artifactId>junit-addons</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.base</artifactId>
diff --git 
a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
 
b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
index 296e604..a4f4cfb 100644
--- 
a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
+++ 
b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
@@ -24,8 +24,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import junitx.framework.Assert;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class WebdavDeleteTest extends HttpTestBase {
@@ -58,28 +58,24 @@ public class WebdavDeleteTest extends HttpTestBase {
     }
 
     @Test
-    public void testDelete() {
-        try {
-            testClient.delete(HTTP_BASE_URL + testDir + "/" + HANDLER_1);
-            testClient.delete(HTTP_BASE_URL + testDir + "/" + HANDLER_2);
-            testClient.delete(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER);
+    public void testDelete() throws IOException {
 
-            Assert.assertEquals(
-                    HttpServletResponse.SC_NOT_FOUND, 
testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1));
-            Assert.assertEquals(
-                    HttpServletResponse.SC_NOT_FOUND, 
testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2));
-            Assert.assertEquals(
-                    HttpServletResponse.SC_NOT_FOUND, 
testClient.get(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER));
+        testClient.delete(HTTP_BASE_URL + testDir + "/" + HANDLER_1);
+        testClient.delete(HTTP_BASE_URL + testDir + "/" + HANDLER_2);
+        testClient.delete(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER);
 
-            Assert.assertEquals(
-                    HttpServletResponse.SC_OK,
-                    testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1 + 
HANDLER_1_BKP + ".json"));
-            Assert.assertEquals(
-                    HttpServletResponse.SC_OK,
-                    testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2 + 
HANDLER_2_BKP + ".json"));
+        Assert.assertEquals(
+                HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL 
+ testDir + "/" + HANDLER_1));
+        Assert.assertEquals(
+                HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL 
+ testDir + "/" + HANDLER_2));
+        Assert.assertEquals(
+                HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL 
+ testDir + "/" + DEFAULT_HANDLER));
 
-        } catch (IOException e) {
-            Assert.fail(e);
-        }
+        Assert.assertEquals(
+                HttpServletResponse.SC_OK,
+                testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1 + 
HANDLER_1_BKP + ".json"));
+        Assert.assertEquals(
+                HttpServletResponse.SC_OK,
+                testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2 + 
HANDLER_2_BKP + ".json"));
     }
 }