[jbehave-scm] [scm-core/jbehave-4.x][2/2] JBEHAVE-1075: Minor tidy up.

[Mauro Talevi]

commit 3d8b2a125746dcf3110634dcf6731e5fe55626b0
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Wed, 8 Apr 2015 19:30:24 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Wed, 8 Apr 2015 19:31:01 +0100

    JBEHAVE-1075:  Minor tidy up.

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java 
b/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
index e1d1122..b69d5c6 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
@@ -601,8 +601,7 @@ public class ParameterConverters {
 
         @Override
         public Object convertValue(String value, Type type) {
-            String transformedValue = value.replaceAll("\\W", 
"_").toUpperCase();
-            return super.convertValue(transformedValue, type);
+            return super.convertValue(value.replaceAll("\\W", 
"_").toUpperCase(), type);
         }
     }
 
diff --git 
a/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
 
b/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
index 8ddb0f2..3e16a5a 100755
--- 
a/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
+++ 
b/jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
@@ -40,11 +40,9 @@ import org.jbehave.core.steps.SomeSteps.MyParameters;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
@@ -64,7 +62,7 @@ public class ParameterConvertersBehaviour {
     }
 
     private void assertThatDefaultConvertersInclude(ParameterConverter[] 
defaultConverters,
-            Class<? extends ParameterConverter>... converterTypes) {
+            @SuppressWarnings("unchecked") Class<? extends 
ParameterConverter>... converterTypes) {
         for (Class<? extends ParameterConverter> type : converterTypes) {
             boolean found = false;
             for (ParameterConverter converter : defaultConverters) {
@@ -461,7 +459,7 @@ public class ParameterConvertersBehaviour {
     }
 
     @Test
-    public void flexibleEnumConverter_givenLowercasedSpaceSeparatedValue() {
+    public void shouldConvertEnumFluently() {
         ParameterConverter converter = new FluentEnumConverter();
         assertThat(converter.accept(SomeEnum.class), equalTo(true));
         assertThat((SomeEnum) converter.convertValue("multiple words and 1 
number", SomeEnum.class), equalTo(SomeEnum.MULTIPLE_WORDS_AND_1_NUMBER));