Author: dennisl
Date: Wed Feb 8 22:45:33 2012
New Revision: 1242159
URL: http://svn.apache.org/viewvc?rev=1242159&view=rev
Log:
Add checks to the ITs for the encoding attribute in the generated changelog-xml
files.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/pom.xml
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/pom.xml?rev=1242159&r1=1242158&r2=1242159&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/pom.xml
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/pom.xml
Wed Feb 8 22:45:33 2012
@@ -57,9 +57,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<version>@pom.version@</version>
- <configuration>
+ <configuration>
<outputEncoding>UTF-8</outputEncoding>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</reporting>
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh?rev=1242159&r1=1242158&r2=1242159&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh
Wed Feb 8 22:45:33 2012
@@ -1,9 +1,18 @@
import java.io.*;
import java.util.*;
import java.util.regex.*;
+import org.codehaus.plexus.util.FileUtils;
try
{
+ File outputXML = new File( basedir, "target/changelog.xml" );
+ System.out.println( "Checking for existence of xml file: " + outputXML );
+ String content = FileUtils.fileRead( outputXML, "UTF-8" );
+ if ( content.indexOf( "encoding=\"UTF-8\"" ) < 0 )
+ {
+ throw new IOException( "Wrong encoding attribute in content." );
+ }
+
File siteDir = new File( basedir, "target/site" );
System.out.println( "Checking for existence of site directory: " + siteDir
);
if ( !siteDir.isDirectory() )
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh?rev=1242159&r1=1242158&r2=1242159&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh
(original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh
Wed Feb 8 22:45:33 2012
@@ -1,9 +1,18 @@
import java.io.*;
import java.util.*;
import java.util.regex.*;
+import org.codehaus.plexus.util.FileUtils;
try
{
+ File outputXML = new File( basedir, "target/changelog.xml" );
+ System.out.println( "Checking for existence of xml file: " + outputXML );
+ String content = FileUtils.fileRead( outputXML, "ISO-8859-1" );
+ if ( content.indexOf( "encoding=\"ISO-8859-1\"" ) < 0 )
+ {
+ throw new IOException( "Wrong encoding attribute in content." );
+ }
+
File siteDir = new File( basedir, "target/site" );
System.out.println( "Checking for existence of site directory: " + siteDir
);
if ( !siteDir.isDirectory() )
