You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/06/16 21:29:10 UTC
svn commit: r1685894 [4/4] - in /maven/plugins/trunk/maven-changes-plugin:
./ src/main/java/org/apache/maven/plugin/announcement/
src/main/java/org/apache/maven/plugin/changes/
src/main/java/org/apache/maven/plugin/changes/schema/
src/main/java/org/apa...
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo Tue Jun 16 19:29:09 2015
@@ -152,12 +152,11 @@ under the License.
<codeSegment>
<version>1.0.0</version>
<code><![CDATA[
- public java.util.List getActions(String type)
+ public java.util.List<Action> getActions(String type)
{
- java.util.List actions = new java.util.ArrayList();
- for (java.util.Iterator iterator = getActions().iterator(); iterator.hasNext(); )
+ java.util.List<Action> actions = new java.util.ArrayList<Action>();
+ for (Action action : getActions())
{
- Action action = (Action) iterator.next();
if ( action.getType() != null && action.getType().equalsIgnoreCase( type ) )
{
actions.add( action );
@@ -170,7 +169,7 @@ under the License.
<codeSegment>
<version>1.0.0</version>
<code><![CDATA[
- private final java.util.List components = new java.util.ArrayList();
+ private final java.util.List<Component> components = new java.util.ArrayList<Component>();
public void addComponent(String name, Release release)
{
@@ -181,7 +180,7 @@ under the License.
components.add(component);
}
- public java.util.List getComponents()
+ public java.util.List<Component> getComponents()
{
return components;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesCheckMojoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesCheckMojoTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesCheckMojoTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesCheckMojoTestCase.java Tue Jun 16 19:29:09 2015
@@ -57,55 +57,57 @@ public class ChangesCheckMojoTestCase
assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern ) );
}
- public void testIsValidateWithLocale() throws Exception {
- String pattern, locale = null;
-
- // null locale
- pattern = "yyyy-MM-dd";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("2010-12-06", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
-
- // unknown locale specified, should use default locale
- locale = "ab_CD";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("2010-12-06", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
-
- // pattern with months as number
- pattern = "yyyy-MM-dd";
-
- // Czech locale
- locale = "cs_CZ";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("2010-12-06", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
-
- // English locale
- locale = "en_US";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("2010-12-06", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
-
- // pattern with months as text
- pattern = "dd MMM yyyy";
-
- // Czech locale
- locale = "cs_CZ";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("06 XII 2010", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
-
- // English locale
- locale = "en_US";
- assertFalse(ChangesCheckMojo.isValidDate(null, pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("", pattern, locale));
- assertTrue(ChangesCheckMojo.isValidDate("06 Dec 2010", pattern, locale));
- assertFalse(ChangesCheckMojo.isValidDate("pending", pattern, locale));
- }
+ public void testIsValidateWithLocale()
+ throws Exception
+ {
+ String pattern, locale = null;
+
+ // null locale
+ pattern = "yyyy-MM-dd";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "2010-12-06", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+
+ // unknown locale specified, should use default locale
+ locale = "ab_CD";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "2010-12-06", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+
+ // pattern with months as number
+ pattern = "yyyy-MM-dd";
+
+ // Czech locale
+ locale = "cs_CZ";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "2010-12-06", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+
+ // English locale
+ locale = "en_US";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "2010-12-06", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+
+ // pattern with months as text
+ pattern = "dd MMM yyyy";
+
+ // Czech locale
+ locale = "cs_CZ";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "06 XII 2010", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+
+ // English locale
+ locale = "en_US";
+ assertFalse( ChangesCheckMojo.isValidDate( null, pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "", pattern, locale ) );
+ assertTrue( ChangesCheckMojo.isValidDate( "06 Dec 2010", pattern, locale ) );
+ assertFalse( ChangesCheckMojo.isValidDate( "pending", pattern, locale ) );
+ }
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesValidatorMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesValidatorMojoTest.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesValidatorMojoTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesValidatorMojoTest.java Tue Jun 16 19:29:09 2015
@@ -24,8 +24,6 @@ import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-
-
/**
* @author Olivier Lamy
* @since 29 juil. 2008
@@ -43,8 +41,8 @@ public class ChangesValidatorMojoTest
super.setUp();
File pom = new File( getBasedir(), "/src/test/unit/plugin-config.xml" );
mojo = (ChangesValidatorMojo) lookupMojo( "changes-validate", pom );
- }
-
+ }
+
public void testValidationSuccess()
throws Exception
{
@@ -72,7 +70,7 @@ public class ChangesValidatorMojoTest
// we except exception here
}
}
-
+
public void testValidationFailedWithNoMojoFailure()
throws Exception
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java Tue Jun 16 19:29:09 2015
@@ -140,9 +140,11 @@ public class ChangesXMLTest
List releases = changesXML.getReleaseList();
assertEquals( 2, releases.size() );
- for ( Object release1 : releases ) {
+ for ( Object release1 : releases )
+ {
Release release = (Release) release1;
- if ( "1.0".equals( release.getVersion() ) ) {
+ if ( "1.0".equals( release.getVersion() ) )
+ {
Action action = release.getActions().get( 0 );
assertEquals( 2, action.getFixedIssues().size() );
assertEquals( "JIRA-XXX", action.getFixedIssues().get( 0 ).getIssue() );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java Tue Jun 16 19:29:09 2015
@@ -32,7 +32,6 @@ import junit.framework.TestCase;
import org.apache.maven.plugins.changes.model.Release;
/**
- *
* @author ltheussl
*/
public class FeedGeneratorTest
@@ -92,7 +91,7 @@ public class FeedGeneratorTest
releases.add( release );
- for ( String type: generator.getSupportedFeedTypes() )
+ for ( String type : generator.getSupportedFeedTypes() )
{
Writer writer = new StringWriter( 512 );
generator.export( releases, type, writer );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/IssueAdapterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/IssueAdapterTest.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/IssueAdapterTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/IssueAdapterTest.java Tue Jun 16 19:29:09 2015
@@ -59,7 +59,7 @@ public class IssueAdapterTest
public void testCustomIssueTypeMappingOveridesDefaultMapping()
{
IssueManagementSystem ims = new JIRAIssueManagmentSystem();
-
+
ims.getIssueTypeMap().clear();
IssueAdapter adapter = new IssueAdapter( ims );
@@ -83,10 +83,10 @@ public class IssueAdapterTest
public void testCustomIssueTypeMapping()
{
IssueManagementSystem ims = new JIRAIssueManagmentSystem();
- ims.getIssueTypeMap().put( "Story", IssueType.ADD);
- ims.getIssueTypeMap().put( "Epic", IssueType.ADD);
- ims.getIssueTypeMap().put( "Defect", IssueType.FIX);
- ims.getIssueTypeMap().put( "Error", IssueType.FIX);
+ ims.getIssueTypeMap().put( "Story", IssueType.ADD );
+ ims.getIssueTypeMap().put( "Epic", IssueType.ADD );
+ ims.getIssueTypeMap().put( "Defect", IssueType.FIX );
+ ims.getIssueTypeMap().put( "Error", IssueType.FIX );
IssueAdapter adapter = new IssueAdapter( ims );
Issue issue = createIssue( "TST-1", "Story" );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java Tue Jun 16 19:29:09 2015
@@ -67,8 +67,8 @@ public class ReleaseUtilsTestCase
firstReleases.add( release );
mergedReleases = releaseUtils.mergeReleases( firstReleases, secondReleases );
- assertEquals( "Two releases in first, one release in second with one version being the same",
- 2, mergedReleases.size() );
+ assertEquals( "Two releases in first, one release in second with one version being the same", 2,
+ mergedReleases.size() );
release = new Release();
release.setVersion( "1.2" );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Tue Jun 16 19:29:09 2015
@@ -71,7 +71,7 @@ public class IssueUtilsTestCase
try
{
IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
- fail("No issues should be found.");
+ fail( "No issues should be found." );
}
catch ( MojoExecutionException e )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java Tue Jun 16 19:29:09 2015
@@ -35,7 +35,7 @@ public class JiraHelperTestCase
{
public void testGetJiraUrlAndProjectId()
{
- Map<String,String> map;
+ Map<String, String> map;
map = JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/browse/DOXIA" );
assertEquals( "http://jira.codehaus.org", map.get( "url" ) );
@@ -45,7 +45,8 @@ public class JiraHelperTestCase
assertEquals( "http://jira.codehaus.org", map.get( "url" ) );
// MCHANGES-222
- map = JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/secure/IssueNavigator.jspa?pid=11761&reset=true" );
+ map =
+ JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/secure/IssueNavigator.jspa?pid=11761&reset=true" );
assertEquals( "http://jira.codehaus.org", map.get( "url" ) );
map = JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/browse/MSHARED/component/13380" );
assertEquals( "http://jira.codehaus.org", map.get( "url" ) );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java Tue Jun 16 19:29:09 2015
@@ -28,7 +28,8 @@ import org.apache.maven.plugin.testing.A
* @since 2.8
*/
-public class JiraMojoTest extends AbstractMojoTestCase
+public class JiraMojoTest
+ extends AbstractMojoTestCase
{
private final JiraMojo mojo = new JiraMojo();
@@ -37,7 +38,8 @@ public class JiraMojoTest extends Abstra
*
* @throws Exception If any errors occur during the test run.
*/
- public void testCanGenerateReportSkipped() throws Exception
+ public void testCanGenerateReportSkipped()
+ throws Exception
{
setVariableValueToObject( mojo, "skip", Boolean.TRUE );
assertFalse( mojo.canGenerateReport() );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java Tue Jun 16 19:29:09 2015
@@ -33,15 +33,15 @@ public class JiraUnicodeTestCase
extends AbstractMojoTestCase
{
/*
- * Something in Doxia escapes all non-Ascii even when the charset is UTF-8.
- * This test will fail if that ever changes.
+ * Something in Doxia escapes all non-Ascii even when the charset is UTF-8. This test will fail if that ever
+ * changes.
*/
private final static String TEST_TURTLES = "海龟一路下跌。";
public void testUnicodeReport()
throws Exception
{
-
+
File pom = new File( getBasedir(), "/src/test/unit/jira-plugin-config.xml" );
assertNotNull( pom );
assertTrue( pom.exists() );
@@ -52,14 +52,13 @@ public class JiraUnicodeTestCase
MockJiraDownloader mockDownloader = new MockJiraDownloader();
mockDownloader.setJiraXml( jiraXml );
mojo.setMockDownloader( mockDownloader );
- File outputDir = new File ( "target/jira-test-output" );
+ File outputDir = new File( "target/jira-test-output" );
outputDir.mkdirs();
mojo.setReportOutputDirectory( outputDir );
mojo.execute();
- String reportHtml = FileUtils.readFileToString( new File( outputDir, "jira-report.html" ),
- "utf-8" );
+ String reportHtml = FileUtils.readFileToString( new File( outputDir, "jira-report.html" ), "utf-8" );
int turtleIndex = reportHtml.indexOf( TEST_TURTLES );
- assertTrue ( turtleIndex >= 0 );
+ assertTrue( turtleIndex >= 0 );
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestProjectStub.java Tue Jun 16 19:29:09 2015
@@ -38,8 +38,8 @@ public class JiraUnicodeTestProjectStub
@Override
public List<ArtifactRepository> getRemoteArtifactRepositories()
{
- ArtifactRepository repository = new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2",
- new DefaultRepositoryLayout() );
+ ArtifactRepository repository =
+ new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2", new DefaultRepositoryLayout() );
return Collections.singletonList( repository );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JqlQueryBuilderTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JqlQueryBuilderTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JqlQueryBuilderTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JqlQueryBuilderTestCase.java Tue Jun 16 19:29:09 2015
@@ -49,163 +49,116 @@ public class JqlQueryBuilderTestCase
{
String expected = URLEncoder.encode( "project = DOXIA", ENCODING );
- String actual = createBuilder()
- .project( "DOXIA" )
- .build();
+ String actual = createBuilder().project( "DOXIA" ).build();
assertEquals( expected, actual );
}
public void testFixVersion()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "fixVersion = \"1.0\"",
- ENCODING );
+ String expected = URLEncoder.encode( "fixVersion = \"1.0\"", ENCODING );
- String actual = createBuilder()
- .fixVersion( "1.0" )
- .build();
+ String actual = createBuilder().fixVersion( "1.0" ).build();
assertEquals( expected, actual );
}
public void testFixVersionCombinedWithOtherParameters()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "project = DOXIA AND fixVersion = \"1.0\"",
- ENCODING );
+ String expected = URLEncoder.encode( "project = DOXIA AND fixVersion = \"1.0\"", ENCODING );
- String actual = createBuilder()
- .project( "DOXIA" )
- .fixVersion( "1.0" )
- .build();
+ String actual = createBuilder().project( "DOXIA" ).fixVersion( "1.0" ).build();
assertEquals( expected, actual );
}
public void testSingleParameterSingleValue()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "priority in (Blocker)",
- ENCODING );
+ String expected = URLEncoder.encode( "priority in (Blocker)", ENCODING );
- String actual = createBuilder()
- .priorityIds( "Blocker" )
- .build();
+ String actual = createBuilder().priorityIds( "Blocker" ).build();
assertEquals( expected, actual );
- actual = createBuilder()
- .priorityIds( " Blocker " )
- .build();
+ actual = createBuilder().priorityIds( " Blocker " ).build();
assertEquals( expected, actual );
}
public void testSingleParameterMultipleValues()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "priority in (Blocker, Critical, Major)",
- ENCODING );
+ String expected = URLEncoder.encode( "priority in (Blocker, Critical, Major)", ENCODING );
- String actual = createBuilder()
- .priorityIds( "Blocker,Critical,Major" )
- .build();
+ String actual = createBuilder().priorityIds( "Blocker,Critical,Major" ).build();
assertEquals( expected, actual );
- actual = createBuilder()
- .priorityIds( " Blocker , Critical, Major" )
- .build();
+ actual = createBuilder().priorityIds( " Blocker , Critical, Major" ).build();
assertEquals( expected, actual );
}
public void testMultipleParameterCombinedWithAND()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "priority in (Blocker) AND status in (Resolved)",
- ENCODING );
+ String expected = URLEncoder.encode( "priority in (Blocker) AND status in (Resolved)", ENCODING );
- String actual = createBuilder()
- .priorityIds( "Blocker" )
- .statusIds( "Resolved" )
- .build();
+ String actual = createBuilder().priorityIds( "Blocker" ).statusIds( "Resolved" ).build();
assertEquals( expected, actual );
}
public void testValueWithSpacesAreQuoted()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "status in (\"In Progress\")",
- ENCODING );
+ String expected = URLEncoder.encode( "status in (\"In Progress\")", ENCODING );
- String actual = createBuilder()
- .statusIds( "In Progress" )
- .build();
+ String actual = createBuilder().statusIds( "In Progress" ).build();
assertEquals( expected, actual );
}
public void testSortSingleRowAscending()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "project = DOXIA ORDER BY key ASC",
- ENCODING );
+ String expected = URLEncoder.encode( "project = DOXIA ORDER BY key ASC", ENCODING );
- String actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( "key" )
- .build();
+ String actual = createBuilder().project( "DOXIA" ).sortColumnNames( "key" ).build();
assertEquals( expected, actual );
- actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( "key ASC" )
- .build();
+ actual = createBuilder().project( "DOXIA" ).sortColumnNames( "key ASC" ).build();
assertEquals( expected, actual );
- actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( " key ASC " )
- .build();
+ actual = createBuilder().project( "DOXIA" ).sortColumnNames( " key ASC " ).build();
assertEquals( expected, actual );
}
public void testSortSingleDescending()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "project = DOXIA ORDER BY key DESC",
- ENCODING );
+ String expected = URLEncoder.encode( "project = DOXIA ORDER BY key DESC", ENCODING );
- String actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( "key DESC" )
- .build();
+ String actual = createBuilder().project( "DOXIA" ).sortColumnNames( "key DESC" ).build();
assertEquals( expected, actual );
- actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( " key DESC " )
- .build();
+ actual = createBuilder().project( "DOXIA" ).sortColumnNames( " key DESC " ).build();
assertEquals( expected, actual );
}
public void testSortMultipleColumns()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC",
- ENCODING );
+ String expected =
+ URLEncoder.encode( "project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC", ENCODING );
- String actual = createBuilder()
- .project( "DOXIA" )
- .sortColumnNames( "key ASC,assignee DESC, reporter ASC" )
- .build();
+ String actual =
+ createBuilder().project( "DOXIA" ).sortColumnNames( "key ASC,assignee DESC, reporter ASC" ).build();
assertEquals( expected, actual );
}
public void testOrderByIsLastElement()
throws UnsupportedEncodingException
{
- String expected = URLEncoder.encode( "project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC",
- ENCODING );
+ String expected =
+ URLEncoder.encode( "project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC", ENCODING );
- String actual = createBuilder()
- .sortColumnNames( "key ASC,assignee DESC, reporter ASC" )
- .project( "DOXIA" )
- .build();
+ String actual =
+ createBuilder().sortColumnNames( "key ASC,assignee DESC, reporter ASC" ).project( "DOXIA" ).build();
assertEquals( expected, actual );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/UrlBuilderTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/UrlBuilderTestCase.java?rev=1685894&r1=1685893&r2=1685894&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/UrlBuilderTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/UrlBuilderTestCase.java Tue Jun 16 19:29:09 2015
@@ -34,36 +34,30 @@ public class UrlBuilderTestCase
public void testUrlWithoutParameters()
{
String expected = "http://www.jira.com/context";
- String actual = new UrlBuilder( "http://www.jira.com", "context" )
- .build();
+ String actual = new UrlBuilder( "http://www.jira.com", "context" ).build();
assertEquals( expected, actual );
}
public void testUrlWithSingleParameter()
{
String expected = "http://www.jira.com/context?key1=value1";
- String actual = new UrlBuilder( "http://www.jira.com", "context" )
- .addParameter( "key1", "value1" )
- .build();
+ String actual = new UrlBuilder( "http://www.jira.com", "context" ).addParameter( "key1", "value1" ).build();
assertEquals( expected, actual );
}
public void testUrlWithMultipleParameters()
{
String expected = "http://www.jira.com/context?key1=value1&key2=value2";
- String actual = new UrlBuilder( "http://www.jira.com", "context" )
- .addParameter( "key1", "value1" )
- .addParameter( "key2", "value2" )
- .build();
+ String actual =
+ new UrlBuilder( "http://www.jira.com",
+ "context" ).addParameter( "key1", "value1" ).addParameter( "key2", "value2" ).build();
assertEquals( expected, actual );
}
public void testUrlWithIntParameter()
{
String expected = "http://www.jira.com/context?key1=1";
- String actual = new UrlBuilder( "http://www.jira.com", "context" )
- .addParameter( "key1", 1 )
- .build();
+ String actual = new UrlBuilder( "http://www.jira.com", "context" ).addParameter( "key1", 1 ).build();
assertEquals( expected, actual );
}
}