maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [maven-surefire] 02/02: Remove outdated JUnit5IT
Date Sun, 06 May 2018 09:51:42 GMT
This is an automated email from the ASF dual-hosted git repository.

sor pushed a commit to branch 1330
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 64fdcee8e4d3d1390da4b4742cbab52bd4b2abc8
Author: Christian Stein <sormuras@gmail.com>
AuthorDate: Sun May 6 11:51:30 2018 +0200

    Remove outdated JUnit5IT
---
 surefire-its/pom.xml                               |  1 -
 .../org/apache/maven/surefire/its/JUnit5IT.java    | 45 -------------
 surefire-its/src/test/resources/junit5/pom.xml     | 77 ----------------------
 .../junit5/src/test/java/junit5/JUnit4Test.java    | 64 ------------------
 .../junit5/src/test/java/junit5/JUnit5Test.java    | 65 ------------------
 5 files changed, 252 deletions(-)

diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index d4c7df4..e18bb3d 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -105,7 +105,6 @@
           <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1
-Djava.awt.headless=true</argLine>
           <includes>
             <include>org/apache/**/JUnit4VersionsIT.java</include>
-            <include>org/apache/**/JUnit5IT.java</include>
             <include>org/apache/**/JUnitPlatformIT.java</include>
           </includes>
           <!-- Pass current surefire version to the main suite so that it -->
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit5IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit5IT.java
deleted file mode 100644
index 8c5eb3a..0000000
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit5IT.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.maven.surefire.its;
-
-/*
- * 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 org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-
-/**
- * Basic suite test currently only running against JUnit 5 M2
- *
- * @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- */
-public class JUnit5IT
-    extends SurefireJUnit4IntegrationTestCase
-{
-
-    @Test
-    public void test()
-    {
-        assumeJavaVersion( 1.8d );
-
-        unpack( "/junit5" )
-                .executeTest()
-                .verifyErrorFree( 2 );
-    }
-}
diff --git a/surefire-its/src/test/resources/junit5/pom.xml b/surefire-its/src/test/resources/junit5/pom.xml
deleted file mode 100644
index 379a5bd..0000000
--- a/surefire-its/src/test/resources/junit5/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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>junit5</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>Test for JUnit 5</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <junit.jupiter.version>5.2.0</junit.jupiter.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit.vintage.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit4Test.java b/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit4Test.java
deleted file mode 100644
index 0a94b1a..0000000
--- a/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit4Test.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package 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 org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * A test using the JUnit 4 API, which should be executed by JUnit vintage enigne
- */
-public class JUnit4Test
-{
-
-    private boolean setUpCalled;
-
-    private static boolean tearDownCalled;
-
-    @Before
-    public void setUp()
-    {
-        setUpCalled = true;
-        System.out.println( "Called setUp" );
-    }
-
-    @After
-    public void tearDown()
-    {
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        Assert.assertTrue( "setUp was not called", setUpCalled );
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        Assert.assertTrue( "tearDown was not called", tearDownCalled );
-    }
-
-}
diff --git a/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit5Test.java b/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit5Test.java
deleted file mode 100644
index 558546d..0000000
--- a/surefire-its/src/test/resources/junit5/src/test/java/junit5/JUnit5Test.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package 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 org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * A test using the JUnit 5 API, which should be executed by JUnit jupiter enigne
- */
-public class JUnit5Test
-{
-
-    private boolean setUpCalled;
-
-    private static boolean tearDownCalled;
-
-    @BeforeEach
-    public void setUp()
-    {
-        setUpCalled = true;
-        System.out.println( "Called setUp" );
-    }
-
-    @AfterEach
-    public void tearDown()
-    {
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        Assertions.assertTrue( setUpCalled, "setUp was not called" );
-    }
-
-    @AfterAll
-    public static void oneTimeTearDown()
-    {
-        Assertions.assertTrue( tearDownCalled, "tearDown was not called" );
-    }
-
-}

-- 
To stop receiving notification emails like this one, please contact
sor@apache.org.

Mime
View raw message