github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-20 00:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed test cases

Browse Source
This commit is contained in:
Jeremy Long
2017-11-26 10:26:37 -05:00
parent f51edf52e7
commit 72c121797f
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java
View File

@@ -125,7 +125,11 @@ public class EscapeTool {
if (text == null || text.isEmpty()) { if (text == null || text.isEmpty()) {
return "\"\""; return "\"\"";
} }
return StringEscapeUtils.escapeCsv(text.trim().replace("\n", " ")); final String str = text.trim().replace("\n", " ");
if (str.length()==0) {
return "\"\"";
}
return StringEscapeUtils.escapeCsv(str);
} }
/** /**
@@ -151,6 +155,9 @@ public class EscapeTool {
sb.append(id.getValue()); sb.append(id.getValue());
} }
} }
if (sb.length()==0) {
return "\"\"";
}
return StringEscapeUtils.escapeCsv(sb.toString()); return StringEscapeUtils.escapeCsv(sb.toString());
} }
@@ -177,6 +184,9 @@ public class EscapeTool {
sb.append(id.getValue()); sb.append(id.getValue());
} }
} }
if (sb.length()==0) {
return "\"\"";
}
return StringEscapeUtils.escapeCsv(sb.toString()); return StringEscapeUtils.escapeCsv(sb.toString());
} }
@@ -203,6 +213,9 @@ public class EscapeTool {
sb.append(id.getConfidence()); sb.append(id.getConfidence());
} }
} }
if (sb.length()==0) {
return "\"\"";
}
return StringEscapeUtils.escapeCsv(sb.toString()); return StringEscapeUtils.escapeCsv(sb.toString());
} }
@@ -229,6 +242,9 @@ public class EscapeTool {
sb.append(id.getValue()); sb.append(id.getValue());
} }
} }
if (sb.length()==0) {
return "\"\"";
}
return StringEscapeUtils.escapeCsv(sb.toString()); return StringEscapeUtils.escapeCsv(sb.toString());
} }
} }

20
dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java
View File

@@ -126,7 +126,7 @@ public class EscapeToolTest {
public void testCsv() { public void testCsv() {
String text = null; String text = null;
EscapeTool instance = new EscapeTool(); EscapeTool instance = new EscapeTool();
String expResult = null; String expResult = "\"\"";
String result = instance.csv(text); String result = instance.csv(text);
assertEquals(expResult, result); assertEquals(expResult, result);
@@ -164,22 +164,22 @@ public class EscapeToolTest {
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
expResult = "somegroup:something:1.0"; expResult = "somegroup:something:1.0";
result = instance.csvIdentifiers(ids); result = instance.csvIdentifiers(ids);
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", "")); ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", ""));
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
expResult = "somegroup:something:1.0"; expResult = "somegroup:something:1.0";
result = instance.csvIdentifiers(ids); result = instance.csvIdentifiers(ids);
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", "")); ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", ""));
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
ids.add(new Identifier("gav", "somegroup2:something:1.2", "")); ids.add(new Identifier("maven", "somegroup2:something:1.2", ""));
expResult = "\"somegroup:something:1.0, somegroup2:something:1.2\""; expResult = "\"somegroup:something:1.0, somegroup2:something:1.2\"";
String expResult2 = "\"somegroup2:something:1.2, somegroup:something:1.0\""; String expResult2 = "\"somegroup2:something:1.2, somegroup:something:1.0\"";
result = instance.csvIdentifiers(ids); result = instance.csvIdentifiers(ids);
@@ -203,7 +203,7 @@ public class EscapeToolTest {
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
expResult = "\"\""; expResult = "\"\"";
result = instance.csvCpe(ids); result = instance.csvCpe(ids);
assertEquals(expResult, result); assertEquals(expResult, result);
@@ -216,14 +216,14 @@ public class EscapeToolTest {
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", "")); ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", ""));
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
expResult = "cpe:/a:somegroup:something:1.0"; expResult = "cpe:/a:somegroup:something:1.0";
result = instance.csvCpe(ids); result = instance.csvCpe(ids);
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", "")); ids.add(new Identifier("cpe", "cpe:/a:somegroup:something:1.0", ""));
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
ids.add(new Identifier("cpe", "cpe:/a:somegroup2:something:1.2", "")); ids.add(new Identifier("cpe", "cpe:/a:somegroup2:something:1.2", ""));
expResult = "\"cpe:/a:somegroup:something:1.0, cpe:/a:somegroup2:something:1.2\""; expResult = "\"cpe:/a:somegroup:something:1.0, cpe:/a:somegroup2:something:1.2\"";
String expResult2 = "\"cpe:/a:somegroup2:something:1.2, cpe:/a:somegroup:something:1.0\""; String expResult2 = "\"cpe:/a:somegroup2:something:1.2, cpe:/a:somegroup:something:1.0\"";
@@ -248,7 +248,7 @@ public class EscapeToolTest {
assertEquals(expResult, result); assertEquals(expResult, result);
ids = new HashSet<>(); ids = new HashSet<>();
ids.add(new Identifier("gav", "somegroup:something:1.0", "")); ids.add(new Identifier("maven", "somegroup:something:1.0", ""));
expResult = "\"\""; expResult = "\"\"";
result = instance.csvCpeConfidence(ids); result = instance.csvCpeConfidence(ids);
assertEquals(expResult, result); assertEquals(expResult, result);
@@ -268,7 +268,7 @@ public class EscapeToolTest {
Identifier i2 = new Identifier("cpe", "cpe:/a:somegroup:something2:1.0", ""); Identifier i2 = new Identifier("cpe", "cpe:/a:somegroup:something2:1.0", "");
i2.setConfidence(Confidence.MEDIUM); i2.setConfidence(Confidence.MEDIUM);
ids.add(i2); ids.add(i2);
Identifier i3 = new Identifier("gav", "somegroup:something:1.0", ""); Identifier i3 = new Identifier("maven", "somegroup:something:1.0", "");
i3.setConfidence(Confidence.LOW); i3.setConfidence(Confidence.LOW);
ids.add(i3); ids.add(i3);