Author: bentmann
Date: Fri Feb 20 22:55:44 2009
New Revision: 746407
URL: http://svn.apache.org/viewvc?rev=746407&view=rev
Log:
o Updated tests to use non-deprecated API
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java?rev=746407&r1=746406&r2=746407&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
Fri Feb 20 22:55:44 2009
@@ -23,6 +23,7 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.codehaus.plexus.component.repository.ComponentDependency;
import org.codehaus.plexus.util.FileUtils;
@@ -91,7 +92,7 @@
FileUtils.deleteDirectory( destinationDirectory );
destinationDirectory.mkdir();
- generator.execute( destinationDirectory, pluginDescriptor );
+ generator.execute( destinationDirectory, new
DefaultPluginToolsRequest( null, pluginDescriptor ) );
validate( destinationDirectory );
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java?rev=746407&r1=746406&r2=746407&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
Fri Feb 20 22:55:44 2009
@@ -26,34 +26,5 @@
public class PluginHelpGeneratorTest
extends AbstractGeneratorTestCase
{
- public void testToText()
- throws Exception
- {
- String javadoc = null;
- assertEquals( "", PluginHelpGenerator.toText( javadoc ) );
- javadoc = "";
- assertEquals( "", PluginHelpGenerator.toText( javadoc ) );
-
- // line breaks
- javadoc = "Line1\nLine2";
- assertEquals( "Line1 Line2", PluginHelpGenerator.toText( javadoc ) );
- javadoc = "Line1\rLine2";
- assertEquals( "Line1 Line2", PluginHelpGenerator.toText( javadoc ) );
- javadoc = "Line1\r\nLine2";
- assertEquals( "Line1 Line2", PluginHelpGenerator.toText( javadoc ) );
- javadoc = "Line1<br>Line2";
- assertEquals( "Line1\nLine2", PluginHelpGenerator.toText( javadoc ) );
-
- // true HTML
- javadoc = "Generates <i>something</i> for the project.";
- assertEquals( "Generates something for the project.",
PluginHelpGenerator.toText( javadoc ) );
-
- // wrong HTML
- javadoc = "Generates <i>something</i> <b> for the project.";
- assertEquals( "Generates something for the project.",
PluginHelpGenerator.toText( javadoc ) );
-
- // javadoc inline tags
- javadoc = "Generates {...@code something} for the project.";
- assertEquals( "Generates something for the project.",
PluginHelpGenerator.toText( javadoc ) );
- }
+ // inherits tests from base class
}
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java?rev=746407&r1=746406&r2=746407&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
Fri Feb 20 22:55:44 2009
@@ -26,6 +26,7 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import java.io.File;
@@ -80,7 +81,7 @@
{
PluginDescriptor pluginDescriptor = createPluginDescriptor();
- scanner.populatePluginDescriptor( project, pluginDescriptor );
+ scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
checkResult( pluginDescriptor, extractors.keySet() );
}
@@ -97,7 +98,7 @@
PluginDescriptor pluginDescriptor = createPluginDescriptor();
scanner.setActiveExtractors( activeExtractors );
- scanner.populatePluginDescriptor( project, pluginDescriptor );
+ scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
checkResult( pluginDescriptor, Arrays.asList( new String[]{"one",
"three"} ) );
}
@@ -108,7 +109,7 @@
PluginDescriptor pluginDescriptor = createPluginDescriptor();
scanner.setActiveExtractors( null );
- scanner.populatePluginDescriptor( project, pluginDescriptor );
+ scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
checkResult( pluginDescriptor, extractors.keySet() );
}
@@ -121,7 +122,7 @@
scanner.setActiveExtractors( Collections.EMPTY_SET );
try
{
- scanner.populatePluginDescriptor( project, pluginDescriptor );
+ scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
fail( "Expected exception" );
}
catch (InvalidPluginDescriptorException e)
@@ -144,7 +145,7 @@
try
{
- scanner.populatePluginDescriptor( project, pluginDescriptor );
+ scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
fail( "No error for unknown extractor" );
}
catch ( ExtractionException e )
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java?rev=746407&r1=746406&r2=746407&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
Fri Feb 20 22:55:44 2009
@@ -205,4 +205,35 @@
assertEquals( "label", PluginUtils.decodeJavadocTags( javadoc ) );
}
+ public void testToText()
+ throws Exception
+ {
+ String javadoc = null;
+ assertEquals( "", PluginUtils.toText( javadoc ) );
+ javadoc = "";
+ assertEquals( "", PluginUtils.toText( javadoc ) );
+
+ // line breaks
+ javadoc = "Line1\nLine2";
+ assertEquals( "Line1 Line2", PluginUtils.toText( javadoc ) );
+ javadoc = "Line1\rLine2";
+ assertEquals( "Line1 Line2", PluginUtils.toText( javadoc ) );
+ javadoc = "Line1\r\nLine2";
+ assertEquals( "Line1 Line2", PluginUtils.toText( javadoc ) );
+ javadoc = "Line1<br>Line2";
+ assertEquals( "Line1\nLine2", PluginUtils.toText( javadoc ) );
+
+ // true HTML
+ javadoc = "Generates <i>something</i> for the project.";
+ assertEquals( "Generates something for the project.",
PluginUtils.toText( javadoc ) );
+
+ // wrong HTML
+ javadoc = "Generates <i>something</i> <b> for the project.";
+ assertEquals( "Generates something for the project.",
PluginUtils.toText( javadoc ) );
+
+ // javadoc inline tags
+ javadoc = "Generates {...@code something} for the project.";
+ assertEquals( "Generates something for the project.",
PluginUtils.toText( javadoc ) );
+ }
+
}
