You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/09/27 15:24:11 UTC
[maven-ear-plugin] branch mear-281 created (now e8d94bf)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch mear-281
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.
at e8d94bf set namespace aware
This branch includes the following new commits:
new e8d94bf set namespace aware
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-ear-plugin] 01/01: set namespace aware
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch mear-281
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit e8d94bfaadd5c8891cf3523eb009af21caf2aee2
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Sep 27 11:23:52 2020 -0400
set namespace aware
---
.../maven/plugins/ear/it/AbstractEarPluginIT.java | 45 +++++++++-------------
1 file changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
index 8b6d758..d30599f 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
@@ -29,6 +29,7 @@ import java.util.Properties;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import junit.framework.TestCase;
@@ -38,6 +39,7 @@ import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.plugins.ear.util.ResourceEntityResolver;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -49,33 +51,26 @@ public abstract class AbstractEarPluginIT
extends TestCase
{
- protected final String FINAL_NAME_PREFIX = "maven-ear-plugin-test-";
+ private final String FINAL_NAME_PREFIX = "maven-ear-plugin-test-";
- protected final String FINAL_NAME_SUFFIX = "-99.0";
+ private final String FINAL_NAME_SUFFIX = "-99.0";
/**
* The base directory.
*/
private File basedir;
- /**
- * Test repository directory.
- */
- protected File localRepositoryDir = new File( getBasedir().getAbsolutePath(), "target/test-classes/m2repo" );
-
- protected File settingsFile = new File( getBasedir().getAbsolutePath(), "target/test-classes/settings.xml" );
+ private File settingsFile = new File( getBasedir().getAbsolutePath(), "target/test-classes/settings.xml" );
/**
* Execute the EAR plugin for the specified project.
*
* @param projectName the name of the project
* @param properties extra properties to be used by the embedder
- * @param expectNoError true/flase.
+ * @param expectNoError true/false
* @return the base directory of the project
- * @throws Exception if an error occurred
*/
- protected File executeMojo( final String projectName, final Properties properties, boolean expectNoError )
- throws Exception
+ protected File executeMojo( final String projectName, final Properties properties, boolean expectNoError ) throws VerificationException, IOException
{
System.out.println( " Building: " + projectName );
@@ -120,10 +115,9 @@ public abstract class AbstractEarPluginIT
* @param projectName the name of the project
* @param properties extra properties to be used by the embedder
* @return the base directory of the project
- * @throws Exception if an error occurred
*/
protected File executeMojo( final String projectName, final Properties properties )
- throws Exception
+ throws VerificationException, IOException
{
return executeMojo( projectName, properties, true );
}
@@ -135,11 +129,10 @@ public abstract class AbstractEarPluginIT
* @param expectedArtifacts the list of artifacts to be found in the EAR archive
* @param artifactsDirectory whether the artifact is an exploded artifactsDirectory or not
* @return the base directory of the project
- * @throws Exception Mojo exception in case of an error
*/
protected File doTestProject( final String projectName, final String[] expectedArtifacts,
final boolean[] artifactsDirectory )
- throws Exception
+ throws VerificationException, IOException
{
final File baseDir = executeMojo( projectName, new Properties() );
assertEarArchive( baseDir, projectName );
@@ -160,11 +153,10 @@ public abstract class AbstractEarPluginIT
* @param expectedArtifacts the list of artifacts to be found in the EAR archive
* @param testDeploymentDescriptors whether we should test deployment descriptors
* @return the base directory of the project
- * @throws Exception Mojo exception in case of an error.
*/
- protected File doTestProject( final String projectName, final String[] expectedArtifacts,
- boolean testDeploymentDescriptors )
- throws Exception
+ private File doTestProject( final String projectName, final String[] expectedArtifacts,
+ boolean testDeploymentDescriptors )
+ throws VerificationException, IOException
{
return doTestProject( projectName, expectedArtifacts, new boolean[expectedArtifacts.length] );
}
@@ -214,7 +206,7 @@ public abstract class AbstractEarPluginIT
return FINAL_NAME_PREFIX + projectName + FINAL_NAME_SUFFIX;
}
- protected void assertArchiveContent( final File baseDir, final String projectName, final String[] artifactNames,
+ private void assertArchiveContent( final File baseDir, final String projectName, final String[] artifactNames,
final boolean[] artifactsDirectory )
{
// sanity check
@@ -248,7 +240,7 @@ public abstract class AbstractEarPluginIT
}
}
- protected List<File> buildArchiveContentFiles( final File baseDir, final List<File> expectedDirectories )
+ private static List<File> buildArchiveContentFiles( final File baseDir, final List<File> expectedDirectories )
{
final List<File> result = new ArrayList<File>();
addFiles( baseDir, result, expectedDirectories );
@@ -256,7 +248,7 @@ public abstract class AbstractEarPluginIT
return result;
}
- private void addFiles( final File directory, final List<File> files, final List<File> expectedDirectories )
+ private static void addFiles( final File directory, final List<File> files, final List<File> expectedDirectories )
{
File[] result = directory.listFiles( new FilenameFilter()
{
@@ -289,7 +281,7 @@ public abstract class AbstractEarPluginIT
}
}
- protected File getBasedir()
+ private File getBasedir()
{
if ( basedir != null )
{
@@ -361,6 +353,7 @@ public abstract class AbstractEarPluginIT
try
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware( true );
dbf.setValidating( true );
DocumentBuilder docBuilder = dbf.newDocumentBuilder();
docBuilder.setEntityResolver( new ResourceEntityResolver() );
@@ -372,7 +365,7 @@ public abstract class AbstractEarPluginIT
XMLAssert.assertXMLEqual( "Wrong deployment descriptor generated for["
+ expectedDeploymentDescriptor.getName() + "]", myDiff, true );
}
- catch ( Exception e )
+ catch ( SAXException | ParserConfigurationException e )
{
e.printStackTrace();
fail( "Could not assert deployment descriptor " + e.getMessage() );
@@ -381,7 +374,7 @@ public abstract class AbstractEarPluginIT
}
}
- private File[] getDeploymentDescriptors( final File ddDirectory )
+ private static File[] getDeploymentDescriptors( final File ddDirectory )
{
return ddDirectory.listFiles( new FilenameFilter()
{