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

fixed incorrect name of shrinkwrap.json

Browse Source
This commit is contained in:
Jeremy Long
2017-11-27 21:59:50 -05:00
parent c465bc9fc7
commit a7dddfa905
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java
View File

@@ -83,9 +83,9 @@ public class NodePackageAnalyzer extends AbstractNpmAnalyzer {
/** /**
* The file name to scan. * The file name to scan.
*/ */
public static final String SHRINKWRAP_JSON = "shrinkwrap.json"; public static final String SHRINKWRAP_JSON = "npm-shrinkwrap.json";
/** /**
* Filter that detects files named "package-lock.json" or "shrinkwrap.json". * Filter that detects files named "package-lock.json" or "npm-shrinkwrap.json".
*/ */
private static final FileFilter PACKAGE_JSON_FILTER = FileFilterBuilder.newInstance() private static final FileFilter PACKAGE_JSON_FILTER = FileFilterBuilder.newInstance()
.addFilenames(PACKAGE_LOCK_JSON, SHRINKWRAP_JSON).build(); .addFilenames(PACKAGE_LOCK_JSON, SHRINKWRAP_JSON).build();

6
dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java
View File

@@ -91,7 +91,7 @@ public class NodePackageAnalyzerTest extends BaseTest {
@Test @Test
public void testSupportsFiles() { public void testSupportsFiles() {
assertThat(analyzer.accept(new File("package-lock.json")), is(true)); assertThat(analyzer.accept(new File("package-lock.json")), is(true));
assertThat(analyzer.accept(new File("shrinkwrap.json")), is(true)); assertThat(analyzer.accept(new File("npm-shrinkwrap.json")), is(true));
} }
/** /**
@@ -102,7 +102,7 @@ public class NodePackageAnalyzerTest extends BaseTest {
@Test @Test
public void testAnalyzeShrinkwrapJson() throws AnalysisException { public void testAnalyzeShrinkwrapJson() throws AnalysisException {
final Dependency toScan = new Dependency(BaseTest.getResourceAsFile(this, final Dependency toScan = new Dependency(BaseTest.getResourceAsFile(this,
"nodejs/shrinkwrap.json")); "nodejs/npm-shrinkwrap.json"));
analyzer.analyze(toScan, engine); analyzer.analyze(toScan, engine);
assertEquals("Expected 1 dependency", engine.getDependencies().length, 1); assertEquals("Expected 1 dependency", engine.getDependencies().length, 1);
final Dependency result = engine.getDependencies()[0]; final Dependency result = engine.getDependencies()[0];
@@ -126,7 +126,7 @@ public class NodePackageAnalyzerTest extends BaseTest {
final Dependency packageLock = new Dependency(BaseTest.getResourceAsFile(this, final Dependency packageLock = new Dependency(BaseTest.getResourceAsFile(this,
"nodejs/package-lock.json")); "nodejs/package-lock.json"));
final Dependency shrinkwrap = new Dependency(BaseTest.getResourceAsFile(this, final Dependency shrinkwrap = new Dependency(BaseTest.getResourceAsFile(this,
"nodejs/shrinkwrap.json")); "nodejs/npm-shrinkwrap.json"));
engine.addDependency(packageLock); engine.addDependency(packageLock);
engine.addDependency(shrinkwrap); engine.addDependency(shrinkwrap);
assertEquals(2, engine.getDependencies().length); assertEquals(2, engine.getDependencies().length);

0
dependency-check-core/src/test/resources/nodejs/shrinkwrap.json → dependency-check-core/src/test/resources/nodejs/npm-shrinkwrap.json generated
View File