elharo commented on code in PR #313:
URL:
https://github.com/apache/maven-remote-resources-plugin/pull/313#discussion_r4288361842
##########
src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java:
##########
@@ -346,69 +398,36 @@ private static void assertContainsInOrder(String actual,
List<String> expected)
int fromIndex = 0;
for (String s : expected) {
int idx = actual.indexOf(s, fromIndex);
- assertTrue("expected \"" + s + "\" to occur in order in: " +
actual, idx >= 0);
+ assertTrue(idx >= 0, "expected \"" + s + "\" to occur in order in:
" + actual);
fromIndex = idx + s.length();
}
}
- protected MavenProjectResourcesStub createTestProject(final String
testName) throws Exception {
+ private MavenProjectResourcesStub createTestProject(final String testName)
throws Exception {
// this will automatically create the isolated
// test environment
return new MavenProjectResourcesStub(testName);
}
- protected void setupDefaultProject(final MavenProjectResourcesStub
project) throws Exception {
+ private void setupDefaultProject(final MavenProjectResourcesStub project)
throws Exception {
// put this on the root dir
project.addFile("pom.xml", MavenProjectBuildStub.ROOT_FILE);
project.setInceptionYear("2007");
// start creating the environment
project.setupBuildEnvironment();
}
- protected BundleRemoteResourcesMojo lookupBundleMojo() throws Exception {
- File pomFile = new File(getBasedir(), DEFAULT_BUNDLE_POM_PATH);
- BundleRemoteResourcesMojo mojo = (BundleRemoteResourcesMojo)
lookupMojo("bundle", pomFile);
-
- assertNotNull(mojo);
-
- return mojo;
- }
-
- protected BundleRemoteResourcesMojo
lookupBundleMojoWithDefaultSettings(final MavenProject project)
+ private void configureBundleMojo(
+ BundleRemoteResourcesMojo mojo, MavenProject project, File
resourceDir, String sourceEncoding)
throws Exception {
- File resourceDir = new File(project.getBasedir() +
"/src/main/resources");
- return lookupBundleMojoWithSettings(project, resourceDir, null);
- }
-
- protected BundleRemoteResourcesMojo lookupBundleMojoWithSettings(
- final MavenProject project, File resourceDir, String
sourceEncoding) throws Exception {
- final BundleRemoteResourcesMojo mojo = lookupBundleMojo();
-
setVariableValueToObject(mojo, "resourcesDirectory", resourceDir);
setVariableValueToObject(
mojo, "outputDirectory", new
File(project.getBuild().getOutputDirectory()));
setVariableValueToObject(mojo, "sourceEncoding", sourceEncoding);
- return mojo;
}
- protected ProcessRemoteResourcesMojo lookupProcessMojo() throws Exception {
- File pomFile = new File(getBasedir(), DEFAULT_PROCESS_POM_PATH);
- ProcessRemoteResourcesMojo mojo = (ProcessRemoteResourcesMojo)
lookupMojo("process", pomFile);
-
- assertNotNull(mojo);
-
- return mojo;
- }
-
- protected ProcessRemoteResourcesMojo lookupProcessMojoWithSettings(final
MavenProject project, String[] bundles)
+ private void configureProcessMojo(ProcessRemoteResourcesMojo mojo,
MavenProject project, List<String> bundles)
throws Exception {
- return lookupProcessMojoWithSettings(project, new
ArrayList<>(Arrays.asList(bundles)));
- }
-
- protected ProcessRemoteResourcesMojo lookupProcessMojoWithSettings(
- final MavenProject project, ArrayList<String> bundles) throws
Exception {
- final ProcessRemoteResourcesMojo mojo = lookupProcessMojo();
-
DefaultRepositorySystemSession reposession =
MavenRepositorySystemUtils.newSession();
Review Comment:
Done in 1a64973 — the test class is now @MojoTest(realRepositorySession =
true) and the manual RepositorySystemSession is gone.
##########
src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java:
##########
@@ -426,21 +445,14 @@ protected ProcessRemoteResourcesMojo
lookupProcessMojoWithSettings(
localRepository.setUrl(new File(LOCAL_REPO).toURI().toASCIIString());
localRepository.setLayout(new DefaultRepositoryLayout());
request.setLocalRepository(localRepository);
- MavenSession session =
- new MavenSession(getContainer(), reposession, request, new
DefaultMavenExecutionResult());
+ MavenSession session = new MavenSession(container, reposession,
request, new DefaultMavenExecutionResult());
Review Comment:
Done in 1a64973 — the MavenSession is now injected from the extension
(@Inject MavenSession session) and the hand-built one was removed.
##########
src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java:
##########
@@ -44,54 +48,63 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.resources.remote.stub.MavenProjectBuildStub;
import org.apache.maven.plugin.resources.remote.stub.MavenProjectResourcesStub;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
+import org.junit.jupiter.api.Test;
+
+import static
org.apache.maven.api.plugin.testing.MojoExtension.getVariableValueFromObject;
+import static
org.apache.maven.api.plugin.testing.MojoExtension.setVariableValueToObject;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* RemoteResources plugin Test Case
*/
-public class RemoteResourcesMojoTest extends AbstractMojoTestCase {
+@MojoTest
+class RemoteResourcesMojoTest {
static final String DEFAULT_BUNDLE_POM_PATH =
"target/test-classes/unit/rrmojotest/bundle-plugin-config.xml";
static final String DEFAULT_PROCESS_POM_PATH =
"target/test-classes/unit/rrmojotest/process-plugin-config.xml";
private static final String LOCAL_REPO = "target/local-repo/";
Review Comment:
Done in 1a64973 — the local repository now uses a per-test JUnit 5 @TempDir,
wired into the session via
session.getRequest().setLocalRepositoryPath(localRepo).
##########
src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java:
##########
@@ -292,12 +335,13 @@ public void testFilteredBundlesWithProjectProperties()
throws Exception {
assertTrue(data.contains("rules"));
}
- protected void buildResourceBundle(String id, String sourceEncoding,
String[] resourceNames, File jarName)
+ private void buildResourceBundle(
+ BundleRemoteResourcesMojo mojo, String id, String sourceEncoding,
String[] resourceNames, File jarName)
throws Exception {
final MavenProjectResourcesStub project = createTestProject(id);
final File resourceDir = new File(project.getBasedir() +
"/src/main/resources");
Review Comment:
Done in 1a64973 — paths are now built with File(parent, child) and
File.separator.
##########
src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java:
##########
@@ -346,69 +390,36 @@ private static void assertContainsInOrder(String actual,
List<String> expected)
int fromIndex = 0;
for (String s : expected) {
int idx = actual.indexOf(s, fromIndex);
- assertTrue("expected \"" + s + "\" to occur in order in: " +
actual, idx >= 0);
+ assertTrue(idx >= 0, "expected \"" + s + "\" to occur in order in:
" + actual);
fromIndex = idx + s.length();
}
}
- protected MavenProjectResourcesStub createTestProject(final String
testName) throws Exception {
+ private MavenProjectResourcesStub createTestProject(final String testName)
throws Exception {
// this will automatically create the isolated
// test environment
return new MavenProjectResourcesStub(testName);
}
- protected void setupDefaultProject(final MavenProjectResourcesStub
project) throws Exception {
+ private void setupDefaultProject(final MavenProjectResourcesStub project)
throws Exception {
// put this on the root dir
project.addFile("pom.xml", MavenProjectBuildStub.ROOT_FILE);
project.setInceptionYear("2007");
// start creating the environment
project.setupBuildEnvironment();
}
- protected BundleRemoteResourcesMojo lookupBundleMojo() throws Exception {
- File pomFile = new File(getBasedir(), DEFAULT_BUNDLE_POM_PATH);
- BundleRemoteResourcesMojo mojo = (BundleRemoteResourcesMojo)
lookupMojo("bundle", pomFile);
-
- assertNotNull(mojo);
-
- return mojo;
- }
-
- protected BundleRemoteResourcesMojo
lookupBundleMojoWithDefaultSettings(final MavenProject project)
+ private void configureBundleMojo(
+ BundleRemoteResourcesMojo mojo, MavenProject project, File
resourceDir, String sourceEncoding)
throws Exception {
- File resourceDir = new File(project.getBasedir() +
"/src/main/resources");
- return lookupBundleMojoWithSettings(project, resourceDir, null);
- }
-
- protected BundleRemoteResourcesMojo lookupBundleMojoWithSettings(
- final MavenProject project, File resourceDir, String
sourceEncoding) throws Exception {
- final BundleRemoteResourcesMojo mojo = lookupBundleMojo();
-
setVariableValueToObject(mojo, "resourcesDirectory", resourceDir);
setVariableValueToObject(
mojo, "outputDirectory", new
File(project.getBuild().getOutputDirectory()));
setVariableValueToObject(mojo, "sourceEncoding", sourceEncoding);
- return mojo;
}
- protected ProcessRemoteResourcesMojo lookupProcessMojo() throws Exception {
- File pomFile = new File(getBasedir(), DEFAULT_PROCESS_POM_PATH);
- ProcessRemoteResourcesMojo mojo = (ProcessRemoteResourcesMojo)
lookupMojo("process", pomFile);
-
- assertNotNull(mojo);
-
- return mojo;
- }
-
- protected ProcessRemoteResourcesMojo lookupProcessMojoWithSettings(final
MavenProject project, String[] bundles)
+ private void configureProcessMojo(ProcessRemoteResourcesMojo mojo,
MavenProject project, ArrayList<String> bundles)
Review Comment:
Applied in 1d1b5a4 — the parameter is now List<String>.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
