Author: bimargulies
Date: Sun Apr 22 18:48:15 2012
New Revision: 1328931
URL: http://svn.apache.org/viewvc?rev=1328931&view=rev
Log:
[MCHANGES-262] Using custom issue types mapping (MCHANGES-245) throws a
llegalArgumentException
Added:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueManagementSystemTest.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssueManagementSystem.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java?rev=1328931&r1=1328930&r2=1328931&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java
Sun Apr 22 18:48:15 2012
@@ -45,6 +45,15 @@ public enum IssueType
public static IssueType lookupByKey( String key )
{
- return IssueType.valueOf( key.toUpperCase() );
+ IssueType type;
+ try
+ {
+ type = IssueType.valueOf( key.toUpperCase() );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ type = null;
+ }
+ return type;
}
}
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssueManagementSystem.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssueManagementSystem.java?rev=1328931&r1=1328930&r2=1328931&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssueManagementSystem.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssueManagementSystem.java
Sun Apr 22 18:48:15 2012
@@ -66,12 +66,12 @@ public abstract class AbstractIssueManag
{
for ( Map.Entry<String, String> me : issueTypes.entrySet() )
{
- IssueType type = IssueType.lookupByKey( me.getValue() );
+ IssueType type = IssueType.lookupByKey( me.getKey() );
if ( type == null )
{
- throw new MojoExecutionException( "Invalid issue action " +
me.getValue() );
+ throw new MojoExecutionException( "Invalid issue action " +
me.getKey() );
}
- String imsTypes = me.getKey();
+ String imsTypes = me.getValue();
String[] imsTypeArray = imsTypes.split( "," );
for ( String imsType : imsTypeArray )
{
Added:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueManagementSystemTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueManagementSystemTest.java?rev=1328931&view=auto
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueManagementSystemTest.java
(added)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueManagementSystemTest.java
Sun Apr 22 18:48:15 2012
@@ -0,0 +1,90 @@
+package org.apache.maven.plugin.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Alan Parkinson
+ * @since 2.7
+ */
+public class IssueManagementSystemTest
+ extends TestCase
+{
+
+ private MockIssueManagementSystem ims;
+
+ private class MockIssueManagementSystem
+ extends AbstractIssueManagementSystem
+ {
+
+ @Override
+ public String getName()
+ {
+ return "Mock IMS";
+ }
+
+ }
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ ims = new MockIssueManagementSystem();
+ }
+
+ public void testApplyingValidCustomIssueTypes()
+ {
+ Map<String, String> issueTypes = new HashMap<String, String>();
+ issueTypes.put( "add", "Story,Epic" );
+ issueTypes.put( "fix", "Defect" );
+ issueTypes.put( "update", "Improvement" );
+
+ try
+ {
+ ims.applyConfiguration( issueTypes );
+ }
+ catch ( MojoExecutionException e )
+ {
+ fail();
+ }
+ }
+
+ public void testApplyingInvalidCustomIssueTypes()
+ {
+ Map<String, String> issueTypes = new HashMap<String, String>();
+ issueTypes.put( "new", "Story,Epic" );
+
+ try
+ {
+ ims.applyConfiguration( issueTypes );
+ fail( "Exception not thrown for invalid group name" );
+ }
+ catch ( MojoExecutionException e )
+ {
+
+ }
+ }
+}
