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

Jump to bottom

Fix/test with gradle #21

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Fix/test with gradle #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cc44ac7
Validates the provided or default config file exist and is readable, …
marcuss Mar 21, 2021
0d1e60b
Bump version of the project.
marcuss Mar 21, 2021
ef482f4
Add new goal validate-config to check the config file is present and …
marcuss Apr 8, 2021
e83e9ed
Add new goal validate-config to check the config file is present and …
marcuss Apr 8, 2021
45ec0c3
Update README.md
marcuss Apr 8, 2021
79f2a63
rolled back minor change.
marcuss Apr 23, 2021
50c7d21
Merge branch 'issue-5' of github.com:marcuss/appmap-maven-plugin into…
marcuss Apr 23, 2021
d8c4028
Merge branch 'master' into issue-5
marcuss Apr 23, 2021
fe52eed
fix: Fixed build problems.
marcuss May 8, 2021
d1e8f30
fix: Fixed build problems.
marcuss May 8, 2021
5aed198
fix: Fixed build problems.
marcuss May 8, 2021
801ade1
fix: Rely only on Gradle for testing
dustinbyrne May 21, 2021
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
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ task generatePluginDescriptor(type: JavaExec, dependsOn: compileJava) {
appendNode('directory', directory)
appendNode('outputDirectory', outputDirectory)
}
asNode().appendNode('version', paramVersion)
Copy link
Contributor

Choose a reason for hiding this comment

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

@dustinbyrne what's fixed by doing this?

}
.writeTo(pomFile)

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/appland/appmap/GoalLoadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ public class GoalLoadTest extends AbstractMojoTestCase {

@Test
public void testPrepareAgentGoalIsLoadedCorrectly() throws Exception {
File pluginPom = new File("target/test-classes/test-project2/pom.xml");
File pluginPom = new File("build/resources/test/test-project2/pom.xml");
LoadJavaAppMapAgentMojo mojo = (LoadJavaAppMapAgentMojo) lookupMojo("prepare-agent", pluginPom);
assertNotNull(mojo);
}

@Test
public void testValidateConfigGoalIsLoadedCorrectly() throws Exception {
File pluginPom = new File("target/test-classes/test-project2/pom.xml");
File pluginPom = new File("build/resources/test/test-project2/pom.xml");
ValidateConfigMojo mojo = (ValidateConfigMojo) lookupMojo("validate-config", pluginPom);
assertNotNull(mojo);
}
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/appland/appmap/PluginLoadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void testMojoCanBeInstantiated()
Mojo mojo = rule.configureMojo(
new LoadJavaAppMapAgentMojo(),
"appmap-maven-plugin",
new File("target/test-classes/test-project/pom.xml")
new File("build/resources/test/test-project/pom.xml")
);
assertNotNull(mojo);
}
Expand All @@ -42,7 +42,7 @@ public void testMojoIsLoaded() throws Exception {
rule.configureMojo(
new LoadJavaAppMapAgentMojo(),
"appmap-maven-plugin",
new File("target/test-classes/test-project/pom.xml")
new File("build/resources/test/test-project/pom.xml")
);
assertNotNull(mojo);
}
Expand All @@ -53,12 +53,12 @@ public void testMojoFailsWithMissingDefaultConfigFile() throws Exception {
rule.configureMojo(
new LoadJavaAppMapAgentMojo(),
"appmap-maven-plugin",
new File("target/test-classes/test-project/pom.xml")
new File("build/resources/test/test-project/pom.xml")
);
assertNotNull(mojo);
Exception exception = assertThrows(
MojoExecutionException.class,
() -> rule.executeMojo(new File("target/test-classes/test-project/"), "prepare-agent")
() -> rule.executeMojo(new File("build/resources/test/test-project/"), "prepare-agent")
);
assertTrue(exception.getCause() instanceof FileNotFoundException);
}
Expand All @@ -69,12 +69,12 @@ public void testMojoFailsWithNotExistingConfigFile() throws Exception {
rule.configureMojo(
new LoadJavaAppMapAgentMojo(),
"appmap-maven-plugin",
new File("target/test-classes/test-project/nonexistent_config_file_pom.xml")
new File("build/resources/test/test-project/nonexistent_config_file_pom.xml")
);
assertNotNull(mojo);
Exception exception = assertThrows(
MojoExecutionException.class,
() -> rule.executeMojo(new File("target/test-classes/test-project/"), "prepare-agent")
() -> rule.executeMojo(new File("build/resources/test/test-project/"), "prepare-agent")
);
assertTrue(exception.getCause() instanceof FileNotFoundException);
}
Expand Down