Merge branch 'main' into maazur

kingstabyou · kingstabyou · commit 00709f59cd4f · 2022-04-18T19:46:08.000-05:00
diff --git a/src/main/java/gr/gousiosg/javacg/stat/coverage/JacocoCoverage.java b/src/main/java/gr/gousiosg/javacg/stat/coverage/JacocoCoverage.java
@@ -82,7 +82,7 @@ public JacocoCoverage(String path)
                                                             coveredLines.add(
                                                                     String.format(
                                                                             "%s:%d",
-                                                                            rawSrcFile.getName(), Byte.toUnsignedInt(line.nr)))));
+                                                                            rawSrcFile.getName(), Short.toUnsignedInt(line.nr)))));
         }
 
         /* Indicate that coverage has been applied */
diff --git a/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java b/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java
@@ -35,7 +35,7 @@ private RepoTool(String name, String URL, String checkoutID, String patchName, S
         this.subProject = subProject;
         this.mvnOptions = mvnOptions;
 
-        this.timeStamp = String.valueOf(java.time.LocalDateTime.now());
+        this.timeStamp = String.valueOf(java.time.LocalDateTime.now()).replace(':', '_');
     }
 
     public RepoTool(String name) throws FileNotFoundException {
@@ -53,7 +53,7 @@ public RepoTool(String name) throws FileNotFoundException {
         mvnOptions = (String) data.getOrDefault("mvnOptions", "");
         properties = (List<Map<String,String>>) data.get("properties");
 
-        this.timeStamp = String.valueOf(java.time.LocalDateTime.now());
+        this.timeStamp = String.valueOf(java.time.LocalDateTime.now()).replace(':', '_');
     }
 
     public void cloneRepo() throws GitAPIException, JGitInternalException {
diff --git a/src/main/resources/jacoco-schema.xsd b/src/main/resources/jacoco-schema.xsd
@@ -66,7 +66,7 @@
                                             <xs:complexType>
                                                 <xs:simpleContent>
                                                     <xs:extension base="xs:string">
-                                                        <xs:attribute type="xs:byte" name="nr" use="optional"/>
+                                                        <xs:attribute type="xs:short" name="nr" use="optional"/>
                                                         <xs:attribute type="xs:byte" name="mi" use="optional"/>
                                                         <xs:attribute type="xs:byte" name="ci" use="optional"/>
                                                         <xs:attribute type="xs:byte" name="mb" use="optional"/>

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public JacocoCoverage(String path)`
`82`	`82`	`coveredLines.add(`
`83`	`83`	`String.format(`
`84`	`84`	`"%s:%d",`
`85`		`- rawSrcFile.getName(), Byte.toUnsignedInt(line.nr)))));`
	`85`	`+ rawSrcFile.getName(), Short.toUnsignedInt(line.nr)))));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/* Indicate that coverage has been applied */`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private RepoTool(String name, String URL, String checkoutID, String patchName, S`
`35`	`35`	`this.subProject = subProject;`
`36`	`36`	`this.mvnOptions = mvnOptions;`
`37`	`37`
`38`		`- this.timeStamp = String.valueOf(java.time.LocalDateTime.now());`
	`38`	`+ this.timeStamp = String.valueOf(java.time.LocalDateTime.now()).replace(':', '_');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public RepoTool(String name) throws FileNotFoundException {`
`@@ -53,7 +53,7 @@ public RepoTool(String name) throws FileNotFoundException {`
`53`	`53`	`mvnOptions = (String) data.getOrDefault("mvnOptions", "");`
`54`	`54`	`properties = (List<Map<String,String>>) data.get("properties");`
`55`	`55`
`56`		`- this.timeStamp = String.valueOf(java.time.LocalDateTime.now());`
	`56`	`+ this.timeStamp = String.valueOf(java.time.LocalDateTime.now()).replace(':', '_');`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void cloneRepo() throws GitAPIException, JGitInternalException {`