From 2b9d5169227374bf8d534a14a1386f0eb99580d9 Mon Sep 17 00:00:00 2001
From: Elvys Soares <eas5@cin.ufpe.br>
Date: Thu, 8 Apr 2021 11:25:48 -0300
Subject: [PATCH] Refactored duplicated tests into a parameterized one (#5077)

* Added test parameters to avoid code duplication

Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>

* Added test parameters to avoid code duplication and updated JUnit to 5.7.1 version

Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>
---
 build.gradle                     |  6 +++---
 tests/src/test/java/IOTests.java | 31 +++++++++++--------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47955e9392..0017d58727 100644
--- a/build.gradle
+++ b/build.gradle
@@ -416,10 +416,10 @@ project(":tests"){
 
     dependencies{
         testImplementation project(":core")
-        testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
     test{
diff --git a/tests/src/test/java/IOTests.java b/tests/src/test/java/IOTests.java
index e44270e9c2..d10774439a 100644
--- a/tests/src/test/java/IOTests.java
+++ b/tests/src/test/java/IOTests.java
@@ -3,6 +3,8 @@ import arc.util.io.*;
 import mindustry.game.*;
 import mindustry.io.*;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.params.*;
+import org.junit.jupiter.params.provider.*;
 
 import java.nio.*;
 
@@ -10,28 +12,17 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class IOTests{
 
-    @Test
-    void writeEnglish(){
+    @ParameterizedTest
+    @NullSource
+    @ValueSource(strings = {
+        "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234",
+        "这个服务器可以用自己的语言说话"
+    })
+    void writeStringTest(String string){
         ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234");
+        TypeIO.writeString(buffer, string);
         buffer.position(0);
-        assertEquals(TypeIO.readString(buffer), "asd asd asd asd asdagagasasjakbgeah;jwrej 23424234");
-    }
-
-    @Test
-    void writeChinese(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, "这个服务器可以用自己的语言说话");
-        buffer.position(0);
-        assertEquals(TypeIO.readString(buffer), "这个服务器可以用自己的语言说话");
-    }
-
-    @Test
-    void writeNull(){
-        ByteBuffer buffer = ByteBuffer.allocate(500);
-        TypeIO.writeString(buffer, null);
-        buffer.position(0);
-        assertNull(TypeIO.readString(buffer));
+        assertEquals(TypeIO.readString(buffer), string);
     }
 
     @Test