Author: krosenvold
Date: Sat Sep 15 11:30:24 2012
New Revision: 1385045
URL: http://svn.apache.org/viewvc?rev=1385045&view=rev
Log:
[SUREFIRE-908] Fixed with unit test
Added:
maven/surefire/trunk/maven-surefire-plugin/src/test/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1385045&r1=1385044&r2=1385045&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Sat Sep 15 11:30:24 2012
@@ -877,7 +877,12 @@ public abstract class AbstractSurefireMo
boolean isForkModeNever()
{
- return ForkConfiguration.FORK_NEVER.equals( getEffectiveForkMode() );
+ return isForkModeNever( getEffectiveForkMode() );
+ }
+
+ static boolean isForkModeNever(String forkMode)
+ {
+ return ForkConfiguration.FORK_NEVER.equals( forkMode );
}
boolean isForking()
@@ -885,11 +890,11 @@ public abstract class AbstractSurefireMo
return !isForkModeNever();
}
- private String getEffectiveForkMode()
+ String getEffectiveForkMode()
{
String forkMode1 = getForkMode();
- if ( toolchain != null && isForkModeNever() )
+ if ( toolchain != null && isForkModeNever(forkMode1) )
{
return ForkConfiguration.FORK_ONCE;
}
Added:
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java?rev=1385045&view=auto
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
(added)
+++
maven/surefire/trunk/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
Sat Sep 15 11:30:24 2012
@@ -0,0 +1,75 @@
+package org.apache.maven.plugin.surefire;
+/*
+ * 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.lang.reflect.Field;
+import org.apache.maven.plugin.surefire.booterclient.ForkConfiguration;
+import org.apache.maven.toolchain.Toolchain;
+
+import junit.framework.TestCase;
+
+public class SurefirePluginTest
+ extends TestCase
+{
+
+ public void testForkMode()
+ throws NoSuchFieldException, IllegalAccessException
+ {
+ SurefirePlugin surefirePlugin = new SurefirePlugin();
+ setFieldValue( surefirePlugin, "toolchain", new MyToolChain() );
+ setFieldValue( surefirePlugin, "forkMode", "never" );
+ assertEquals( ForkConfiguration.FORK_ONCE,
surefirePlugin.getEffectiveForkMode() );
+ }
+
+ private void setFieldValue( SurefirePlugin plugin, String fieldName,
Object value)
+ throws NoSuchFieldException, IllegalAccessException
+ {
+ Field field = findField( plugin.getClass(), fieldName );
+ field.setAccessible( true );
+ field.set( plugin, value );
+
+ }
+
+ private Field findField( Class clazz, String fieldName){
+ while (clazz != null){
+ try
+ {
+ return clazz.getDeclaredField( fieldName );
+ }
+ catch ( NoSuchFieldException e )
+ {
+ clazz = clazz.getSuperclass();
+ }
+ }
+ throw new IllegalArgumentException( "Field not found" );
+ }
+
+ private class MyToolChain implements Toolchain {
+ public String getType()
+ {
+ return null;
+ }
+
+ public String findTool( String s )
+ {
+ return null;
+ }
+ }
+}
