Refactoring Java tests: 1-5

mperor · mperor · commit 77142ec6770d · 2025-10-27T13:20:14.000+01:00
diff --git a/JavaReleases/src/test/java/pl/mperor/lab/java/Java1.java b/JavaReleases/src/test/java/pl/mperor/lab/java/Java1.java
@@ -55,7 +55,7 @@ public void testJavaBean() throws IOException, ClassNotFoundException {
     }
 
     private void assertJavaBeanSerializationAndDeserialization(JavaBean bean) throws IOException, ClassNotFoundException {
-        var file = new File("src/test/resources/bean");
+        var file = new File("src/test/resources/bean.bin");
         try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(file))) {
             out.writeObject(bean);
         }
@@ -107,13 +107,13 @@ public void testRemoteMethodInvocationAkaRMI() throws RemoteException, NotBoundE
         HelloService stub = (HelloService) registry.lookup("HelloService");
 
         // Call the remote method and verify the result
-        Assertions.assertEquals("Hello World!", stub.sayHello());
+        Assertions.assertEquals("Hello World!", stub.getMessage());
 
         executor.shutdown();
     }
 
     interface HelloService extends Remote {
-        String sayHello() throws RemoteException;
+        String getMessage() throws RemoteException;
     }
 
     static class HelloServiceImpl extends UnicastRemoteObject implements HelloService {
@@ -122,7 +122,7 @@ protected HelloServiceImpl() throws RemoteException {
         }
 
         @Override
-        public String sayHello() throws RemoteException {
+        public String getMessage() throws RemoteException {
             return "Hello World!";
         }
     }
diff --git a/JavaReleases/src/test/java/pl/mperor/lab/java/Java3.java b/JavaReleases/src/test/java/pl/mperor/lab/java/Java3.java
@@ -27,14 +27,14 @@ public void testJavaNamingAndDirectoryInterfaceAkaJNDILookup() throws NamingExce
         String bindingName = "hello";
         String bindingResult = "Hello World!";
 
-        Context context = new InitialContext();
-        context.bind(bindingName, bindingResult);
-        String lookupResult = (String) context.lookup(bindingName);
+        Context ctx = new InitialContext();
+        ctx.bind(bindingName, bindingResult);
+        String lookupResult = (String) ctx.lookup(bindingName);
         Assertions.assertEquals(bindingResult, lookupResult);
 
-        context.unbind(bindingName);
+        ctx.unbind(bindingName);
         Assertions.assertThrows(NamingException.class, () -> {
-            context.lookup(bindingName);
+            ctx.lookup(bindingName);
         });
     }
 
diff --git a/JavaReleases/src/test/java/pl/mperor/lab/java/Java4.java b/JavaReleases/src/test/java/pl/mperor/lab/java/Java4.java
@@ -12,7 +12,6 @@
 import java.nio.channels.SocketChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
@@ -35,7 +34,7 @@ public void testAssertionKeyWord() {
 
     @Test
     public void testNewInputOutputAkaNIO() throws IOException {
-        Path path = Paths.get("src", "test", "resources", "nio.txt");
+        Path path = Path.of("src", "test", "resources", "nio.txt");
         byte[] fileBytes = Files.readAllBytes(path);
         String content = new String(fileBytes);
         Assertions.assertEquals("Hello NIO!", content);
@@ -44,12 +43,12 @@ public void testNewInputOutputAkaNIO() throws IOException {
     @Test
     public void testRegex() {
         Pattern pattern = Pattern.compile("<title>(.*)</title>", Pattern.DOTALL);
-        Matcher matcher = pattern.matcher(getTestHtml());
+        Matcher matcher = pattern.matcher(createTestHtml());
         Assertions.assertTrue(matcher.find());
         Assertions.assertEquals("Title", matcher.group(1));
     }
 
-    private String getTestHtml() {
+    private String createTestHtml() {
         return """
                 <!DOCTYPE html>
                     <html lang="en">
@@ -89,6 +88,7 @@ public void testImageIO() throws IOException {
         BufferedImage image = ImageIO.read(new File("src/test/resources/imageio.png"));
         Assertions.assertTrue(ImageIO.write(image, "jpg", File.createTempFile("imageio", ".jpg")));
     }
+
     @Test
     public void testServerClientSocketChannel() throws IOException, InterruptedException {
         int port = 8004;
@@ -124,5 +124,4 @@ private void handleConnectedClient(ServerSocket serverSocket) throws IOException
         }
     }
 
-
 }
diff --git a/JavaReleases/src/test/java/pl/mperor/lab/java/Java5.java b/JavaReleases/src/test/java/pl/mperor/lab/java/Java5.java
@@ -31,7 +31,7 @@ public void testGenerics() {
         Box rawBox = new Box();
         rawBox.setContent("Hello").setContent(1);
         Assertions.assertThrows(ClassCastException.class, () -> {
-            String rawBoxContent = (String) rawBox.getContent();
+            String wrongTypeContent = (String) rawBox.getContent();
         });
         Integer rawBoxContent = (Integer) rawBox.getContent();
         Assertions.assertEquals(1, rawBoxContent);
diff --git a/JavaReleases/src/test/resources/bean.bin b/JavaReleases/src/test/resources/bean.bin

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void testJavaBean() throws IOException, ClassNotFoundException {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`private void assertJavaBeanSerializationAndDeserialization(JavaBean bean) throws IOException, ClassNotFoundException {`
`58`		`- var file = new File("src/test/resources/bean");`
	`58`	`+ var file = new File("src/test/resources/bean.bin");`
`59`	`59`	`try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(file))) {`
`60`	`60`	`out.writeObject(bean);`
`61`	`61`	`}`
`@@ -107,13 +107,13 @@ public void testRemoteMethodInvocationAkaRMI() throws RemoteException, NotBoundE`
`107`	`107`	`HelloService stub = (HelloService) registry.lookup("HelloService");`
`108`	`108`
`109`	`109`	`// Call the remote method and verify the result`
`110`		`- Assertions.assertEquals("Hello World!", stub.sayHello());`
	`110`	`+ Assertions.assertEquals("Hello World!", stub.getMessage());`
`111`	`111`
`112`	`112`	`executor.shutdown();`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`interface HelloService extends Remote {`
`116`		`- String sayHello() throws RemoteException;`
	`116`	`+ String getMessage() throws RemoteException;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`static class HelloServiceImpl extends UnicastRemoteObject implements HelloService {`
`@@ -122,7 +122,7 @@ protected HelloServiceImpl() throws RemoteException {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`
`125`		`- public String sayHello() throws RemoteException {`
	`125`	`+ public String getMessage() throws RemoteException {`
`126`	`126`	`return "Hello World!";`
`127`	`127`	`}`
`128`	`128`	`}`