Skip to content

WIP: referring to items in local catalogs #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
quintesse wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

WIP: referring to items in local catalogs #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4c96b7
test: added tests for issue #1309
quintesse Mar 16, 2022
97898f4
Merge branch 'main' into fix_1309
maxandersen May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/test/java/dev/jbang/cli/TestAlias.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,4 +543,44 @@ void testGetAliasLoop() throws IOException {

}

@Test
void testGetAliasFromLocalCatalog() throws IOException {
Path aliasesFile = jbangTempDir.resolve("aliases.json");
Files.write(aliasesFile, aliases.getBytes());

String cat = "{\n" +
" \"catalogs\": {\n" +
" \"local\": {\n" +
" \"catalog-ref\": \"" + aliasesFile + "\"\n" +
" }\n" +
" }\n" +
"}";
Path catFile = jbangTempDir.resolve(Catalog.JBANG_CATALOG_JSON);
Files.write(catFile, cat.getBytes());

assertThat(Alias.get("one@local"), notNullValue());
assertThat(Alias.get("one"), notNullValue());
}

@Test
void testGetAliasFromImplicitCatalog() throws IOException {
Path catFile = jbangTempDir.resolve(Catalog.JBANG_CATALOG_JSON);
Util.deletePath(catFile, true);
Path aliasesFile = jbangTempDir.resolve("aliases.json");
Files.write(aliasesFile, aliases.getBytes());

String cat = "{\n" +
" \"catalogs\": {\n" +
" \"local\": {\n" +
" \"catalog-ref\": \"" + aliasesFile + "\"\n" +
" }\n" +
" }\n" +
"}";
Path implicitCatFile = Settings.getUserImplicitCatalogFile();
Files.write(implicitCatFile, cat.getBytes());

assertThat(Alias.get("one@local"), notNullValue());
assertThat(Alias.get("one"), nullValue());
}

}
40 changes: 40 additions & 0 deletions src/test/java/dev/jbang/cli/TestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,44 @@ void testAddWithMultipleComplexProperties() throws IOException {
entry("second-test-key", new TemplateProperty(
"This is another description for the second property key", "Non-Blocker"))));
}

@Test
void testGetTemplateFromLocalCatalog() throws IOException {
Path templatesFile = jbangTempDir.resolve("templates.json");
Files.write(templatesFile, templates.getBytes());

String cat = "{\n" +
" \"catalogs\": {\n" +
" \"local\": {\n" +
" \"catalog-ref\": \"" + templatesFile + "\"\n" +
" }\n" +
" }\n" +
"}";
Path catFile = jbangTempDir.resolve(Catalog.JBANG_CATALOG_JSON);
Files.write(catFile, cat.getBytes());

assertThat(Template.get("one@local"), notNullValue());
assertThat(Template.get("one"), notNullValue());
}

@Test
void testGetAliasFromImplicitCatalog() throws IOException {
Path catFile = jbangTempDir.resolve(Catalog.JBANG_CATALOG_JSON);
Util.deletePath(catFile, true);
Path templatesFile = jbangTempDir.resolve("templates.json");
Files.write(templatesFile, templates.getBytes());

String cat = "{\n" +
" \"catalogs\": {\n" +
" \"local\": {\n" +
" \"catalog-ref\": \"" + templatesFile + "\"\n" +
" }\n" +
" }\n" +
"}";
Path implicitCatFile = Settings.getUserImplicitCatalogFile();
Files.write(implicitCatFile, cat.getBytes());

assertThat(Template.get("one@local"), notNullValue());
assertThat(Template.get("one"), nullValue());
}
}
Loading