You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/04/29 19:32:13 UTC
[maven-surefire] branch 1546-1222 updated: moved
SurefireReflectorTest to surefire-api where SurefireReflector.java resides
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch 1546-1222
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/1546-1222 by this push:
new b3fb54a moved SurefireReflectorTest to surefire-api where SurefireReflector.java resides
b3fb54a is described below
commit b3fb54a4d8f7eb7e58203eec3b6d11f0bc4382fb
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Apr 29 21:31:53 2019 +0200
moved SurefireReflectorTest to surefire-api where SurefireReflector.java resides
---
.../java/org/apache/maven/JUnit4SuiteTest.java | 2 +
.../maven/surefire/booter/CommandReaderTest.java | 4 +-
.../java/org/apache/maven/surefire/booter/Foo.java | 0
.../surefire/booter/NewClassLoaderRunner.java | 7 +-
.../surefire/booter/SurefireReflectorTest.java | 123 +++++++++++++++-
.../maven/surefire/booter/JUnit4SuiteTest.java | 2 -
.../surefire/booter/SurefireReflectorTest.java | 154 ---------------------
7 files changed, 127 insertions(+), 165 deletions(-)
diff --git a/surefire-api/src/test/java/org/apache/maven/JUnit4SuiteTest.java b/surefire-api/src/test/java/org/apache/maven/JUnit4SuiteTest.java
index 63c4490..38f0c48 100644
--- a/surefire-api/src/test/java/org/apache/maven/JUnit4SuiteTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/JUnit4SuiteTest.java
@@ -23,6 +23,7 @@ import junit.framework.JUnit4TestAdapter;
import junit.framework.Test;
import org.apache.maven.plugin.surefire.runorder.ThreadedExecutionSchedulerTest;
import org.apache.maven.surefire.SpecificTestClassFilterTest;
+import org.apache.maven.surefire.booter.CommandReaderTest;
import org.apache.maven.surefire.booter.ForkedChannelEncoderTest;
import org.apache.maven.surefire.booter.ForkingRunListenerTest;
import org.apache.maven.surefire.booter.MasterProcessCommandTest;
@@ -50,6 +51,7 @@ import org.junit.runners.Suite;
* @since 2.19
*/
@Suite.SuiteClasses( {
+ CommandReaderTest.class,
ThreadedExecutionSchedulerTest.class,
ForkingRunListenerTest.class,
MasterProcessCommandTest.class,
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
similarity index 98%
rename from surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
rename to surefire-api/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
index 00d50b4..5168d2b 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/booter/CommandReaderTest.java
@@ -193,14 +193,14 @@ public class CommandReaderTest
Iterator<String> it = reader.getIterableClasses( new ForkedChannelEncoder( nul() ) ).iterator();
assertThat( it.next(), is( CommandReaderTest.class.getName() ) );
counter.countDown();
- assertThat( it.next(), is( PropertiesWrapperTest.class.getName() ) );
+ assertThat( it.next(), is( Foo.class.getName() ) );
}
};
FutureTask<Object> futureTask = new FutureTask<>( runnable, null );
Thread t = new Thread( futureTask );
t.start();
counter.await();
- addTestToPipeline( PropertiesWrapperTest.class.getName() );
+ addTestToPipeline( Foo.class.getName() );
try
{
futureTask.get();
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/Foo.java
similarity index 100%
rename from surefire-booter/src/test/java/org/apache/maven/surefire/booter/Foo.java
rename to surefire-api/src/test/java/org/apache/maven/surefire/booter/Foo.java
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
similarity index 97%
rename from surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
rename to surefire-api/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
index 2e71dc7..f137598 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java
@@ -19,6 +19,7 @@ package org.apache.maven.surefire.booter;
* under the License.
*/
+import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,8 +46,6 @@ import java.util.HashSet;
import java.util.List;
import static java.io.File.pathSeparator;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.io.FileUtils.readFileToString;
/**
* JUnit runner testing methods in a separate class loader.
@@ -193,7 +192,7 @@ public class NewClassLoaderRunner
public static class TestClassLoader
extends URLClassLoader
{
- public TestClassLoader()
+ TestClassLoader()
{
super( toClassPath(), null );
}
@@ -236,7 +235,7 @@ public class NewClassLoaderRunner
Collection<URL> classPath = new HashSet<>();
try
{
- String[] files = readFileToString( new File( "target/test-classpath/cp.txt" ), UTF_8 )
+ String[] files = FileUtils.fileRead( new File( "target/test-classpath/cp.txt" ), "UTF-8" )
.split( pathSeparator );
for ( String file : files )
{
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
index 8394e00..facf51b 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
@@ -19,23 +19,39 @@ package org.apache.maven.surefire.booter;
*/
import junit.framework.TestCase;
+import org.apache.maven.surefire.report.ReporterConfiguration;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.DirectoryScannerParameters;
+import org.apache.maven.surefire.testset.RunOrderParameters;
+import org.apache.maven.surefire.testset.TestArtifactInfo;
+import org.apache.maven.surefire.testset.TestListResolver;
+import org.apache.maven.surefire.testset.TestRequest;
+import org.apache.maven.surefire.util.RunOrder;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
public class SurefireReflectorTest
extends TestCase
{
public void testShouldCreateFactoryWithoutException()
{
- ReporterFactory factory = new ReporterFactory() {
+ ReporterFactory factory = new ReporterFactory()
+ {
@Override
- public RunListener createReporter() {
+ public RunListener createReporter()
+ {
return null;
}
@Override
- public RunResult close() {
+ public RunResult close()
+ {
return null;
}
};
@@ -46,4 +62,105 @@ public class SurefireReflectorTest
assertNotNull( baseProviderFactory.getReporterFactory() );
assertSame( factory, baseProviderFactory.getReporterFactory() );
}
+ public void testSetDirectoryScannerParameters()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ DirectoryScannerParameters directoryScannerParameters =
+ new DirectoryScannerParameters( new File( "ABC" ), new ArrayList<String>(), new ArrayList<String>(),
+ new ArrayList<String>(), false, "hourly" );
+ surefireReflector.setDirectoryScannerParameters( foo, directoryScannerParameters );
+ assertTrue( isCalled( foo ) );
+
+ }
+
+ public void testRunOrderParameters()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, new File( "." ) );
+ surefireReflector.setRunOrderParameters( foo, runOrderParameters );
+ assertTrue( isCalled( foo ) );
+ }
+
+ public void testTestSuiteDefinition()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ TestRequest testSuiteDefinition =
+ new TestRequest( Arrays.asList( new File( "file1" ), new File( "file2" ) ),
+ new File( "TestSOurce" ), new TestListResolver( "aUserRequestedTest#aMethodRequested" ) );
+ surefireReflector.setTestSuiteDefinition( foo, testSuiteDefinition );
+ assertTrue( isCalled( foo ) );
+ }
+
+ public void testProviderProperties()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ surefireReflector.setProviderProperties( foo, new HashMap<String, String>() );
+ assertTrue( isCalled( foo ) );
+ }
+
+ public void testReporterConfiguration()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ ReporterConfiguration reporterConfiguration = getReporterConfiguration();
+ surefireReflector.setReporterConfigurationAware( foo, reporterConfiguration );
+ assertTrue( isCalled( foo ) );
+ }
+
+ private ReporterConfiguration getReporterConfiguration()
+ {
+ return new ReporterConfiguration( new File( "CDE" ), true );
+ }
+
+ public void testTestClassLoaderAware()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ surefireReflector.setTestClassLoader( foo, getClass().getClassLoader() );
+ assertTrue( isCalled( foo ) );
+ }
+
+ public void testArtifactInfoAware()
+ {
+ SurefireReflector surefireReflector = getReflector();
+ Object foo = getFoo();
+
+ TestArtifactInfo testArtifactInfo = new TestArtifactInfo( "12.3", "test" );
+ surefireReflector.setTestArtifactInfo( foo, testArtifactInfo );
+ assertTrue( isCalled( foo ) );
+ }
+
+ private SurefireReflector getReflector()
+ {
+ return new SurefireReflector( this.getClass().getClassLoader() );
+ }
+
+ private Object getFoo()
+ { // Todo: Setup a different classloader so we can really test crossing
+ return new Foo();
+ }
+
+ private Boolean isCalled( Object foo )
+ {
+ final Method isCalled;
+ try
+ {
+ isCalled = foo.getClass().getMethod( "isCalled" );
+ return (Boolean) isCalled.invoke( foo );
+ }
+ catch ( ReflectiveOperationException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
}
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
index f073a8b..a45f252 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/JUnit4SuiteTest.java
@@ -32,9 +32,7 @@ import org.junit.runners.Suite;
*/
@Suite.SuiteClasses( {
ClasspathTest.class,
- CommandReaderTest.class,
PropertiesWrapperTest.class,
- SurefireReflectorTest.class,
PpidCheckerTest.class,
SystemUtilsTest.class
} )
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
deleted file mode 100644
index 0f5188c..0000000
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.apache.maven.surefire.booter;
-
-/*
- * 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.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import org.apache.maven.surefire.report.ReporterConfiguration;
-import org.apache.maven.surefire.testset.DirectoryScannerParameters;
-import org.apache.maven.surefire.testset.RunOrderParameters;
-import org.apache.maven.surefire.testset.TestArtifactInfo;
-import org.apache.maven.surefire.testset.TestListResolver;
-import org.apache.maven.surefire.testset.TestRequest;
-import org.apache.maven.surefire.util.RunOrder;
-
-import junit.framework.TestCase;
-
-/**
- * @author Kristian Rosenvold
- */
-public class SurefireReflectorTest
- extends TestCase
-{
- public void testSetDirectoryScannerParameters()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- DirectoryScannerParameters directoryScannerParameters =
- new DirectoryScannerParameters( new File( "ABC" ), new ArrayList<String>(), new ArrayList<String>(),
- new ArrayList<String>(), false, "hourly" );
- surefireReflector.setDirectoryScannerParameters( foo, directoryScannerParameters );
- assertTrue( isCalled( foo ) );
-
- }
-
- public void testRunOrderParameters()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, new File( "." ) );
- surefireReflector.setRunOrderParameters( foo, runOrderParameters );
- assertTrue( isCalled( foo ) );
-
- }
-
- public void testTestSuiteDefinition()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- TestRequest testSuiteDefinition =
- new TestRequest( Arrays.asList( new File( "file1" ), new File( "file2" ) ),
- new File( "TestSOurce" ), new TestListResolver( "aUserRequestedTest#aMethodRequested" ) );
- surefireReflector.setTestSuiteDefinition( foo, testSuiteDefinition );
- assertTrue( isCalled( foo ) );
- }
-
- public void testProviderProperties()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- surefireReflector.setProviderProperties( foo, new HashMap<String, String>() );
- assertTrue( isCalled( foo ) );
- }
-
- public void testReporterConfiguration()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- ReporterConfiguration reporterConfiguration = getReporterConfiguration();
- surefireReflector.setReporterConfigurationAware( foo, reporterConfiguration );
- assertTrue( isCalled( foo ) );
- }
-
- private ReporterConfiguration getReporterConfiguration()
- {
- return new ReporterConfiguration( new File( "CDE" ), true );
- }
-
- public void testTestClassLoaderAware()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- surefireReflector.setTestClassLoader( foo, getClass().getClassLoader() );
- assertTrue( isCalled( foo ) );
- }
-
- public void testArtifactInfoAware()
- throws Exception
- {
- SurefireReflector surefireReflector = getReflector();
- Object foo = getFoo();
-
- TestArtifactInfo testArtifactInfo = new TestArtifactInfo( "12.3", "test" );
- surefireReflector.setTestArtifactInfo( foo, testArtifactInfo );
- assertTrue( isCalled( foo ) );
- }
-
- private SurefireReflector getReflector()
- {
- return new SurefireReflector( this.getClass().getClassLoader() );
- }
-
- public Object getFoo()
- { // Todo: Setup a different classloader so we can really test crossing
- return new Foo();
- }
-
-
- private Boolean isCalled( Object foo )
- {
- final Method isCalled;
- try
- {
- isCalled = foo.getClass().getMethod( "isCalled" );
- return (Boolean) isCalled.invoke( foo );
- }
- catch ( ReflectiveOperationException e )
- {
- throw new RuntimeException( e );
- }
- }
-}