Skip to content

Commit 9fa9164

Browse files
committed
Fixs tests
1 parent 2f9cfce commit 9fa9164

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

spring-scaffold-cli/src/main/java/br/com/command/template/TemplateHandler.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import br.com.generator.core.GeneratorOptions;
55
import br.com.templates_java.ComposeTemplate;
66
import br.com.templates_java.config.jms_aws_sqs.*;
7+
import br.com.templates_java.config.openj9.OpenJ9DockerfileGenerator;
78
import joptsimple.OptionSet;
89
import joptsimple.OptionSpec;
910
import org.springframework.boot.cli.command.options.OptionHandler;
1011
import org.springframework.boot.cli.command.status.ExitStatus;
1112

1213
import java.io.IOException;
1314
import java.net.URISyntaxException;
14-
import java.util.Collections;
1515
import java.util.HashMap;
1616
import java.util.List;
1717

@@ -55,6 +55,21 @@ private ExitStatus executeTemplate(String template) {
5555
if (template.equals("jms-aws-sqs")) {
5656
return generateJmsAwsSQS();
5757
}
58+
if (template.equals("openj9")) {
59+
return generateOpenJ9();
60+
}
61+
return ExitStatus.OK;
62+
}
63+
64+
private ExitStatus generateOpenJ9() {
65+
try {
66+
GeneratorOptions generatorOptions = new GeneratorOptions();
67+
generatorOptions.setDestination(scaffoldInfo.getUserDir().concat("/deploy"));
68+
ComposeTemplate.runAll(scaffoldInfo.getPathPackage(), asList(new OpenJ9DockerfileGenerator(generatorOptions)));
69+
} catch (Exception e) {
70+
System.out.println("ERROR: ".concat(e.getMessage()));
71+
return ExitStatus.ERROR;
72+
}
5873
return ExitStatus.OK;
5974
}
6075

spring-scaffold-cli/src/test/java/br/com/command/template/TemplateHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ public void givenArgumentList_shoudListTemplates() throws Exception {
6565
@Test
6666
public void givenOpenJ9_shouldReturnOk() throws Exception {
6767
ScaffoldInfoHelper scaffoldInfoHelper = mock(ScaffoldInfoHelper.class);
68+
Mockito.when(scaffoldInfoHelper.getUserDir()).thenReturn(temporaryPath.getAbsolutePath());
6869

6970
TemplateHandler templateHandler = new TemplateHandler(scaffoldInfoHelper);
7071
ExitStatus exitStatus = templateHandler.run("-t", "openj9");
7172
assertEquals(ExitStatus.OK, exitStatus);
7273
}
7374

74-
7575
@Test
7676
public void givenOpenJ9_shouldCreateDockerfile() throws Exception {
7777
ScaffoldInfoHelper scaffoldInfoHelper = mock(ScaffoldInfoHelper.class);

0 commit comments

Comments
 (0)