From f32b9c6051884a63a21f1140e3b643b853ea32c7 Mon Sep 17 00:00:00 2001
From: Jakub Podlesak <jakub.podlesak@oracle.com>
Date: Mon, 3 Jun 2019 16:41:03 +0200
Subject: [PATCH] tap4j upgraded to 4.4.2 version (had to fix sub-test related
 tests, upgrade JDK restriction to 1.8)

---
 pom.xml                                       |  4 +--
 .../TestFlattenTapResult.java                 | 32 +++++++++----------
 .../TestStripSingleParent.java                | 12 +++----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index d924e2b..eea4077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,9 +51,9 @@
 
 	<properties>
 		<jenkins.version>1.642.3</jenkins.version>
-		<java.level>7</java.level>
+		<java.level>8</java.level>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tap4j.version>4.2.1</tap4j.version>
+		<tap4j.version>4.4.2</tap4j.version>
 		<junit.plugin.version>1.6</junit.plugin.version>
 		<!-- TODO: remove once FindBugs issues are fixed -->
 		<findbugs.failOnError>false</findbugs.failOnError>
diff --git a/src/test/java/org/tap4j/plugin/flattentapfeature/TestFlattenTapResult.java b/src/test/java/org/tap4j/plugin/flattentapfeature/TestFlattenTapResult.java
index 09741a0..f7e2f8a 100644
--- a/src/test/java/org/tap4j/plugin/flattentapfeature/TestFlattenTapResult.java
+++ b/src/test/java/org/tap4j/plugin/flattentapfeature/TestFlattenTapResult.java
@@ -38,11 +38,11 @@ public class TestFlattenTapResult {
     public void testMixedLevels() throws IOException, InterruptedException, ExecutionException {
 
         final String tap = "1..2\n" +
-                "ok 1 1\n" +
                 "  1..3\n" +
                 "  ok 1 1.1\n" +
                 "  ok 2 1.2\n" +
                 "  ok 3 1.3\n" +
+                "ok 1 1\n" +
                 "ok 2 2\n";
 
         _test(tap, 4, null, false);
@@ -52,15 +52,15 @@ public void testMixedLevels() throws IOException, InterruptedException, Executio
     public void testStripFirstLevel() throws IOException, InterruptedException, ExecutionException {
 
         final String tap = "1..2\n" +
-                "ok 1 1\n" +
                 "  1..2\n" +
                 "  ok 1 .1\n" +
                 "  ok 2 .2\n" +
-                "ok 2 2\n" +
+                "ok 1 1\n" +
                 "  1..3\n" +
                 "  ok 1 .1\n" +
                 "  ok 2 .2\n" +
-                "  ok 3 .3\n";
+                "  ok 3 .3\n" +
+                "ok 2 2\n";
 
         _test(tap, 5, new String[] {
             "1.1", "1.2",
@@ -72,19 +72,19 @@ public void testStripSecondLevel() throws IOException, InterruptedException, Exe
 
         final String tap =
                 "1..1\n" +
-                "ok 1 1\n" +
                 "  1..2\n" +
-                "  ok 1 .1\n" +
                 "    1..4\n" +
                 "    ok 1 .1\n" +
                 "    ok 2 .2\n" +
                 "    ok 3 .3\n" +
                 "    ok 4 .4\n" +
-                "  ok 2 .2\n" +
+                "  ok 1 .1\n" +
                 "    1..3\n" +
                 "    ok 1 .1\n" +
                 "    ok 2 .2\n" +
-                "    ok 3 .3\n";
+                "    ok 3 .3\n" +
+                "  ok 2 .2\n" +
+                "ok 1 1\n";
 
         _test(tap, 7,
                 new String[] {
@@ -97,18 +97,18 @@ public void testStripSecondLevelIncompleteResult1() throws IOException, Interrup
 
         final String tap =
                 "1..1\n" +
-                "ok 1 1\n" +
                 "  1..2\n" +
-                "  ok 1 .1\n" +
                 "    1..4\n" +
                 "    ok 1 .1\n" +
                 "    ok 2 .2\n" +
                 "    ok 3 .3\n" +
-                "  ok 2 .2\n" +
+                "  ok 1 .1\n" +
                 "    1..3\n" +
                 "    ok 1 .1\n" +
                 "    ok 2 .2\n" +
-                "    ok 3 .3\n";
+                "    ok 3 .3\n" +
+                "  ok 2 .2\n" +
+                "ok 1 1\n";
 
         _test(tap, 7,
                 new String[] {
@@ -120,16 +120,16 @@ public void testStripSecondLevelIncompleteResult1() throws IOException, Interrup
     public void testStripSecondLevelIncompleteResult2() throws IOException, InterruptedException, ExecutionException {
         final String tap2 =
                 "1..1\n" +
-                "ok 1 1\n" +
                 "  1..2\n" +
-                "  ok 1 .1\n" +
                 "    1..4\n" +
                 "    ok 1 .1\n" +
                 "    ok 2 .2\n" +
                 "    ok 3 .3\n" +
-                "  ok 2 .2\n" +
+                "  ok 1 .1\n" +
                 "    1..3\n" +
-                "    ok 1 .1\n";
+                "    ok 1 .1\n" +
+                "  ok 2 .2\n" +
+                "ok 1 1\n";
 
         _test(tap2, 6,
                 new String[] {
diff --git a/src/test/java/org/tap4j/plugin/stripsingleparent/TestStripSingleParent.java b/src/test/java/org/tap4j/plugin/stripsingleparent/TestStripSingleParent.java
index c3ded60..153b1a2 100644
--- a/src/test/java/org/tap4j/plugin/stripsingleparent/TestStripSingleParent.java
+++ b/src/test/java/org/tap4j/plugin/stripsingleparent/TestStripSingleParent.java
@@ -33,11 +33,11 @@ public class TestStripSingleParent {
     public void testNoEffect() throws IOException, InterruptedException, ExecutionException {
 
         final String tap = "1..2\n" +
-                "ok 1 - 1\n" +
                 "  1..3\n" +
                 "  ok 1 1.1\n" +
                 "  ok 2 1.2\n" +
                 "  ok 3 1.3\n" +
+                "ok 1 - 1\n" +
                 "ok 2 - 1\n";
 
         _test(tap, 2);
@@ -47,11 +47,11 @@ public void testNoEffect() throws IOException, InterruptedException, ExecutionEx
     public void testStripFirstLevel() throws IOException, InterruptedException, ExecutionException {
 
         final String tap = "1..1\n" +
-                "ok 1 - 1\n" +
                 "  1..3\n" +
                 "  ok 1 1.1\n" +
                 "  ok 2 1.2\n" +
-                "  ok 3 1.3\n";
+                "  ok 3 1.3\n" +
+                "ok 1 - 1\n";
 
         _test(tap, 3);
     }
@@ -61,13 +61,13 @@ public void testStripSecondLevel() throws IOException, InterruptedException, Exe
 
         final String tap =
                 "1..1\n" +
-                "ok 1 - 1\n" +
                 "  1..1\n" +
-                "  ok 1.1 - 1\n" +
                 "    1..3\n" +
                 "    ok 1 1.1.1\n" +
                 "    ok 2 1.1.2\n" +
-                "    ok 3 1.1.3\n";
+                "    ok 3 1.1.3\n" +
+                "  ok 1.1 - 1\n" +
+                "ok 1 - 1\n";
 
         _test(tap, 3);
     }