refactor: update tests to use JUnit 5

Author: kunstmusik

application/pom.xml

@@ -106,7 +106,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <all.clusters>${all.clusters}</all.clusters>

blue-clojure/pom.xml

@@ -31,6 +31,15 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.config.file>${project.basedir}/src/test/resources/logging.properties</java.util.logging.config.file>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
@@ -187,8 +196,7 @@
         </dependency>-->
         <dependency>
             <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-libs-junit4</artifactId>
-            <version>${netbeans.version}</version>
+            <artifactId>org-netbeans-libs-junit5</artifactId>
             <scope>test</scope>
         </dependency>
 

blue-clojure/src/test/java/blue/clojure/BlueClojureEngineTest.java

@@ -22,14 +22,17 @@
 import blue.projects.BlueProjectManager;
 import java.util.HashMap;
 import javax.script.ScriptException;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 /**
  *
  * @author stevenyi
  */
-public class BlueClojureEngineTest {
+@Execution(ExecutionMode.SAME_THREAD)
+class BlueClojureEngineTest {
 
     public BlueClojureEngineTest() {
     }
@@ -50,7 +53,7 @@ public BlueClojureEngineTest() {
      * Test of getInstance method, of class BlueClojureEngine.
      */
     @Test
-    public void testGetInstance() {
+    void testGetInstance() {
         BlueClojureEngine expResult = BlueClojureEngine.getInstance();
         BlueClojureEngine result = BlueClojureEngine.getInstance();
         assertEquals(expResult, result);
@@ -71,7 +74,7 @@ public void testGetInstance() {
      * Test of processScript method, of class BlueClojureEngine.
      */
     @Test
-    public void testProcessScript() {
+    void testProcessScript() {
         System.out.println("processScript");
         String code = "(def score \"i1 0 2\")";
         HashMap<String, ? extends Object> values = null;

blue-clojure/src/test/java/blue/clojure/project/ClojureProjectDataTest.java

@@ -19,40 +19,36 @@
  */
 package blue.clojure.project;
 
-import electric.xml.Element;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import javafx.collections.ObservableList;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  * @author stevenyi
  */
-public class ClojureProjectDataTest {
+class ClojureProjectDataTest {
 
     public ClojureProjectDataTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() {
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
     }
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
     }
 
     /**
@@ -72,7 +68,7 @@ public void tearDown() {
      * Test of getPomegranateString method, of class ClojureProjectData.
      */
     @Test
-    public void testGetPomegranateString() {
+    void testGetPomegranateString() {
         ClojureProjectData instance = new ClojureProjectData();
 
         assertEquals(null, instance.getPomegranateString());

blue-clojure/src/test/java/blue/clojure/soundObject/ClojureSoundObjectTest.java

@@ -24,14 +24,14 @@
 import blue.time.TimeContext;
 import electric.xml.Element;
 import java.util.Map;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  * @author stevenyi
  */
-public class ClojureSoundObjectTest {
+class ClojureSoundObjectTest {
 
     public ClojureSoundObjectTest() {
     }
@@ -40,7 +40,7 @@ public ClojureSoundObjectTest() {
      * Test of generateForCSD method, of class ClojureObject.
      */
     @Test
-    public void testGenerateForCSD() throws Exception {
+    void testGenerateForCSD() throws Exception {
         CompileData compileData = null;
         float startTime = 0.0F;
         float endTime = 2.0F;
@@ -56,7 +56,7 @@ public void testGenerateForCSD() throws Exception {
      * Test of saveAsXML method, of class ClojureObject.
      */
     @Test
-    public void testSaveAsXML() throws Exception {
+    void testSaveAsXML() throws Exception {
         System.out.println("saveAsXML");
         Map<Object, String> objRefMap = null;
         TimeContext context = new TimeContext();

blue-clojure/src/test/resources/logging.properties

@@ -0,0 +1,3 @@
+# Keep test logging defaults while suppressing known NetBeans module-system noise in unit tests.
+.level=INFO
+org.netbeans.modules.settings.RecognizeInstanceObjects$MSL.level=SEVERE

blue-core/pom.xml

@@ -111,8 +111,7 @@
 
         <dependency>
             <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-libs-junit4</artifactId>
-            <version>${netbeans.version}</version>
+            <artifactId>org-netbeans-libs-junit5</artifactId>
             <scope>test</scope>
         </dependency>
 

blue-core/src/test/java/blue/BlueDataTest.java

@@ -1,21 +1,21 @@
 package blue;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import org.junit.jupiter.api.Test;
 
-public class BlueDataTest {
+class BlueDataTest {
 
     @Test
-    public void testTimeContextReflectsProjectPropertiesSampleRate() {
+    void testTimeContextReflectsProjectPropertiesSampleRate() {
         BlueData data = new BlueData();
         data.getProjectProperties().setSampleRate("48000");
 
         assertEquals(48000L, data.getScore().getTimeContext().getSampleRate());
     }
 
     @Test
-    public void testSetProjectPropertiesWiresTimeContext() {
+    void testSetProjectPropertiesWiresTimeContext() {
         BlueData data = new BlueData();
         ProjectProperties properties = new ProjectProperties();
         properties.setSampleRate("96000");
@@ -27,13 +27,13 @@ public void testSetProjectPropertiesWiresTimeContext() {
     }
 
     @Test
-    public void testTimeContextDefaultSampleRate() {
+    void testTimeContextDefaultSampleRate() {
         BlueData data = new BlueData();
         assertEquals(44100L, data.getScore().getTimeContext().getSampleRate());
     }
 
     @Test
-    public void testOldProjectPropertiesNoLongerDrivesTimeContextAfterReplacement() {
+    void testOldProjectPropertiesNoLongerDrivesTimeContextAfterReplacement() {
         BlueData data = new BlueData();
         ProjectProperties oldProps = data.getProjectProperties();
 

blue-core/src/test/java/blue/LiveDataTest.java

@@ -10,19 +10,17 @@
 import blue.blueLive.LiveObjectBins;
 import blue.soundObject.GenericScore;
 import electric.xml.Element;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  * @author steven
  */
-public class LiveDataTest extends TestCase {
+class LiveDataTest {
 
-    public LiveDataTest(String testName) {
-        super(testName);
-    }
-
-    public void testSerialization() {
+    @Test
+    void testSerialization() {
         LiveData liveData = new LiveData();
         final LiveObjectBins liveObjectBins = liveData.getLiveObjectBins();
 

blue-core/src/test/java/blue/ProjectPropertiesTest.java

@@ -1,29 +1,29 @@
 package blue;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ProjectPropertiesTest {
+class ProjectPropertiesTest {
 
     @Test
-    public void testDefaultSampleRate() {
+    void testDefaultSampleRate() {
         ProjectProperties props = new ProjectProperties();
         assertEquals("44100", props.getSampleRate());
     }
 
     @Test
-    public void testSetSampleRateUpdatesValue() {
+    void testSetSampleRateUpdatesValue() {
         ProjectProperties props = new ProjectProperties();
         props.setSampleRate("48000");
         assertEquals("48000", props.getSampleRate());
     }
 
     @Test
-    public void testSetSampleRateFiresPropertyChangeEvent() {
+    void testSetSampleRateFiresPropertyChangeEvent() {
         ProjectProperties props = new ProjectProperties();
         List<PropertyChangeEvent> events = new ArrayList<>();
         props.addPropertyChangeListener(events::add);
@@ -38,7 +38,7 @@ public void testSetSampleRateFiresPropertyChangeEvent() {
     }
 
     @Test
-    public void testSetSampleRateDoesNotFireEventWhenValueUnchanged() {
+    void testSetSampleRateDoesNotFireEventWhenValueUnchanged() {
         // PropertyChangeSupport suppresses events when old value equals new value
         ProjectProperties props = new ProjectProperties();
         List<PropertyChangeEvent> events = new ArrayList<>();
@@ -50,7 +50,7 @@ public void testSetSampleRateDoesNotFireEventWhenValueUnchanged() {
     }
 
     @Test
-    public void testRemovePropertyChangeListenerStopsEvents() {
+    void testRemovePropertyChangeListenerStopsEvents() {
         ProjectProperties props = new ProjectProperties();
         List<PropertyChangeEvent> events = new ArrayList<>();
         PropertyChangeListener listener = events::add;
@@ -65,7 +65,7 @@ public void testRemovePropertyChangeListenerStopsEvents() {
     }
 
     @Test
-    public void testCopyConstructorCopiesSampleRate() {
+    void testCopyConstructorCopiesSampleRate() {
         ProjectProperties original = new ProjectProperties();
         original.setSampleRate("88200");
 
@@ -74,7 +74,7 @@ public void testCopyConstructorCopiesSampleRate() {
     }
 
     @Test
-    public void testCopyConstructorListenersAreIndependent() {
+    void testCopyConstructorListenersAreIndependent() {
         ProjectProperties original = new ProjectProperties();
         original.setSampleRate("48000");