Skip to content

Commit e4f1859

Browse files
authored
Improve npm extractor tests (#568)
1 parent 852b14b commit e4f1859

File tree

6 files changed

+77
-23
lines changed

6 files changed

+77
-23
lines changed

build-info-extractor-npm/src/test/java/org/jfrog/build/extractor/npm/extractor/NpmExtractorTest.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@
3838
public class NpmExtractorTest extends IntegrationTestsBase {
3939

4040
private static final String NPM_LOCAL_REPO = "build-info-tests-npm-local";
41-
private static final String NPM_REMOTE_REPO = "build-info-tests-npm-remote";
42-
private static final String NPM_VIRTUAL_REPO = "build-info-tests-npm-virtual";
4341
private static final Set<String> DEV_SCOPE = Stream.of("dev").collect(Collectors.toSet());
4442
private static final Set<String> PROD_SCOPE = Stream.of("prod").collect(Collectors.toSet());
45-
private static final Set<String> DEV_PROD_SCOPE = Stream.of("prod","dev").collect(Collectors.toSet());
43+
private static final Set<String> DEV_PROD_SCOPE = Stream.of("prod", "dev").collect(Collectors.toSet());
4644

4745
private static final Path PROJECTS_ROOT = Paths.get(".").toAbsolutePath().normalize().resolve(Paths.get("src", "test", "resources", "org", "jfrog", "build", "extractor"));
4846

@@ -51,8 +49,7 @@ public class NpmExtractorTest extends IntegrationTestsBase {
5149

5250
public NpmExtractorTest() {
5351
localRepo1 = NPM_LOCAL_REPO;
54-
remoteRepo = NPM_REMOTE_REPO;
55-
virtualRepo = NPM_VIRTUAL_REPO;
52+
virtualRepo = "";
5653
}
5754

5855
private enum Project {
@@ -186,15 +183,15 @@ private void runNpmTest(Project project, Dependency[] expectedDependencies, Stri
186183
Path path = packageJsonPath ? projectDir.resolve("package.json") : projectDir;
187184
if (isNpmCi) {
188185
// Run npm install to generate package-lock.json file.
189-
new NpmInstallCi(artifactoryManagerBuilder, virtualRepo, args, log, path, null, null, null, false, null).execute();
186+
new NpmInstallCi(artifactoryManagerBuilder, localRepo1, args, log, path, null, null, null, false, null).execute();
190187
}
191188

192189
// Execute command.
193190
NpmInstallCi buildExecutor;
194191
if (isNpmCi) {
195-
buildExecutor = new NpmInstallCi(artifactoryManagerBuilder, virtualRepo, args, log, path, null, null, null, true, null);
192+
buildExecutor = new NpmInstallCi(artifactoryManagerBuilder, localRepo1, args, log, path, null, null, null, true, null);
196193
} else {
197-
buildExecutor = new NpmInstallCi(artifactoryManagerBuilder, virtualRepo, args, log, path, null, null, null, false, null);
194+
buildExecutor = new NpmInstallCi(artifactoryManagerBuilder, localRepo1, args, log, path, null, null, null, false, null);
198195
}
199196
Build build = buildExecutor.execute();
200197

@@ -233,15 +230,15 @@ public void npmPublishTest(Project project, ArrayListMultimap<String, String> pr
233230
// Run npm publish
234231
projectDir = createProjectDir(project);
235232
Path path = StringUtils.isNotBlank(packageName) ? projectDir.resolve(packageName) : projectDir;
236-
NpmPublish npmPublish = new NpmPublish(artifactoryManagerBuilder, props, path, virtualRepo, log, null, null);
233+
NpmPublish npmPublish = new NpmPublish(artifactoryManagerBuilder, props, path, localRepo1, log, null, null);
237234
Build build = npmPublish.execute();
238235
assertEquals(build.getModules().size(), 1);
239236
Module module = build.getModules().get(0);
240237

241238
// Check correctness of the module and the artifact
242239
assertEquals(module.getType(), "npm");
243240
assertEquals(module.getId(), project.getModuleId());
244-
assertEquals(module.getRepository(), virtualRepo);
241+
assertEquals(module.getRepository(), localRepo1);
245242
assertEquals(module.getArtifacts().size(), 1);
246243
assertEquals(module.getArtifacts().get(0).getName(), project.getModuleId());
247244
assertEquals(module.getArtifacts().get(0).getRemotePath(), project.getRemotePath());

build-info-extractor-npm/src/test/resources/integration/settings/build-info-tests-npm-remote.json

-7
This file was deleted.

build-info-extractor-npm/src/test/resources/integration/settings/build-info-tests-npm-virtual.json

-6
This file was deleted.

build-info-extractor-npm/src/test/resources/org/jfrog/build/extractor/a/package-lock.json

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-info-extractor-npm/src/test/resources/org/jfrog/build/extractor/b/package-lock.json

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-info-extractor-npm/src/test/resources/org/jfrog/build/extractor/c/package-lock.json

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)