Skip to content
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

Rename example json #176

Merged
merged 1 commit into from
Nov 7, 2021
Merged

Rename example json #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...jhipster/forge/generator/buildtool/maven/infrastructure/primary/rest/MavenResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MavenResourceIT {

@Test
void shouldInit() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand All @@ -46,7 +46,7 @@ void shouldInit() throws Exception {

@Test
void shouldAddPomXml() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand All @@ -67,7 +67,7 @@ void shouldAddPomXml() throws Exception {

@Test
void shouldAddMavenWrapper() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/tech/jhipster/forge/generator/init/infrastructure/primary/rest/InitResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class InitResourceIT {

@Test
void shouldInit() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/init.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand All @@ -39,7 +39,7 @@ void shouldInit() throws Exception {
Project project = ProjectDTO.toProject(projectDTO);
assertFilesInit(project);
assertFileContent(project, "README.md", "Chips Project");
assertFileContent(project, ".prettierrc", "tabWidth: 4");
assertFileContent(project, ".prettierrc", "tabWidth: 2");
assertFileContent(project, "package.json", "chips");
}
}
2 changes: 1 addition & 1 deletion ...er/forge/generator/server/javatool/error/infrastructure/primary/rest/ErrorResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ErrorResourceIT {

@Test
void shouldInit() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand Down
2 changes: 1 addition & 1 deletion ...ge/generator/server/springboot/core/infrastructure/primary/rest/SpringBootResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SpringBootResourceIT {

@Test
void shouldAddSpringBoot() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/springboot.json", ProjectDTO.class).folder(tmpDirForTest());
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class).folder(tmpDirForTest());
Project project = ProjectDTO.toProject(projectDTO);
initApplicationService.init(project);
mavenApplicationService.init(project);
Expand Down
2 changes: 1 addition & 1 deletion ...generator/server/springboot/database/psql/infrastructure/primary/rest/PsqlResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class PsqlResourceIT {

@Test
void shouldInit() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand Down
2 changes: 1 addition & 1 deletion ...ver/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class LiquibaseResourceIT {

@Test
void shouldInit() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/maven.json", ProjectDTO.class);
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
if (projectDTO == null) {
throw new GeneratorException("Error when reading file");
}
Expand Down
4 changes: 2 additions & 2 deletions .../generator/server/springboot/web/infrastructure/primary/rest/SpringBootWebResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SpringBootWebResourceIT {

@Test
void shouldAddSpringBootWeb() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/springboot.json", ProjectDTO.class).folder(tmpDirForTest());
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class).folder(tmpDirForTest());
Project project = ProjectDTO.toProject(projectDTO);
initApplicationService.init(project);
mavenApplicationService.init(project);
Expand Down Expand Up @@ -67,7 +67,7 @@ void shouldAddSpringBootWeb() throws Exception {

@Test
void shouldAddSpringBootUndertow() throws Exception {
ProjectDTO projectDTO = TestUtils.readFileToObject("json/springboot.json", ProjectDTO.class).folder(tmpDirForTest());
ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class).folder(tmpDirForTest());
Project project = ProjectDTO.toProject(projectDTO);
initApplicationService.init(project);
mavenApplicationService.init(project);
Expand Down
0 src/test/resources/json/maven.json → src/test/resources/json/chips.json
View file
Open in desktop
File renamed without changes.
8 changes: 0 additions & 8 deletions src/test/resources/json/init.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/test/resources/json/springboot.json
View file
Open in desktop

This file was deleted.