Updated unit tests.

Author: swesteme

pom.xml

@@ -84,6 +84,12 @@
             <version>${junit.junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <pluginManagement>

src/test/java/de/westemeyer/plugins/multiselect/MultiselectDecisionItemTest.java

@@ -1,8 +1,15 @@
 package de.westemeyer.plugins.multiselect;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayDeque;
+import java.util.Collections;
+import java.util.Queue;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
 class MultiselectDecisionItemTest {
     /** Input to be used in tests. */
     private static final MultiselectDecisionTree INPUT = MultiselectDecisionTree.parse("H,Type,Sport,Country,Team\nV,SELECTED_TYPE,SELECTED_SPORT,SELECTED_COUNTRY,SELECTED_TEAM\nC,Water,Wakeboarding,Germany,WSC Duisburg Rheinhausen\nC,Water,Wakeboarding,Germany,WSC Paderborn\nC,Water,Wakeboarding,Austria,WSC Wien\nT,,,,Alternative team name\nC,Water,Waterball,Germany,Waterball Team\nC,Water,Surfing,England,Bristol Surf Team\nC,Ball,Football,France,Paris St. Germain\nT,,,,Alternative team name\nC,Ball,Handball,Germany,THW Kiel\n");
@@ -17,71 +24,90 @@ class MultiselectDecisionItemTest {
     private static final String NEW_VALUE = "New value";
 
     @Test
-    void getDisplayLabel() throws Exception {
+    void getDisplayLabel() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 1, 0, 0);
-        Assertions.assertEquals(ALTERNATIVE_TEAM_NAME, item.getDisplayLabel());
+        assertEquals(ALTERNATIVE_TEAM_NAME, item.getDisplayLabel());
         item = INPUT.getItemByCoordinates(0, 0, 0, 0);
-        Assertions.assertEquals(WSC_DUISBURG_RHEINHAUSEN, item.getDisplayLabel());
+        assertEquals(WSC_DUISBURG_RHEINHAUSEN, item.getDisplayLabel());
+        item = new MultiselectDecisionItem(null, null, null);
+        assertNull(item.getDisplayLabel());
     }
 
     @Test
-    void getParent() throws Exception {
+    void getParent() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0);
         item = item.getParent();
-        Assertions.assertNotNull(item);
-        Assertions.assertNull(item.getParent());
+        assertNotNull(item);
+        assertNull(item.getParent());
+    }
+
+    @Test
+    void nvl() {
+        assertEquals("MultiselectDecisionItem{label='', value='null', children=[]}", new MultiselectDecisionItem(null, null, null).toString());
+        assertEquals("MultiselectDecisionItem{label='label', value='null', children=[]}", new MultiselectDecisionItem(null, "label", null).toString());
     }
 
     @Test
-    void isRoot() throws Exception {
+    void isRoot() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0);
-        Assertions.assertFalse(item.isRoot());
+        assertFalse(item.isRoot());
         item = item.getParent();
-        Assertions.assertTrue(item.isRoot());
+        assertTrue(item.isRoot());
     }
 
     @Test
-    void getChildren() throws Exception {
+    void getChildren() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0, 0);
         item = item.getChildren().get(0);
-        Assertions.assertEquals(0, item.getChildren().size());
+        assertEquals(0, item.getChildren().size());
     }
 
     @Test
-    void isLeaf() throws Exception {
+    void isLeaf() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0, 0);
-        Assertions.assertFalse(item.isLeaf());
+        assertFalse(item.isLeaf());
         item = item.getChildren().get(0);
-        Assertions.assertTrue(item.isLeaf());
+        assertTrue(item.isLeaf());
     }
 
     @Test
-    void getLabel() throws Exception {
+    void getLabel() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0, 0, 0);
-        Assertions.assertEquals("", item.getLabel());
+        assertEquals("", item.getLabel());
         item = INPUT.getItemByCoordinates(0, 1, 0, 0);
-        Assertions.assertEquals(ALTERNATIVE_TEAM_NAME, item.getLabel());
+        assertEquals(ALTERNATIVE_TEAM_NAME, item.getLabel());
     }
 
     @Test
-    void value() throws Exception {
+    void value() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0, 0, 0);
-        Assertions.assertEquals(WSC_DUISBURG_RHEINHAUSEN, item.getValue());
+        assertEquals(WSC_DUISBURG_RHEINHAUSEN, item.getValue());
         item.setValue(NEW_VALUE);
-        Assertions.assertEquals(NEW_VALUE, item.getValue());
+        assertEquals(NEW_VALUE, item.getValue());
     }
 
     @Test
-    void testToString() throws Exception {
+    void testToString() {
         MultiselectDecisionItem item = INPUT.getItemByCoordinates(0, 0, 0, 0);
-        Assertions.assertEquals("MultiselectDecisionItem{label='', value='WSC Duisburg Rheinhausen', children=[]}", item.toString());
+        assertEquals("MultiselectDecisionItem{label='', value='WSC Duisburg Rheinhausen', children=[]}", item.toString());
     }
 
     @Test
     void testSetter() {
         MultiselectDecisionItem item = new MultiselectDecisionItem(null, "Hello", "Value");
-        Assertions.assertEquals("Hello", item.getLabel());
+        assertEquals("Hello", item.getLabel());
         item.setLabel("Hullo");
-        Assertions.assertEquals("Hullo", item.getLabel());
+        assertEquals("Hullo", item.getLabel());
+    }
+
+    @Test
+    void visitSubTree() throws Exception {
+        MultiselectDecisionItemVisitor visitor = (item, column) -> false;
+        MultiselectVariableDescriptor descriptor = new MultiselectVariableDescriptor("", "", 0);
+        Queue<MultiselectVariableDescriptor> descriptors = new ArrayDeque<>();
+        descriptors.add(descriptor);
+        MultiselectDecisionItem item = mock(MultiselectDecisionItem.class);
+        MultiselectDecisionItem.visitSubTree(visitor, Collections.singletonList(item), descriptors);
+        verify(item, times(0)).visitSubTree(any(), any());
     }
 }

src/test/java/de/westemeyer/plugins/multiselect/MultiselectDecisionTreeTest.java

@@ -3,7 +3,6 @@
 import de.westemeyer.plugins.multiselect.parser.ConfigSerialization;
 import de.westemeyer.plugins.multiselect.parser.CsvWriter;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -17,6 +16,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class MultiselectDecisionTreeTest {
     /** Csv input content for tests. */
     private static final String INPUT_CSV = "H,Type,Sport,Country,Team\nV,SELECTED_TYPE,SELECTED_SPORT,SELECTED_COUNTRY,SELECTED_TEAM\nC,Water,Wakeboarding,Germany,WSC Duisburg Rheinhausen\nC,Water,Wakeboarding,Germany,WSC Paderborn\nC,Water,Wakeboarding,Austria,WSC Wien\nT,,,,Alternative team name\nC,Water,Waterball,Germany,Waterball Team\nC,Water,Surfing,England,Bristol Surf Team\nC,Ball,Football,France,Paris St. Germain\nT,,,,Alternative team name\nC,Ball,Handball,Germany,THW Kiel\n";
@@ -39,27 +41,27 @@ void resolveValues() {
         Map<String, Integer> selection = new HashMap<>();
 
         Map<String, String> properties = tree.resolveValues(selection);
-        Assertions.assertEquals(0, properties.size());
+        assertEquals(0, properties.size());
 
         selection.put("SELECTED_REPOSITORY", 0);
         properties = tree.resolveValues(selection);
-        Assertions.assertEquals(0, properties.size());
+        assertEquals(0, properties.size());
 
         selection.put(SELECTED_TYPE, 0);
         selection.put(SELECTED_SPORT, 0);
         selection.put(SELECTED_COUNTRY, 1);
         selection.put(SELECTED_TEAM, 1);
-        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> tree.resolveValues(selection));
+        assertThrows(IndexOutOfBoundsException.class, () -> tree.resolveValues(selection));
 
         selection.put(SELECTED_TEAM, 0);
         properties = tree.resolveValues(selection);
-        Assertions.assertEquals(4, properties.size());
-        Assertions.assertEquals("Water", properties.get(SELECTED_TYPE));
-        Assertions.assertEquals("Wakeboarding", properties.get(SELECTED_SPORT));
-        Assertions.assertEquals("Austria", properties.get(SELECTED_COUNTRY));
-        Assertions.assertEquals("WSC Wien", properties.get(SELECTED_TEAM));
+        assertEquals(4, properties.size());
+        assertEquals("Water", properties.get(SELECTED_TYPE));
+        assertEquals("Wakeboarding", properties.get(SELECTED_SPORT));
+        assertEquals("Austria", properties.get(SELECTED_COUNTRY));
+        assertEquals("WSC Wien", properties.get(SELECTED_TEAM));
 
-        Assertions.assertEquals(4, tree.getVariableDescriptions().size());
+        assertEquals(4, tree.getVariableDescriptions().size());
     }
 
     @Test
@@ -73,15 +75,22 @@ public void serialize(ConfigSerialization serialization, OutputStream outputStre
             }
         };
 
-        Assertions.assertEquals("", decisionTree.toString());
+        assertEquals("", decisionTree.toString());
     }
 
     @ParameterizedTest
     @CsvSource({"0,Water;Ball", "1,Wakeboarding;Waterball;Surfing", "2,Germany;Austria", "3,WSC Duisburg Rheinhausen;WSC Paderborn"})
     void initialValuesForColumn(int column, String values) {
         MultiselectDecisionTree tree = MultiselectDecisionTree.parse(INPUT_CSV);
         List<String> initialValuesForColumn = tree.getInitialValuesForColumn(column).stream().map(MultiselectDecisionItem::getValue).collect(Collectors.toList());
-        Assertions.assertEquals(Arrays.asList(values.split(";")), initialValuesForColumn);
+        assertEquals(Arrays.asList(values.split(";")), initialValuesForColumn);
+    }
+
+    @Test
+    void getInitialValuesForColumn() {
+        MultiselectDecisionTree tree = MultiselectDecisionTree.parse("");
+        List<MultiselectDecisionItem> initialValuesForColumn = tree.getInitialValuesForColumn(1);
+        assertEquals(0, initialValuesForColumn.size());
     }
 
     @Test
@@ -96,7 +105,7 @@ public List<MultiselectDecisionItem> getItemList() {
             }
         };
 
-        Assertions.assertEquals(0, decisionTree.getInitialValuesForColumn(0).size());
+        assertEquals(0, decisionTree.getInitialValuesForColumn(0).size());
     }
 
     @Test
@@ -109,7 +118,7 @@ void serializationRoundTripTest() throws Exception {
                 createItem("Very popular sport", "Wakeboard", createItem(null, "WSC Duisburg Rheinhausen"))));
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
             decisionTree.serialize(new CsvWriter(), outputStream);
-            Assertions.assertEquals("H,Sport,Team\n" +
+            assertEquals("H,Sport,Team\n" +
                     "V,SELECTED_SPORT,SELECTED_TEAM\n" +
                     "C,Tennis,Tennisclub Rumeln-Kaldenhausen e.V.\n" +
                     "T,,Alternative label\n" +

src/test/java/de/westemeyer/plugins/multiselect/parser/CsvParserTest.java

@@ -2,7 +2,6 @@
 
 import com.opencsv.CSVReader;
 import de.westemeyer.plugins.multiselect.MultiselectDecisionTree;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -13,6 +12,8 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 class CsvParserTest {
     /** First input csv for tests. */
     private static final String INPUT_CSV = "H,Type,Sport,Country,Team\nV,SELECTED_TYPE,SELECTED_SPORT,SELECTED_COUNTRY,SELECTED_TEAM\nC,Water,Wakeboarding,Germany,WSC Duisburg Rheinhausen\nC,Water,Wakeboarding,Germany,WSC Paderborn\nC,Water,Wakeboarding,Austria,WSC Wien\nT,,,,Alternative team name\nC,Water,Waterball,Germany,Waterball Team\nC,Water,Surfing,England,Bristol Surf Team\nC,Ball,Football,France,Paris St. Germain\nT,,,,Alternative team name\nC,Ball,Handball,Germany,THW Kiel\n";
@@ -32,7 +33,7 @@ class CsvParserTest {
     void testParser(String input) throws Exception {
         MultiselectDecisionTree decisionTree = getDecisionTree(input, true);
 
-        Assertions.assertEquals(input, decisionTree.toString());
+        assertEquals(input, decisionTree.toString());
     }
 
     @Test
@@ -48,7 +49,7 @@ void unknownRowType() throws Exception {
     @Test
     void invalidColumnCount() throws Exception {
         MultiselectDecisionTree decisionTree = getDecisionTree("H\nT\n", false);
-        Assertions.assertTrue(decisionTree.getVariableLabels().isEmpty());
+        assertTrue(decisionTree.getVariableLabels().isEmpty());
     }
 
     @Test
@@ -65,7 +66,15 @@ public void close() throws IOException {
                     };
                 }
             };
-            Assertions.assertDoesNotThrow(() -> csvParser.analyzeConfiguration(inputStream));
+            assertDoesNotThrow(() -> csvParser.analyzeConfiguration(inputStream));
+        }
+    }
+
+    @Test
+    void analyzeConfiguration() throws IOException {
+        try (ByteArrayInputStream inputStream = new ByteArrayInputStream("H,One\nV,VAR1,VAR2\n".getBytes())) {
+            MultiselectDecisionTree tree = new CsvParser().analyzeConfiguration(inputStream);
+            assertNull(tree.getVariableDescriptions().get(1).getLabel());
         }
     }
 
@@ -84,9 +93,9 @@ private MultiselectDecisionTree getDecisionTree(String input, boolean assertEqua
             // assert symmetrical parsing/serialising
             String csvOutput = byteArrayOutputStream.toString();
             if (assertEquality) {
-                Assertions.assertEquals(input, csvOutput);
+                assertEquals(input, csvOutput);
             } else {
-                Assertions.assertNotEquals(input, csvOutput);
+                assertNotEquals(input, csvOutput);
             }
         }
         return decisionTree;