You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/02/15 19:16:34 UTC
svn commit: r1244625 - in /maven/surefire/trunk:
surefire-booter/src/main/java/org/apache/maven/surefire/booter/
surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/
surefire-integration-tests/src/test/resources/surefire-34-sec...
Author: krosenvold
Date: Wed Feb 15 18:16:33 2012
New Revision: 1244625
URL: http://svn.apache.org/viewvc?rev=1244625&view=rev
Log:
[SUREFIRE-836] regression with surefire 2.11/2.12 plugin and SecurityManager
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml (with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java (with props)
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1244625&r1=1244624&r2=1244625&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java Wed Feb 15 18:16:33 2012
@@ -49,6 +49,7 @@ public class ForkedBooter
public static void main( String[] args )
throws Throwable
{
+ final PrintStream originalOut = System.out;
try
{
if ( args.length > 1 )
@@ -73,8 +74,8 @@ public class ForkedBooter
Object testSet = forkedTestSet != null ? forkedTestSet.getDecodedValue( testClassLoader ) : null;
runSuitesInProcess( testSet, testClassLoader, startupConfiguration, providerConfiguration );
// Say bye.
- System.out.println("Z,0,BYE!");
- System.out.flush();
+ originalOut.println( "Z,0,BYE!" );
+ originalOut.flush();
// noinspection CallToSystemExit
System.exit( 0 );
}
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java?rev=1244625&r1=1244624&r2=1244625&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java Wed Feb 15 18:16:33 2012
@@ -168,7 +168,9 @@ public class ProviderFactory
}
finally
{
- Thread.currentThread().setContextClassLoader( current );
+ if ( System.getSecurityManager() == null){
+ Thread.currentThread().setContextClassLoader( current );
+ }
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java?rev=1244625&r1=1244624&r2=1244625&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java Wed Feb 15 18:16:33 2012
@@ -32,7 +32,14 @@ public class Surefire34SecurityManagerIT
{
public void testSecurityManager()
{
- SurefireLauncher surefireLauncher = unpack( "/surefire-34-securityManager" ).failNever();
+ SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager" ).failNever();
surefireLauncher.executeTest().assertTestSuiteResults( 2, 1, 0, 0 );
}
-}
\ No newline at end of file
+
+ public void testSecurityManagerSuccessful()
+ {
+ SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager-success" );
+ surefireLauncher.executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+
+}
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml?rev=1244625&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml Wed Feb 15 18:16:33 2012
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire34</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Surefire-34-SecurityManager</name>
+
+
+ <properties>
+ <junitVersion>3.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java?rev=1244625&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java Wed Feb 15 18:16:33 2012
@@ -0,0 +1,37 @@
+package junit4;
+
+import junit.framework.TestCase;
+
+
+public class SecurityManagerTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public void testNotMuch()
+ {
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native