From a7dddfa9050d5ced14fffab2d778d5d139fbf56f Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 27 Nov 2017 21:59:50 -0500 Subject: [PATCH] fixed incorrect name of shrinkwrap.json --- .../owasp/dependencycheck/analyzer/NodePackageAnalyzer.java | 4 ++-- .../dependencycheck/analyzer/NodePackageAnalyzerTest.java | 6 +++--- .../nodejs/{shrinkwrap.json => npm-shrinkwrap.json} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename dependency-check-core/src/test/resources/nodejs/{shrinkwrap.json => npm-shrinkwrap.json} (100%) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java index 9f7e2d9cf..7d6916406 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java @@ -83,9 +83,9 @@ public class NodePackageAnalyzer extends AbstractNpmAnalyzer { /** * 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() .addFilenames(PACKAGE_LOCK_JSON, SHRINKWRAP_JSON).build(); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java index 578b39e17..b8ecf1a5f 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java @@ -91,7 +91,7 @@ public class NodePackageAnalyzerTest extends BaseTest { @Test public void testSupportsFiles() { 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 public void testAnalyzeShrinkwrapJson() throws AnalysisException { final Dependency toScan = new Dependency(BaseTest.getResourceAsFile(this, - "nodejs/shrinkwrap.json")); + "nodejs/npm-shrinkwrap.json")); analyzer.analyze(toScan, engine); assertEquals("Expected 1 dependency", engine.getDependencies().length, 1); final Dependency result = engine.getDependencies()[0]; @@ -126,7 +126,7 @@ public class NodePackageAnalyzerTest extends BaseTest { final Dependency packageLock = new Dependency(BaseTest.getResourceAsFile(this, "nodejs/package-lock.json")); final Dependency shrinkwrap = new Dependency(BaseTest.getResourceAsFile(this, - "nodejs/shrinkwrap.json")); + "nodejs/npm-shrinkwrap.json")); engine.addDependency(packageLock); engine.addDependency(shrinkwrap); assertEquals(2, engine.getDependencies().length); diff --git a/dependency-check-core/src/test/resources/nodejs/shrinkwrap.json b/dependency-check-core/src/test/resources/nodejs/npm-shrinkwrap.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/shrinkwrap.json rename to dependency-check-core/src/test/resources/nodejs/npm-shrinkwrap.json