Merge branch 'pr-67'

This closes #67
tupilabs · Oct 31, 2019 · 748ed46 · 748ed46
2 parents 960ebf9 + a25e4ac
commit 748ed46
Show file tree

Hide file tree

Showing 59 changed files with 208 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 .classpath
 .settings/
 target/
-test-output/
+test-output/
+.idea
diff --git a/pom.xml b/pom.xml
@@ -142,9 +142,8 @@
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                    <!--<consoleOutput>true</consoleOutput>-->
                     <enableRulesSummary>false</enableRulesSummary>
-                    <failOnViolation>false</failOnViolation>
-                    <failsOnError>false</failsOnError>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/main/java/org/tap4j/producer/TapProducerFactory.java b/src/main/java/org/tap4j/producer/TapProducerFactory.java
@@ -71,7 +71,7 @@ public static TapProducer makeTap13YamlProducer() {
     public static TapProducer makeTap13YamlProducer(DumperOptions options) {
         return new TapProducer(new Tap13Representer(options));
     }
-    
+
     /**
      * Create a TAP JUnit producer.
      *

diff --git a/src/test/java/org/tap4j/TestProduceConsume.java b/src/test/java/org/tap4j/TestProduceConsume.java
@@ -47,7 +47,7 @@
  * checks if the values are correct. For example, you create a test with a Test
  * Result with a String there. Then you use the consumer to read the tap file
  * created and check if the consumer can read the String. Voila.
- * 
+ *
  * @since 1.0
  */
 public class TestProduceConsume {
@@ -105,16 +105,16 @@ public void setUp() {
     @Test
     public void testTapProducerConsumer() {
         assertTrue(testSet.getTapLines().size() > 0);
-        
+
         // testProducer
         try {
             tapProducer.dump(testSet, tempFile);
         } catch (Exception e) {
             fail("Failed to print TAP Stream into file.");
         }
-        
+
         // testConsumer
-        { 
+        {
             TestSet testSet = tapConsumer.load(tempFile);
             assertNotNull(testSet.getHeader());
             assertNotNull(testSet.getPlan());

diff --git a/src/test/java/org/tap4j/consumer/TestTap13Consumer.java b/src/test/java/org/tap4j/consumer/TestTap13Consumer.java
@@ -47,10 +47,10 @@ public class TestTap13Consumer extends BaseTapTest {// NOPMD
     public void testConsumerPlanskipall() {
         final TestSet testSet = getTestSet("/org/tap4j/consumer/comment_planskipall.tap");
         assertTrue(testSet.getNumberOfTestResults() == 0);
-        
+
         final Footer footer = testSet.getFooter();
         assertNull(footer);
-        
+
         final SkipPlan skip = testSet.getPlan().getSkip();
         assertNotNull(skip);
         assertTrue(skip.getReason().equals("Not implemented yet."));

diff --git a/src/test/java/org/tap4j/consumer/issue3311330/package-info.java b/src/test/java/org/tap4j/consumer/issue3311330/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3311330.
+ *
+ */
+package org.tap4j.consumer.issue3311330;
diff --git a/src/test/java/org/tap4j/consumer/issue3504508/package-info.java b/src/test/java/org/tap4j/consumer/issue3504508/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3504508.
+ *
+ */
+package org.tap4j.consumer.issue3504508;
diff --git a/src/test/java/org/tap4j/consumer/package-info.java b/src/test/java/org/tap4j/consumer/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Tests for TAP Consumer.
+ */
+package org.tap4j.consumer;
diff --git a/src/test/java/org/tap4j/consumer/subtestOrder/package-info.java b/src/test/java/org/tap4j/consumer/subtestOrder/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Tests for correct subtests order.
+ */
+package org.tap4j.consumer.subtestOrder;
diff --git a/src/test/java/org/tap4j/model/TapElementFactoryTest.java b/src/test/java/org/tap4j/model/TapElementFactoryTest.java
@@ -161,5 +161,5 @@ public void testComment() {
         comment = (Comment) TapElementFactory.createTapElement("  #one two");
         assertEquals(2, comment.getIndentation());
         assertEquals("one two", comment.getText());
-    }    
+    }
 }
diff --git a/src/test/java/org/tap4j/model/TestTAPFooter.java b/src/test/java/org/tap4j/model/TestTAPFooter.java
@@ -31,7 +31,7 @@
 
 /**
  * Tests TAP Footer.
- * 
+ *
  * @since 1.0
  */
 public class TestTAPFooter {
@@ -58,7 +58,7 @@ public void testFooterWithComment() {
         footer.setComment(new Comment("Footer's comment."));
         assertNotNull(this.footer.getComment());
         assertEquals(this.footer.getComment().getText(),
-                            "Footer's comment.");
+                "Footer's comment.");
     }
 
 }
diff --git a/src/test/java/org/tap4j/model/TestTestSet.java b/src/test/java/org/tap4j/model/TestTestSet.java
@@ -79,17 +79,17 @@ public void testTestSet() {
         assertTrue(this.testSet.getComments().size() == 1);
         assertTrue(this.testSet.getNumberOfComments() == 1);
         assertTrue(this.testSet.getNumberOfTapLines() == this.testSet
-            .getTapLines().size());
+                .getTapLines().size());
         assertTrue(this.testSet.getNumberOfTapLines() == 4);
         assertTrue(this.testSet.getNumberOfTestResults() == this.testSet
-            .getTestResults().size());
+                .getTestResults().size());
         assertTrue(this.testSet.getNumberOfTestResults() == 1);
         assertTrue(this.testSet.getNextTestNumber() == 2);
         assertTrue(this.testSet.hasBailOut());
         assertTrue(this.testSet.getBailOuts().size() == 1);
         assertTrue(this.testSet.getNumberOfBailOuts() == 1);
         assertNotNull(this.testSet.getFooter());
-        
+
         // intrusive tests
         {
             this.testSet.removeBailOut(bailOut);
@@ -154,7 +154,7 @@ public void testWithOnlyNotOkTestResults() {
         assertTrue(testSet.containsNotOk());
         assertFalse(testSet.containsOk());
     }
-    
+
     @Test
     public void testEmptyTestSet() {
         final TestSet testSet = new TestSet();

diff --git a/src/test/java/org/tap4j/model/package-info.java b/src/test/java/org/tap4j/model/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Tests for TAP models.
+ */
+package org.tap4j.model;
diff --git a/src/test/java/org/tap4j/package-info.java b/src/test/java/org/tap4j/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Root test package.
+ */
+package org.tap4j;
diff --git a/src/test/java/org/tap4j/parser/TestConstants.java b/src/test/java/org/tap4j/parser/TestConstants.java
@@ -44,5 +44,5 @@ public void testUtilConstructor() throws IllegalArgumentException, Instantiation
         final Object o = c.newInstance((Object[]) null);
         assertNotNull(o);
     }
-    
+
 }
diff --git a/src/test/java/org/tap4j/parser/TestMemento.java b/src/test/java/org/tap4j/parser/TestMemento.java
@@ -39,12 +39,12 @@
 public class TestMemento {
 
     private static StreamStatus memento = null;
-    
+
     @BeforeClass
     public static void setUp() {
         memento = new StreamStatus();
     }
-    
+
     @Test
     public void testMemento() {
         assertTrue(memento.isFirstLine());
@@ -54,21 +54,21 @@ public void testMemento() {
         assertEquals(0, memento.getIndentationLevel());
         assertFalse(memento.isInYaml());
         assertTrue(memento.getDiagnosticBuffer().toString().length() == 0);
-        
+
         int baseIndentationLevel = 50;
         boolean currentlyInYaml = true;
         boolean firstLine = false;
         String lastLine = "nani";
         TapElement lastParsedElement = new Text("nani nani");
         boolean planBeforeTestResult = true;
-        
+
         memento.setIndentationLevel(baseIndentationLevel);
         memento.setInYaml(currentlyInYaml);
         memento.setFirstLine(firstLine);
         memento.setLastLine(lastLine);
         memento.setLastParsedElement(lastParsedElement);
         memento.setPlanBeforeTestResult(planBeforeTestResult);
-        
+
         assertEquals(firstLine, memento.isFirstLine());
         assertEquals(planBeforeTestResult, memento.isPlanBeforeTestResult());
         assertEquals(lastLine, memento.getLastLine());

diff --git a/src/test/java/org/tap4j/parser/TestParserExceptionTest.java b/src/test/java/org/tap4j/parser/TestParserExceptionTest.java
@@ -32,7 +32,7 @@
 
 /**
  * Test class for ParserException.
- * 
+ *
  * @since 1.0
  */
 public class TestParserExceptionTest {

diff --git a/src/test/java/org/tap4j/parser/TestTap13Parser.java b/src/test/java/org/tap4j/parser/TestTap13Parser.java
@@ -39,28 +39,28 @@
 public class TestTap13Parser {
 
     private Tap13Parser parser;
-    
+
     @Before
     public void setUp() {
         parser = new Tap13Parser();
     }
-    
+
     @Test
     public void testTestResultWithEmptyComment() {
         String tap = "1..1\n" +
                 "ok 1 #";
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(0, testSet.getTestResult(1).getComments().size());
     }
-    
+
     @Test
     public void testTestResultWithComment() {
         String tap = "1..1\n" +
                 "ok 1 # a comment";
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals("a comment", testSet.getTestResult(1).getComments().get(0).getText());
     }
-    
+
     @Test
     public void testFooterWithAnEmptyComment() {
         String tap = "1..1\n" +
@@ -69,7 +69,7 @@ public void testFooterWithAnEmptyComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(null, testSet.getFooter().getComment());
     }
-    
+
     @Test
     public void testFooterWithComment() {
         String tap = "1..1\n" +
@@ -78,7 +78,7 @@ public void testFooterWithComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals("a comment", testSet.getFooter().getComment().getText());
     }
-    
+
     @Test
     public void testHeader() {
         String tap = "TAP version 13\n" +
@@ -88,7 +88,7 @@ public void testHeader() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(new Integer(13), testSet.getHeader().getVersion());
     }
-    
+
     @Test(expected=ParserException.class)
     public void testHeaderDuplicated() {
         String tap = "TAP version 13\n" +
@@ -99,7 +99,7 @@ public void testHeaderDuplicated() {
         parser.parseTapStream(tap);
         fail("Not supposed to get here");
     }
-    
+
     @Test
     public void testHeaderWithEmptyComment() {
         String tap = "TAP version 13 #\n" +
@@ -108,7 +108,7 @@ public void testHeaderWithEmptyComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(null, testSet.getHeader().getComment());
     }
-    
+
     @Test
     public void testHeaderWithComment() {
         String tap = "TAP version 13 # a comment\n" +
@@ -118,7 +118,7 @@ public void testHeaderWithComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals("a comment", testSet.getHeader().getComment().getText());
     }
-    
+
     @Test
     public void testPlan() {
         String tap = "TAP version 13 # a comment\n" +
@@ -127,7 +127,7 @@ public void testPlan() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(new Integer(1), testSet.getPlan().getInitialTestNumber());
     }
-    
+
     @Test(expected=ParserException.class)
     public void testPlanDuplicated() {
         String tap = "TAP version 13 # a comment\n" +
@@ -137,7 +137,7 @@ public void testPlanDuplicated() {
         parser.parseTapStream(tap);
         fail("Not supposed to get here");
     }
-    
+
     @Test
     public void testPlanSkip() {
         String tap = "TAP version 13 # a comment\n" +
@@ -146,7 +146,7 @@ public void testPlanSkip() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals("betsu ni", testSet.getPlan().getSkip().getReason());
     }
-    
+
     @Test
     public void testPlanWithEmptyComment() {
         String tap = "TAP version 13 # a comment\n" +
@@ -155,7 +155,7 @@ public void testPlanWithEmptyComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals(null, testSet.getPlan().getComment());
     }
-    
+
     @Test
     public void testPlanWithComment() {
         String tap = "TAP version 13 # a comment\n" +
@@ -164,10 +164,10 @@ public void testPlanWithComment() {
         TestSet testSet = parser.parseTapStream(tap);
         assertEquals("a comment", testSet.getPlan().getComment().getText());
     }
-    
+
     @Test(expected=ParserException.class)
     public void notExistentFile() {
         parser.parseFile(new File(""+System.currentTimeMillis()+System.nanoTime()));
     }
-    
+
 }
diff --git a/src/test/java/org/tap4j/parser/issue3406964/package-info.java b/src/test/java/org/tap4j/parser/issue3406964/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3406964.
+ *
+ */
+package org.tap4j.parser.issue3406964;
diff --git a/src/test/java/org/tap4j/parser/issue3409478/TestDoneTesting.java b/src/test/java/org/tap4j/parser/issue3409478/TestDoneTesting.java
@@ -43,7 +43,7 @@
  * <li>1..3</li>
  * <li>ok</li>
  * </ul>
- * 
+ *
  * @since 2.0.6
  */
 public class TestDoneTesting {

diff --git a/src/test/java/org/tap4j/parser/issue3409478/package-info.java b/src/test/java/org/tap4j/parser/issue3409478/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3409478.
+ *
+ */
+package org.tap4j.parser.issue3409478;
diff --git a/src/test/java/org/tap4j/parser/issue3525603/package-info.java b/src/test/java/org/tap4j/parser/issue3525603/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3525603.
+ *
+ */
+package org.tap4j.parser.issue3525603;
diff --git a/src/test/java/org/tap4j/parser/issue3525607/TestIssue3525607.java b/src/test/java/org/tap4j/parser/issue3525607/TestIssue3525607.java
@@ -47,7 +47,7 @@ public void testTestResultWithCommentDiagnostics() {
                 + "# Missing end transmission signal\n"
                 + "# Aborting mission!\n" + "ok";
         final TestSet testSet = getConsumer().load(tap);
-        assertEquals("No errors found", 
+        assertEquals("No errors found",
                 testSet.getTestResult(1).getComments().get(0).getText());
         final String expected = "Invalid stream character\n"
                 + "Missing end transmission signal\n" + "Aborting mission!\n";

diff --git a/src/test/java/org/tap4j/parser/issue3525607/package-info.java b/src/test/java/org/tap4j/parser/issue3525607/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Tests for issue 3525607.
+ *
+ */
+package org.tap4j.parser.issue3525607;