v1.0.0 done with 100% coverage

Author: Bernhard Grünewaldt

.gitignore

@@ -1,3 +1,4 @@
 *.iml
 .idea
 target
+output.xml

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 codeclou.io
+Copyright (c) 2017 Bernhard Grünewaldt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # java-junit-xml-merger
 
-:bangbang: WORK IN PROGRESS
+Merges multiple Junit XML files into a single testsuites XML file.
 
 ----
  
@@ -37,17 +37,22 @@ then this is for you
 
 ### Usage
 
+With folder `reports` containing multiple `*.xml` files in junit-xml format.
+A combined result will be written to `junit-all.xml`
+
 ```
-java -jar java-junit-xml-merger-0.0.1-jar-with-dependencies.jar \
-     -i=junit-report-1.xml \
-     -i=junit-report-2.xml \
+# INSTALL
+curl -o java-junit-xml-merger-0.0.1-fatjar.jar https://????
+# RUN
+java -jar java-junit-xml-merger-0.0.1-fatjar.jar \
+     -i=reports/ \
      -o=junit-all.xml \
-     -s="My Suite"
+     -s=My Suite
 ```
 
 -----
  
 
 ### License
 
-[MIT](https://github.com/cloutainer/k8s-jenkins-slave-deploy/blob/master/LICENSE) © [Bernhard Grünewaldt](https://github.com/clouless)
+[MIT](https://github.com/cloutainer/java-junit-xml-merger/blob/master/LICENSE) © [Bernhard Grünewaldt](https://github.com/clouless)

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.codeclou</groupId>
   <artifactId>java-junit-xml-merger</artifactId>
-  <version>0.0.1</version>
+  <version>1.0.0</version>
   <organization>
     <name>codeclou.io</name>
     <url>http://codeclou.io/</url>
@@ -78,7 +78,7 @@
             </manifest>
           </archive>
           <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
+            <descriptorRef>fatjar</descriptorRef>
           </descriptorRefs>
         </configuration>
         <executions>

src/main/java/io/codeclou/java/junit/xml/merger/JunitXmlParser.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 package io.codeclou.java.junit.xml.merger;
 
 import io.codeclou.java.junit.xml.merger.model.TestSuite;
+import io.codeclou.java.junit.xml.merger.model.TestSuites;
 import org.apache.commons.cli.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -32,13 +33,22 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
 public class JunitXmlParser {
 
     private CommandLineParser parser = new DefaultParser();
     private Options options = new Options();
+    private Boolean hasCmdLineParameterErrors = false;
+    private Boolean hasFileNotFoundErrors = false;
 
     protected TestSuite parseTestSuite(File filename) throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -59,21 +69,61 @@ public TestSuite transform(Node testSuite) {
         return t;
     }
 
-    protected void run(String[] args) throws ParseException {
-        Option option = new Option("i", "input", true, "input files");
-        option.setArgs(1000); // allow multiple
+    protected void run(String[] args) throws Exception {
+        Option option = new Option("i", "inputDir", true, "input dir that contains xml files");
         options.addOption(option);
-        options.addOption("o", "output", true, "output file");
-        CommandLine cmd = this.parser.parse( options, args);
-
-        System.out.println("Java Junit Xml Merger");
-        if(cmd.hasOption("input")) {
-            System.out.println("input ok");
-            for (Option o : cmd.getOptions()) {
-                System.out.println(o.getOpt() + " - " + o.getValue());
+        options.addOption("o", "output", true, "output xml file");
+        options.addOption("s", "suiteName", true, "suite name");
+        CommandLine cmd = this.parser.parse(options, args);
+        System.out.println("\033[32;1;2m+-------------------------+\033[0m");
+        System.out.println("\033[32;1;2m|  Java Junit Xml Merger  |\033[0m");
+        System.out.println("\033[32;1;2m+-------------------------+\033[0m");
+        if (!cmd.hasOption("inputDir")) {
+            System.out.println("\033[31;1mError >> Please specify inputDir with -i\033[0m");
+            hasCmdLineParameterErrors = true;
+        }
+        if (!cmd.hasOption("output")) {
+            System.out.println("\033[31;1mError >> Please specify output with -o\033[0m");
+            hasCmdLineParameterErrors = true;
+        }
+        if (!cmd.hasOption("suiteName")) {
+            System.out.println("\033[31;1mError >> Please specify suiteName with -s\033[0m");
+            hasCmdLineParameterErrors = true;
+        }
+        if (!hasCmdLineParameterErrors) {
+            System.out.println("\033[32;1;2mSuccess >> All input parameters ok\033[0m");
+            File outputFile = new File(cmd.getOptionValue("output"));
+            File inputFileDir = new File(cmd.getOptionValue("inputDir"));
+            try {
+                // "touch"/"overwrite" file
+                new FileOutputStream(outputFile).close();
+            } catch (IOException e) {
+                hasFileNotFoundErrors = true;
+                System.out.println("\033[31;1mError >> Outputfile not writeable\033[0m");
+                System.out.println(outputFile.getAbsolutePath());
+            }
+            if (!inputFileDir.isDirectory()) {
+                hasFileNotFoundErrors = true;
+                System.out.println("\033[31;1mError >> Input dir not readable\033[0m");
+                System.out.println(inputFileDir.getAbsolutePath());
+            }
+            if (!hasFileNotFoundErrors) {
+                System.out.println("\033[32;1;2mSuccess >> All files and folders ok\033[0m");
+                TestSuites suites = new TestSuites();
+                suites.setName(cmd.getOptionValue("suiteName"));
+                File[] filesList = inputFileDir.listFiles();
+                for (File f : filesList) {
+                    if (f.getAbsoluteFile().toString().endsWith(".xml")) {
+                        System.out.println("\033[32;1;2mInfo >> adding " + f.getName() +  " to TestSuites\033[0m");
+                        suites.getTestSuites().add(parseTestSuite(f));
+                    }
+                }
+                Document xml = suites.toXml();
+                Transformer transformer = TransformerFactory.newInstance().newTransformer();
+                Result output = new StreamResult(outputFile);
+                Source input = new DOMSource(xml);
+                transformer.transform(input, output);
             }
-        } else {
-            System.out.println("input fail");
         }
     }
 }

src/main/java/io/codeclou/java/junit/xml/merger/Merger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/main/java/io/codeclou/java/junit/xml/merger/model/TestSuite.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/main/java/io/codeclou/java/junit/xml/merger/model/TestSuites.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

src/test/java/io/codeclou/java/junit/xml/merger/GetterSetterValidator.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/test/java/io/codeclou/java/junit/xml/merger/JunitXmlParserTest.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2017 codeclou.io
+ * Copyright (c) 2017 Bernhard Grünewaldt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,12 +25,12 @@
 
 import io.codeclou.java.junit.xml.merger.model.TestSuite;
 import org.junit.Test;
+import org.mockito.internal.util.reflection.Whitebox;
 
 import java.io.File;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.*;
 
 public class JunitXmlParserTest {
 
@@ -51,4 +51,65 @@ public void testParse() throws Exception {
         assertEquals("ut.io.codeclou.customfield.editor.model.rest.SortModelTest", t.getName());
         assertNotNull(t.getXml());
     }
+
+    @Test
+    public void testRunInvalidInput1() throws Exception {
+        String[] args = {};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasCmdLineParameterErrors = (Boolean) Whitebox.getInternalState(parser, "hasCmdLineParameterErrors");
+        assertTrue(hasCmdLineParameterErrors);
+    }
+
+    @Test
+    public void testRunInvalidInput2() throws Exception {
+        String[] args = {"-i=foo"};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasCmdLineParameterErrors = (Boolean) Whitebox.getInternalState(parser, "hasCmdLineParameterErrors");
+        assertTrue(hasCmdLineParameterErrors);
+    }
+
+    @Test
+    public void testRunInvalidInput3() throws Exception {
+        String[] args = {"-i=foo", "-o=bar.xml"};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasCmdLineParameterErrors = (Boolean) Whitebox.getInternalState(parser, "hasCmdLineParameterErrors");
+        assertTrue(hasCmdLineParameterErrors);
+    }
+
+    @Test
+    public void testRunValidInputWithInvalidFolders() throws Exception {
+        String[] args = {"-i=foo", "-o=?x/bar.xml", "-s=foo"};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasFileNotFoundErrors = (Boolean) Whitebox.getInternalState(parser, "hasFileNotFoundErrors");
+        assertTrue(hasFileNotFoundErrors);
+    }
+
+    @Test
+    public void testRunValidInputWithValidFolders() throws Exception {
+        String[] args = {"-i=src/test/resources/", "-o=output.xml", "-s=foo bar"};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasCmdLineParameterErrors = (Boolean) Whitebox.getInternalState(parser, "hasCmdLineParameterErrors");
+        assertFalse(hasCmdLineParameterErrors);
+        Boolean hasFileNotFoundErrors = (Boolean) Whitebox.getInternalState(parser, "hasFileNotFoundErrors");
+        assertFalse(hasFileNotFoundErrors);
+    }
+
+    @Test
+    public void testRunValidInputWithEmptyInputFolder() throws Exception {
+        File emptyDir = new File("src/test/resources/empty/");
+        emptyDir.mkdir();
+        String[] args = {"-i=src/test/resources/empty/", "-o=output.xml", "-s=foo bar"};
+        JunitXmlParser parser = new JunitXmlParser();
+        parser.run(args);
+        Boolean hasCmdLineParameterErrors = (Boolean) Whitebox.getInternalState(parser, "hasCmdLineParameterErrors");
+        assertFalse(hasCmdLineParameterErrors);
+        Boolean hasFileNotFoundErrors = (Boolean) Whitebox.getInternalState(parser, "hasFileNotFoundErrors");
+        assertFalse(hasFileNotFoundErrors);
+        emptyDir.delete();
+    }
 }