Stop the container in the shutdown method (#1525)

* How flaky is this test?
* stop the server

Author: elharo

maven-resolver-transport-minio/src/test/java/org/eclipse/aether/transport/minio/MinioTransporterIT.java

@@ -39,7 +39,6 @@
 import org.eclipse.aether.util.FileUtils;
 import org.eclipse.aether.util.repository.AuthenticationBuilder;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MinIOContainer;
@@ -62,7 +61,6 @@ class MinioTransporterIT {
     private MinIOContainer minioContainer;
     private MinioClient minioClient;
     private RepositorySystemSession session;
-    private RemoteRepository repository;
     private ObjectNameMapperFactory objectNameMapperFactory;
 
     @BeforeEach
@@ -87,13 +85,12 @@ void startSuite() throws Exception {
         }
 
         session = new DefaultRepositorySystemSession(h -> true);
-        repository = newRepo(RepositoryAuth.WITH);
         objectNameMapperFactory = new RepositoryIdObjectNameMapperFactory();
     }
 
     @AfterEach
-    public void stopSuite() {
-        minioContainer.start();
+    void stopSuite() {
+        minioContainer.stop();
     }
 
     enum RepositoryAuth {
@@ -120,19 +117,17 @@ protected RemoteRepository newRepo(RepositoryAuth auth) {
     }
 
     @Test
-    void peekWithoutAuth() {
+    void peekWithoutAuth() throws NoTransporterException {
         try {
             new MinioTransporter(session, newRepo(RepositoryAuth.WITHOUT), objectNameMapperFactory);
             fail("Should throw");
-        } catch (NoTransporterException e) {
-            fail("Should not throw this");
         } catch (IllegalStateException e) {
             assertTrue(e.getMessage().contains("No accessKey and/or secretKey provided"));
         }
     }
 
     @Test
-    void peekWithWrongAuth() throws Exception {
+    void peekWithWrongAuth() throws NoTransporterException {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WRONG), objectNameMapperFactory)) {
             try {
@@ -146,7 +141,7 @@ void peekWithWrongAuth() throws Exception {
     }
 
     @Test
-    void peekNonexistent() throws Exception {
+    void peekNonexistent() throws NoTransporterException {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
             try {
@@ -163,16 +158,13 @@ void peekNonexistent() throws Exception {
     void peekExistent() throws Exception {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
-            try {
-                transporter.peek(new PeekTask(URI.create(OBJECT_NAME)));
-            } catch (Exception e) {
-                Assertions.fail("Should not throw");
-            }
+            transporter.peek(new PeekTask(URI.create(OBJECT_NAME)));
+            // Should not throw
         }
     }
 
     @Test
-    void getNonexistent() throws Exception {
+    void getNonexistent() throws NoTransporterException {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
             try {
@@ -189,50 +181,38 @@ void getNonexistent() throws Exception {
     void getExistent() throws Exception {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
-            try {
-                GetTask task = new GetTask(URI.create(OBJECT_NAME));
-                transporter.get(task);
-                assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
-            } catch (Exception e) {
-                Assertions.fail("Should not throw");
-            }
+            GetTask task = new GetTask(URI.create(OBJECT_NAME));
+            transporter.get(task);
+            assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
         }
     }
 
     @Test
     void putNonexistent() throws Exception {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
-            try {
-                URI uri = URI.create("test");
-                transporter.put(new PutTask(uri).setDataBytes(OBJECT_CONTENT.getBytes(StandardCharsets.UTF_8)));
-                GetTask task = new GetTask(uri);
-                transporter.get(task);
-                assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
-            } catch (Exception e) {
-                Assertions.fail("Should not throw");
-            }
+            URI uri = URI.create("test");
+            transporter.put(new PutTask(uri).setDataBytes(OBJECT_CONTENT.getBytes(StandardCharsets.UTF_8)));
+            GetTask task = new GetTask(uri);
+            transporter.get(task);
+            assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
         }
     }
 
     @Test
     void putExistent() throws Exception {
         try (MinioTransporter transporter =
                 new MinioTransporter(session, newRepo(RepositoryAuth.WITH), objectNameMapperFactory)) {
-            try {
-                URI uri = URI.create(OBJECT_NAME);
-                GetTask task = new GetTask(uri);
-                transporter.get(task);
-                assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
-
-                String altContent = "altContent";
-                transporter.put(new PutTask(uri).setDataBytes(altContent.getBytes(StandardCharsets.UTF_8)));
-                task = new GetTask(uri);
-                transporter.get(task);
-                assertEquals(altContent, new String(task.getDataBytes(), StandardCharsets.UTF_8));
-            } catch (Exception e) {
-                Assertions.fail("Should not throw");
-            }
+            URI uri = URI.create(OBJECT_NAME);
+            GetTask task = new GetTask(uri);
+            transporter.get(task);
+            assertEquals(OBJECT_CONTENT, new String(task.getDataBytes(), StandardCharsets.UTF_8));
+
+            String altContent = "altContent";
+            transporter.put(new PutTask(uri).setDataBytes(altContent.getBytes(StandardCharsets.UTF_8)));
+            task = new GetTask(uri);
+            transporter.get(task);
+            assertEquals(altContent, new String(task.getDataBytes(), StandardCharsets.UTF_8));
         }
     }
 }