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

enable gradle grpc devmode test #10906

Merged
merged 1 commit into from
Jul 23, 2020
Merged

enable gradle grpc devmode test #10906

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
4 changes: 1 addition & 3 deletions devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ public void execute(Task test) {

Task classesTask = tasks.getByName(JavaPlugin.CLASSES_TASK_NAME);
Task resourcesTask = tasks.getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME);
// TODO quarkusDev needs to depend on quarkusPrepare for code gen reload #10631
// TODO but it causes strange failures on other gradle tests
quarkusDev.dependsOn(classesTask, resourcesTask);
quarkusDev.dependsOn(classesTask, resourcesTask, quarkusPrepare);
quarkusRemoteDev.dependsOn(classesTask, resourcesTask);
quarkusBuild.dependsOn(classesTask, resourcesTask, tasks.getByName(JavaPlugin.JAR_TASK_NAME));

Expand Down
1 change: 0 additions & 1 deletion devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public void prepareQuarkus() {
appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(getProject()));

final AppModelResolver modelResolver = extension().getAppModelResolver();

final Properties realProperties = getBuildSystemProperties(appArtifact);

Path buildDir = getProject().getBuildDir().toPath();
Expand Down
48 changes: 24 additions & 24 deletions integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
//package io.quarkus.gradle.devmode;
//
//import static org.assertj.core.api.Assertions.assertThat;
//
//import com.google.common.collect.ImmutableMap;
// // TODO: to be uncommented with #10631
//public class GrpcDevModeTest extends QuarkusDevGradleTestBase {
// @Override
// protected String projectDirectoryName() {
// return "grpc-multi-module-project";
// }
//
// @Override
// protected void testDevMode() throws Exception {
// assertThat(getHttpResponse("/hello")).isEqualTo("hello 2");
//
// replace("application/src/main/proto/devmodetest.proto",
// ImmutableMap.of("TEST_ONE = 2;", "TEST_ONE = 15;"));
//
// Thread.sleep(1000);
//
// assertThat(getHttpResponse("/hello")).isEqualTo("hello 15");
// }
//}
package io.quarkus.gradle.devmode;

import static org.assertj.core.api.Assertions.assertThat;

import com.google.common.collect.ImmutableMap;

public class GrpcDevModeTest extends QuarkusDevGradleTestBase {
@Override
protected String projectDirectoryName() {
return "grpc-multi-module-project";
}

@Override
protected void testDevMode() throws Exception {
assertThat(getHttpResponse("/hello")).isEqualTo("hello 2");

replace("application/src/main/proto/devmodetest.proto",
ImmutableMap.of("TEST_ONE = 2;", "TEST_ONE = 15;"));

Thread.sleep(1000);

assertThat(getHttpResponse("/hello")).isEqualTo("hello 15");
}
}
4 changes: 2 additions & 2 deletions ...on-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ test {
forkEvery 1
}

quarkusDev {
quarkusPrepare {
Copy link
Member

@michalszynkiewicz michalszynkiewicz Jul 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@glefloch could you explain to me what this change does?

Copy link
Member Author

@glefloch glefloch Jul 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before we were specifying that quarkusDev must be run after the publish (or install) of the runtime and deployment module of this project.
Since quarkusPrepare is run before quarkusDev but needs these dependencies to build the AppModel, I change this to make the quarkusPrepare depends on the publish of the required module (which are not always dependencies like for the deploymentmodule)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense, thanks!

dependsOn 'publishAcmeExt'
}

task publishAcmeExt {
dependsOn ':runtime:publishToMavenLocal'
dependsOn ':deployment:publishToMavenLocal'
}
}