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.

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

Fix quarkus-picocli tests with native mode #2043

Merged
merged 2 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions quarkus-picocli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@
<groupId>io.quarkus.ts.qe</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>quarkus-picocli</artifactId>
<name>Quarkus QE TS: Quarkus Picocli</name>
<packaging>jar</packaging>
<properties>
<!-- Skip build since our framework will build own executable anyway -->
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
import io.quarkus.ts.qe.command.OtherEntryCommand;

@ApplicationScoped
public class Config {
public class Configuration {

@Produces
@TopCommand
@IfBuildProfile("dev")
public Object devCommand() {
@IfBuildProfile("test")
public Class<EntryCommand> devCommand() {
return EntryCommand.class;
}

@Produces
@TopCommand
@IfBuildProfile("prod")
public Object prodCommand() {
public Class<OtherEntryCommand> prodCommand() {
return OtherEntryCommand.class;
}

}
}
102 changes: 0 additions & 102 deletions quarkus-picocli/src/test/java/PicocliDevIT.java

This file was deleted.

31 changes: 0 additions & 31 deletions quarkus-picocli/src/test/java/PicocliProdIT.java

This file was deleted.

30 changes: 30 additions & 0 deletions quarkus-picocli/src/test/java/PicocliProfileProdIT.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import org.junit.jupiter.api.Test;

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.services.QuarkusApplication;
import io.quarkus.ts.qe.command.AgeCommand;
import io.quarkus.ts.qe.command.CommonOptions;
import io.quarkus.ts.qe.command.EntryCommand;
import io.quarkus.ts.qe.command.HelloCommand;
import io.quarkus.ts.qe.command.OtherCommand;
import io.quarkus.ts.qe.command.OtherEntryCommand;
import io.quarkus.ts.qe.configuration.Configuration;
import io.quarkus.ts.qe.services.AgeService;
import io.quarkus.ts.qe.services.HelloService;

@QuarkusScenario
public class PicocliProfileProdIT {

@QuarkusApplication(classes = { AgeCommand.class, CommonOptions.class, EntryCommand.class, HelloCommand.class,
OtherCommand.class, OtherEntryCommand.class,
Configuration.class, AgeService.class, HelloService.class }, properties = "prod.properties")
static final RestService customized = new RestService()
.withProperty("quarkus.args", "start -t 60 -v");

@Test
public void verifyCustomizedCommandLineBehavior() {
String expectedOutput = "Service started with timeout: 60 and verbosity";
customized.logs().assertContains(expectedOutput);
}
}
69 changes: 69 additions & 0 deletions quarkus-picocli/src/test/java/PicocliProfileTestIT.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.services.QuarkusApplication;
import io.quarkus.ts.qe.command.AgeCommand;
import io.quarkus.ts.qe.command.CommonOptions;
import io.quarkus.ts.qe.command.EntryCommand;
import io.quarkus.ts.qe.command.HelloCommand;
import io.quarkus.ts.qe.command.OtherCommand;
import io.quarkus.ts.qe.command.OtherEntryCommand;
import io.quarkus.ts.qe.configuration.Configuration;
import io.quarkus.ts.qe.services.AgeService;
import io.quarkus.ts.qe.services.HelloService;

@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
jcarranzan marked this conversation as resolved.
Show resolved Hide resolved
@QuarkusScenario
public class PicocliProfileTestIT {

@QuarkusApplication(classes = { AgeCommand.class, CommonOptions.class, EntryCommand.class, HelloCommand.class,
OtherCommand.class, OtherEntryCommand.class,
Configuration.class, AgeService.class, HelloService.class }, properties = "test.properties")
static final RestService app = new RestService().withProperty("quarkus.args", "age --age 30");
jcarranzan marked this conversation as resolved.
Show resolved Hide resolved

@Order(1)
@Test
public void verifyErrorForApplicationScopedBeanInPicocliCommand() {
app.logs().assertContains("CDI: programmatic lookup problem detected");
}

@Order(2)
@Test
public void verifyGreetingCommandOutputsExpectedMessage() {
app.withProperty("quarkus.args", "greeting --name QE");
app.restart();
app.logs().assertContains("Hello QE!");
}

@Order(3)
@Test
void verifyErrorForBlankArgumentsInGreetingCommand() {
app.withProperty("quarkus.args", " --name QE");
app.restart();
app.logs().assertContains("Unmatched arguments from index 0: '', '--name', 'QE'");
}

@Order(4)
@Test
void verifyErrorForInvalidArgumentsInGreetingCommand() {
app.withProperty("quarkus.args", "greeting -x QE");
app.restart();
app.logs().assertContains("Unknown options: '-x', 'QE'");
}

/**
* Chain Commands in a Single Execution is not possible
*/
@Order(5)
@Test
public void verifyErrorForMultipleCommandsWithoutTopCommand() {
app.withProperty("quarkus.args", "greeting --name EEUU age --age 247");
app.restart();
app.logs().assertContains("Unmatched arguments from index 3: 'age', '--age', '247'");
}

}
1 change: 0 additions & 1 deletion quarkus-picocli/src/test/resources/dev.properties

This file was deleted.

1 change: 1 addition & 0 deletions quarkus-picocli/src/test/resources/test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
quarkus.profile=test