http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/841d67f9/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/RunListenerAdapterTests.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/RunListenerAdapterTests.java b/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/RunListenerAdapterTests.java deleted file mode 100644 index 5518b29..0000000 --- a/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/RunListenerAdapterTests.java +++ /dev/null @@ -1,262 +0,0 @@ -package org.apache.maven.surefire.junit5; - -/* - * 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 static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.Optional; - -import org.apache.maven.surefire.report.ReportEntry; -import org.apache.maven.surefire.report.RunListener; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.engine.descriptor.ClassTestDescriptor; -import org.junit.jupiter.engine.descriptor.MethodTestDescriptor; -import org.junit.platform.engine.TestDescriptor; -import org.junit.platform.engine.TestExecutionResult; -import org.junit.platform.engine.UniqueId; -import org.junit.platform.engine.support.descriptor.EngineDescriptor; -import org.junit.platform.launcher.TestIdentifier; -import org.junit.platform.launcher.TestPlan; -import org.mockito.ArgumentCaptor; - -/** - * Unit tests for {@link RunListenerAdapter}. - * - * @since 1.0 - */ -class RunListenerAdapterTests -{ - - private RunListener listener; - - private RunListenerAdapter adapter; - - @BeforeEach - public void setUp() - { - listener = mock( RunListener.class ); - adapter = new RunListenerAdapter( listener ); - } - - @Test - void notifiedWithCorrectNamesWhenMethodExecutionStarted() - throws Exception - { - ArgumentCaptor<ReportEntry> entryCaptor = ArgumentCaptor.forClass( ReportEntry.class ); - - adapter.executionStarted( newMethodIdentifier() ); - verify( listener ).testStarting( entryCaptor.capture() ); - - ReportEntry entry = entryCaptor.getValue(); - assertEquals( MY_TEST_METHOD_NAME + "()", entry.getName() ); - assertEquals( MyTestClass.class.getName(), entry.getSourceName() ); - assertNotNull( entry.getStackTraceWriter() ); - } - - @Test - void notNotifiedWhenClassExecutionStarted() - throws Exception - { - adapter.executionStarted( newClassIdentifier() ); - verify( listener, never() ).testStarting( any() ); - } - - @Test - void notNotifiedWhenEngineExecutionStarted() - throws Exception - { - adapter.executionStarted( newEngineIdentifier() ); - verify( listener, never() ).testStarting( any() ); - } - - @Test - void notifiedWhenMethodExecutionSkipped() - throws Exception - { - adapter.executionSkipped( newMethodIdentifier(), "test" ); - verify( listener ).testSkipped( any() ); - } - - @Test - void notifiedWithCorrectNamesWhenClassExecutionSkipped() - throws Exception - { - ArgumentCaptor<ReportEntry> entryCaptor = ArgumentCaptor.forClass( ReportEntry.class ); - - adapter.executionSkipped( newClassIdentifier(), "test" ); - verify( listener ).testSkipped( entryCaptor.capture() ); - - ReportEntry entry = entryCaptor.getValue(); - assertTrue( MyTestClass.class.getTypeName().contains( entry.getName() ) ); - assertEquals( MyTestClass.class.getName(), entry.getSourceName() ); - } - - @Test - void notifiedWhenEngineExecutionSkipped() - throws Exception - { - adapter.executionSkipped( newEngineIdentifier(), "test" ); - verify( listener ).testSkipped( any() ); - } - - @Test - void notifiedWhenMethodExecutionAborted() - throws Exception - { - adapter.executionFinished( newMethodIdentifier(), TestExecutionResult.aborted( null ) ); - verify( listener ).testAssumptionFailure( any() ); - } - - @Test - void notifiedWhenClassExecutionAborted() - throws Exception - { - adapter.executionFinished( newClassIdentifier(), TestExecutionResult.aborted( null ) ); - verify( listener ).testAssumptionFailure( any() ); - } - - @Test - void notifiedWhenMethodExecutionFailed() - throws Exception - { - adapter.executionFinished( newMethodIdentifier(), TestExecutionResult.failed( new RuntimeException() ) ); - verify( listener ).testFailed( any() ); - } - - @Test - void notifiedWithCorrectNamesWhenClassExecutionFailed() - throws Exception - { - ArgumentCaptor<ReportEntry> entryCaptor = ArgumentCaptor.forClass( ReportEntry.class ); - - adapter.executionFinished( newClassIdentifier(), TestExecutionResult.failed( new RuntimeException() ) ); - verify( listener ).testFailed( entryCaptor.capture() ); - - ReportEntry entry = entryCaptor.getValue(); - assertEquals( MyTestClass.class.getName(), entry.getSourceName() ); - assertNotNull( entry.getStackTraceWriter() ); - } - - @Test - void notifiedWhenMethodExecutionSucceeded() - throws Exception - { - adapter.executionFinished( newMethodIdentifier(), TestExecutionResult.successful() ); - verify( listener ).testSucceeded( any() ); - } - - @Test - void notNotifiedWhenClassExecutionSucceeded() - throws Exception - { - adapter.executionFinished( newClassIdentifier(), TestExecutionResult.successful() ); - verify( listener, never() ).testSucceeded( any() ); - } - - @Test - void notifiedWithParentDisplayNameWhenTestClassUnknown() - throws Exception - { - // Set up a test plan - TestPlan plan = TestPlan.from( singletonList( new EngineDescriptor( newId(), "Luke's Plan" ) ) ); - adapter.testPlanExecutionStarted( plan ); - - // Use the test plan to set up child with parent. - final String parentDisplay = "I am your father"; - TestIdentifier child = newSourcelessIdentifierWithParent( plan, parentDisplay ); - adapter.executionStarted( child ); - - // Check that the adapter has informed Surefire that the test has been invoked, - // with the parent name as source (since the test case itself had no source). - ArgumentCaptor<ReportEntry> entryCaptor = ArgumentCaptor.forClass( ReportEntry.class ); - verify( listener ).testStarting( entryCaptor.capture() ); - assertEquals( parentDisplay, entryCaptor.getValue().getSourceName() ); - } - - private static TestIdentifier newMethodIdentifier() - throws Exception - { - TestDescriptor testDescriptor = new MethodTestDescriptor( newId(), MyTestClass.class, - MyTestClass.class.getDeclaredMethod( MY_TEST_METHOD_NAME ) ); - return TestIdentifier.from( testDescriptor ); - } - - private static TestIdentifier newClassIdentifier() - { - TestDescriptor testDescriptor = new ClassTestDescriptor( newId(), MyTestClass.class ); - return TestIdentifier.from( testDescriptor ); - } - - private static TestIdentifier newSourcelessIdentifierWithParent( TestPlan testPlan, String parentDisplay ) - { - // A parent test identifier with a name. - TestDescriptor parent = mock( TestDescriptor.class ); - when( parent.getUniqueId() ).thenReturn( newId() ); - when( parent.getDisplayName() ).thenReturn( parentDisplay ); - TestIdentifier parentId = TestIdentifier.from( parent ); - - // The (child) test case that is to be executed as part of a test plan. - TestDescriptor child = mock( TestDescriptor.class ); - when( child.getUniqueId() ).thenReturn( newId() ); - when( child.isTest() ).thenReturn( true ); - - // Ensure the child source is null yet that there is a parent -- the special case to be tested. - when( child.getSource() ).thenReturn( Optional.empty() ); - when( child.getParent() ).thenReturn( Optional.of(parent) ); - TestIdentifier childId = TestIdentifier.from( child ); - - testPlan.add( childId ); - testPlan.add( parentId ); - - return childId; - } - - private static TestIdentifier newEngineIdentifier() - { - TestDescriptor testDescriptor = new EngineDescriptor( newId(), "engine" ); - return TestIdentifier.from( testDescriptor ); - } - - private static UniqueId newId() - { - return UniqueId.forEngine( "engine" ); - } - - private static final String MY_TEST_METHOD_NAME = "myTestMethod"; - - private static class MyTestClass { - - @Test - void myTestMethod() - { - } - - } - -}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/841d67f9/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/TestPlanScannerFilterTests.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/TestPlanScannerFilterTests.java b/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/TestPlanScannerFilterTests.java deleted file mode 100644 index aa52b78..0000000 --- a/surefire-providers/surefire-junit5/src/test/java/org/apache/maven/surefire/junit5/TestPlanScannerFilterTests.java +++ /dev/null @@ -1,190 +0,0 @@ -package org.apache.maven.surefire.junit5; - -/* - * 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 static java.util.Collections.emptyList; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.stream.Stream; - -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestFactory; -import org.junit.platform.engine.Filter; -import org.junit.platform.launcher.core.LauncherFactory; - -/** - * Unit tests for {@link TestPlanScannerFilter}. - * - * @since 1.0 - */ -public class TestPlanScannerFilterTests -{ - - @Test - void emptyClassAccepted() - { - assertTrue( newFilter().accept( EmptyClass.class ), "accepts empty class because it is a container" ); - } - - @Test - void classWithNoTestMethodsIsAccepted() - { - assertTrue( newFilter().accept( ClassWithMethods.class ), - "accepts class with no @Test methods because it is a container" ); - } - - @Test - void classWithTestMethodsIsAccepted() - { - assertTrue( newFilter().accept( ClassWithTestMethods.class ) ); - } - - @Test - void classWithNestedTestClassIsAccepted() - { - assertTrue( newFilter().accept( ClassWithNestedTestClass.class ) ); - } - - @Test - void classWithDeeplyNestedTestClassIsAccepted() - { - assertTrue( newFilter().accept( ClassWithDeeplyNestedTestClass.class ) ); - } - - @Test - void classWithTestFactoryIsAccepted() - { - assertTrue( newFilter().accept( ClassWithTestFactory.class ) ); - } - - @Test - void classWithNestedTestFactoryIsAccepted() - { - assertTrue( newFilter().accept( ClassWithNestedTestFactory.class ) ); - } - - private TestPlanScannerFilter newFilter() - { - return new TestPlanScannerFilter( LauncherFactory.create(), new Filter<?>[0] ); - } - - private static class EmptyClass - { - } - - @SuppressWarnings("unused") - private static class ClassWithMethods - { - - void method1() - { - } - - void method2() - { - } - } - - private static class ClassWithTestMethods - { - - @Test - void test1() - { - } - - @Test - public void test2() - { - } - } - - private static class ClassWithNestedTestClass - { - - @SuppressWarnings("unused") - void method() - { - } - - @Nested - class TestClass - { - - @Test - void test1() - { - } - } - } - - private static class ClassWithDeeplyNestedTestClass - { - - @Nested - class Level1 - { - - @Nested - class Level2 - { - - @Nested - class TestClass - { - - @Test - void test1() - { - } - } - } - } - } - - private static class ClassWithTestFactory - { - - @TestFactory - Stream<DynamicTest> tests() - { - return Stream.empty(); - } - } - - private static class ClassWithNestedTestFactory - { - - @Nested - class TestClass - { - - @TestFactory - List<DynamicTest> tests() - { - return emptyList(); - } - } - } - -}
