Skip to content

Commit

Permalink
fix: updating tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotkas
dotkas committed Nov 16, 2023
1 parent 3edf270 commit 5747284
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions test/system/multi-module.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test('multi-project, explicitly targeting a subproject build file', async () =>
'.',
path.join(multiProject, 'subproj', 'build.gradle'),
);
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('subproj');
expect(result.meta!.gradleProjectName).toBe('subproj');
expect(result.plugin.meta!.allSubProjectNames).toEqual([]);

Expand All @@ -27,7 +27,7 @@ test('multi-project, explicitly targeting a subproject build file', async () =>

test('multi-project, ran from root, targeting subproj', async () => {
const result = await inspect(multiProject, 'subproj/build.gradle');
expect(result.dependencyGraph.rootPkg.name).toBe('multi-project');
expect(result.dependencyGraph.rootPkg.name).toBe('subproj');
expect(result.meta!.gradleProjectName).toBe('subproj');
expect(result.plugin.meta!.allSubProjectNames).toEqual([]);

Expand Down Expand Up @@ -89,7 +89,7 @@ test('multi-project: only sub-project has deps and they are returned', async ()
test('multi-project: only sub-project has deps, none returned for main', async () => {
const result = await inspect('.', path.join(multiProject, 'build.gradle'));

expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj');

expect(result.meta!.gradleProjectName).toBe('root-proj');

Expand Down Expand Up @@ -117,7 +117,7 @@ if (wrapperIsCompatibleWithJvm) {
'.',
path.join(fixtureDir('multi-project gradle wrapper'), 'build.gradle'),
);
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj');
expect(result.meta!.gradleProjectName).toBe('root-proj');
expect(result.meta!.versionBuildInfo!.gradleVersion).toBe('5.4.1');
expect(result.plugin.meta!.allSubProjectNames).toEqual(['subproj']);
Expand All @@ -134,7 +134,7 @@ test('multi-project: parallel is handled correctly', async () => {
fixtureDir('multi-project-parallel'),
'build.gradle',
);
expect(result.dependencyGraph.rootPkg.name).toBe('multi-project-parallel');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj');
expect(result.meta!.gradleProjectName).toBe('root-proj');

// double parsing to have access to internal depGraph data, no methods available to properly
Expand All @@ -154,7 +154,7 @@ test('multi-project: only sub-project has deps and they are returned space needs
);

expect(result.plugin.meta!.allSubProjectNames).toEqual(['subproj']);
expect(result.dependencyGraph.rootPkg.name).toBe('./subproj');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj/subproj');
expect(result.meta!.gradleProjectName).toBe('root-proj/subproj');

const pkgs = result.dependencyGraph.getDepPkgs();
Expand Down Expand Up @@ -242,7 +242,7 @@ test('multi-project-some-unscannable: gradle-sub-project for a good subproject w
'subproj-fail',
]);

expect(result.dependencyGraph.rootPkg.name).toBe('./subproj');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj/subproj');
expect(result.meta!.gradleProjectName).toBe('root-proj/subproj');

const pkgs = result.dependencyGraph.getDepPkgs();
Expand Down Expand Up @@ -350,7 +350,7 @@ test('multi-project-dependency-cycle: scanning the main project works fine', asy
path.join(fixtureDir('multi-project-dependency-cycle'), 'build.gradle'),
{},
);
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('root-proj');
expect(result.meta!.gradleProjectName).toBe('root-proj');
expect(result.plugin.meta!.allSubProjectNames).toEqual(['subproj']);

Expand Down Expand Up @@ -544,7 +544,7 @@ test('multi-project: correct deps for subproject with the same name, one depende
),
);

expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('subproj');
expect(result.meta!.gradleProjectName).toBe('subproj');
expect(result.plugin.meta!.allSubProjectNames).toEqual([]);

Expand All @@ -570,7 +570,7 @@ test('multi-project: correct deps for subproject with the same name, one depende
{ subProject: 'subproj' },
);

expect(result.dependencyGraph.rootPkg.name).toBe('./subproj');
expect(result.dependencyGraph.rootPkg.name).toBe('subprojects-same-name/subproj');
expect(result.meta!.gradleProjectName).toBe('subprojects-same-name/subproj');
expect(result.plugin.meta!.allSubProjectNames).toEqual([
'greeter',
Expand Down Expand Up @@ -601,7 +601,7 @@ test('multi-project: correct deps for a nested subproject using --sub-project',
{ subProject: 'lib' },
);

expect(result.dependencyGraph.rootPkg.name).toBe('./greeter/lib');
expect(result.dependencyGraph.rootPkg.name).toBe('gradle-sandbox/greeter/lib');
expect(result.meta!.gradleProjectName).toBe('gradle-sandbox/greeter/lib');
expect(result.plugin.meta!.allSubProjectNames).toEqual([
'greeter',
Expand Down Expand Up @@ -630,7 +630,7 @@ test('multi-project shadow dep: process dependencies when a shadowed dep is used
{ subProject: 'module' },
);

expect(result.dependencyGraph.rootPkg.name).toBe('./module');
expect(result.dependencyGraph.rootPkg.name).toBe('test/module');
expect(result.meta!.gradleProjectName).toBe('test/module');
expect(result.plugin.meta!.allSubProjectNames).toEqual([
'module',
Expand Down
8 changes: 4 additions & 4 deletions test/system/plugin.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test('multi-config: both compile and runtime deps picked up by default', async (
path.join(fixtureDir('multi-config'), 'build.gradle'),
);

expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('multi-config');
expect(result.meta!.gradleProjectName).toBe('multi-config');

const pkgs = result.dependencyGraph.getDepPkgs();
Expand Down Expand Up @@ -83,7 +83,7 @@ test('multi-config: only deps for specified conf are picked up (precise match)',
path.join(fixtureDir('multi-config'), 'build.gradle'),
{ 'configuration-matching': '^compileClasspath$' },
);
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('multi-config');
expect(result.meta!.gradleProjectName).toBe('multi-config');

const pkgs = result.dependencyGraph.getDepPkgs();
Expand All @@ -109,7 +109,7 @@ test('multi-config: only deps for specified conf are picked up (fuzzy match)', a
path.join(fixtureDir('multi-config'), 'build.gradle'),
{ 'configuration-matching': 'pileclass' },
); // case-insensitive regexp matching "compileClasspath"
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('multi-config');
expect(result.meta!.gradleProjectName).toBe('multi-config');

const pkgs = result.dependencyGraph.getDepPkgs();
Expand All @@ -135,7 +135,7 @@ test('multi-config: only deps for specified conf are picked up (using legacy CLI
path.join(fixtureDir('multi-config'), 'build.gradle'),
{ args: ['--configuration', 'compileClasspath'] },
);
expect(result.dependencyGraph.rootPkg.name).toBe('.');
expect(result.dependencyGraph.rootPkg.name).toBe('multi-config');
expect(result.meta!.gradleProjectName).toBe('multi-config');
const pkgs = result.dependencyGraph.getDepPkgs();
const nodeIds: string[] = [];
Expand Down

0 comments on commit 5747284

Please sign in to comment.