(aries-rsa) 01/03: Fix TCP provider test isolation

[amichai]

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

amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git

commit 7fc6d5eaa1d4dfcfb8e70371206e296cb40e3f28
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Mon Jun 30 14:54:31 2025 +0300

    Fix TCP provider test isolation
---
 .../aries/rsa/provider/tcp/TcpProviderTest.java    | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git 
a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
 
b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
index 5b03c528..02aa4cfd 100644
--- 
a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
+++ 
b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java
@@ -49,9 +49,9 @@ import 
org.apache.aries.rsa.provider.tcp.myservice.MyServiceImpl;
 import org.apache.aries.rsa.spi.Endpoint;
 import org.apache.aries.rsa.util.EndpointHelper;
 import org.easymock.EasyMock;
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceException;
@@ -63,10 +63,11 @@ public class TcpProviderTest {
 
     private static final int TIMEOUT = 200;
     private static final int NUM_CALLS = 100;
-    private static MyService myServiceProxy;
-    private static MyService myServiceProxy2;
-    private static Endpoint ep;
-    private static Endpoint ep2;
+
+    private MyService myServiceProxy;
+    private MyService myServiceProxy2;
+    private Endpoint ep;
+    private Endpoint ep2;
 
     protected static int getFreePort() throws IOException {
         try (ServerSocket socket = new ServerSocket()) {
@@ -76,8 +77,8 @@ public class TcpProviderTest {
         }
     }
 
-    @BeforeClass
-    public static void createServerAndProxy() throws IOException {
+    @Before
+    public void createServerAndProxy() throws IOException {
         Class<?>[] exportedInterfaces = new Class[] {MyService.class};
         TcpProvider provider = new TcpProvider();
         Map<String, Object> props = new HashMap<>();
@@ -105,6 +106,13 @@ public class TcpProviderTest {
             ep2.description());
     }
 
+
+    @After
+    public void close() throws IOException {
+        ep.close();
+        ep2.close();
+    }
+
     @Test
     public void testCallTimeout() {
         try {
@@ -219,11 +227,6 @@ public class TcpProviderTest {
         }
     }
 
-    @AfterClass
-    public static void close() throws IOException {
-        ep.close();
-    }
-
     private void runPerfTest(final MyService myServiceProxy2) throws 
InterruptedException {
         StringBuilder msg = new StringBuilder();
         for (int c = 0; c < 1000; c++) {