Merge pull request #13 from Autodesk/master

Fixed multi-file processing bug
jenkinsci · Feb 28, 2018 · 12884a2 · 12884a2
2 parents 18bb2a8 + 18097d7
commit 12884a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/parsers/JsonToPlugin/MapJsonToPlugin.java b/src/main/java/org/jenkinsci/plugins/benchmark/parsers/JsonToPlugin/MapJsonToPlugin.java
@@ -106,12 +106,11 @@ public MapJsonToPlugin(Integer build, Map<String, FilePath> content, JsonElement
 
                 InitiateLoading(group, jContent, schema);
                 listener.getLogger().println("   - " + relativePath);
+                files_processed++;
             } catch (Exception e){
                 listener.getLogger().println("   - " + Messages.MapJsonToPlugin_PrintFailedToLoadFile(relativePath));
                 continue;
             }
-            listener.getLogger().println("   - " + relativePath);
-            files_processed++;
         }
         if (files_processed == 0) {
             throw new ValidationException(Messages.MapJsonToPlugin_NoValidFileFound());

diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/results/TestGroup.java b/src/main/java/org/jenkinsci/plugins/benchmark/results/TestGroup.java
@@ -310,8 +310,14 @@ public Integer getFileHash() {
 
     public boolean isArray() { return (ctype == ClassType.ct_array); }
     public String getFullName() {
-        if (this.name.equalsIgnoreCase("__root__") || this.name.equalsIgnoreCase("__first__")) {
+        if (this.name.equalsIgnoreCase("__root__")) {
             return "";
+        } else if (this.name.equalsIgnoreCase("__first__")) {
+            if (this.parent != null) {
+                return this.parent.getFullName();
+            } else {
+                return "";
+            }
         } else {
             String fullName = this.parent.getFullName();
             if (this.getClassType() == ClassType.ct_fileGrp) {

diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java b/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java
@@ -498,18 +498,18 @@ public static void convertResultJsonObject(int build, JsonObject object, TestGro
                         }
                     }
                 } else if (key.equals("file")) {
-                JsonElement inObject = enObject.getValue();
-                if (inObject.isJsonPrimitive()) {
-                    JsonPrimitive primitive = inObject.getAsJsonPrimitive();
-                    if (primitive.isNumber()) {
-                        TestGroup file = fileList.get(primitive.getAsInt());
-                        if (file != null) {
-                            _file = file;
+                    JsonElement inObject = enObject.getValue();
+                    if (inObject.isJsonPrimitive()) {
+                        JsonPrimitive primitive = inObject.getAsJsonPrimitive();
+                        if (primitive.isNumber()) {
+                            TestGroup file = fileList.get(primitive.getAsInt());
+                            if (file != null) {
+                                _file = file;
+                            }
                         }
                     }
                 }
             }
-            }
             switch (_type) {
                 case rt_boolean:
                     BooleanValue bool_value = new BooleanValue (_file, null, _name, _description, _unit);