Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For #939: Upgrade to Junit 5 #1015

Merged
merged 5 commits into from
Jan 30, 2019
Merged

For #939: Upgrade to Junit 5 #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b9fab
For #939: Upgrade to Junit 5
paulodamaso Jan 27, 2019
02e13e4
For #939: Corrected todo
paulodamaso Jan 28, 2019
09916f5
For #939: Code review corrections.
paulodamaso Jan 28, 2019
249a06d
For #939: Code review corrections.
paulodamaso Jan 29, 2019
b370a87
For #939: Code review corrections.
paulodamaso Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,23 @@
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<!--
@todo #939:30min Upgrade to Junit5. Continue to upgrade to Junit5
updating qulice-maven-plugin sub-module and removing remaining
junit4 tags.
-->
<dependency>
<groupId>org.junit.jupiter</groupId>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paulodamaso you also need to upgrade surefire and failsafe to the newest versions, right now they are taken from jcabi-parent

<artifactId>junit-jupiter-api</artifactId>
<version>5.3.1</version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paulodamaso this should be a test scope

<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
Expand Down Expand Up @@ -175,6 +192,38 @@
</tags>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<useFile>false</useFile>
<runOrder>random</runOrder>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>false</failIfNoTests>
<failIfNoSpecifiedTests>true</failIfNoSpecifiedTests>
<parallel>all</parallel>
<parallelTestsTimeoutInSeconds>0</parallelTestsTimeoutInSeconds>
<parallelTestsTimeoutForcedInSeconds>0</parallelTestsTimeoutForcedInSeconds>
<perCoreThreadCount>true</perCoreThreadCount>
<threadCount>4</threadCount>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
<forkCount>0</forkCount>
<parallel>all</parallel>
<parallelTestsTimeoutForcedInSeconds>0</parallelTestsTimeoutForcedInSeconds>
<parallelTestsTimeoutInSeconds>0</parallelTestsTimeoutInSeconds>
<perCoreThreadCount>true</perCoreThreadCount>
<runOrder>random</runOrder>
<threadCount>8</threadCount>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
19 changes: 13 additions & 6 deletions qulice-ant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,26 @@
<artifactId>jcabi-aspects</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
<build>
<plugins>

<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration combine.children="append">
Expand Down
10 changes: 5 additions & 5 deletions qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*/
package com.qulice.ant;

import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Test for AntEnvironment.
Expand All @@ -45,7 +45,7 @@ public class AntEnvironmentTest {
* @throws Exception If something wrong happens inside
*/
@Test
@Ignore
@Disabled
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
public void buildsClassloader() throws Exception {
}
Expand All @@ -55,7 +55,7 @@ public void buildsClassloader() throws Exception {
* @throws Exception If something wrong happens inside
*/
@Test
@Ignore
@Disabled
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
public void returnsFiles() throws Exception {
}
Expand All @@ -65,7 +65,7 @@ public void returnsFiles() throws Exception {
* @throws Exception If something wrong happens inside
*/
@Test
@Ignore
@Disabled
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
public void excludesFiles() throws Exception {
}
Expand Down
8 changes: 8 additions & 0 deletions qulice-checkstyle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
10 changes: 5 additions & 5 deletions qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
import org.hamcrest.collection.IsIterableContainingInOrder;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link CheckstyleValidator} class.
Expand Down Expand Up @@ -430,7 +430,7 @@ public void allowsOnlyProperlyOrderedAtClauses() throws Exception {
* @throws Exception If something wrong happens inside
*/
@Test
@Ignore
@Disabled
public void passesWindowsEndsOfLineWithoutException() throws Exception {
this.validate("WindowsEol.java", false, "LICENSE found:");
}
Expand All @@ -444,7 +444,7 @@ public void passesWindowsEndsOfLineWithoutException() throws Exception {
* correctly. (see changes done in #61)
*/
@Test
@Ignore
@Disabled
public void testWindowsEndsOfLineWithLinuxSources() throws Exception {
this.runValidation("WindowsEolLinux.java", false);
}
Expand Down Expand Up @@ -689,7 +689,7 @@ public void allowsUppercaseAbbreviationExceptions() throws Exception {
* being placed at end of lines. Correct this behavior and uncomment test
* below.
*/
@Ignore
@Disabled
@Test
public void checkLambdaAndGenericsAtEndOfLine() throws Exception {
this.runValidation("ValidLambdaAndGenericsAtEndOfLine.java", true);
Expand Down
8 changes: 8 additions & 0 deletions qulice-findbugs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
10 changes: 5 additions & 5 deletions qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import com.google.common.base.Joiner;
import com.qulice.spi.Environment;
import com.qulice.spi.ValidationException;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link FindBugsValidator}.
Expand All @@ -58,8 +58,8 @@ public void passesCorrectFilesWithNoExceptions() throws Exception {
* FindbugsValidator can report incorrectly added throws.
* @throws Exception If something wrong happens inside
*/
@Ignore
@Test(expected = ValidationException.class)
@Disabled
@org.junit.Test(expected = ValidationException.class)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paulodamaso this should be from jupiter

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krzyk I've not changed all tags from Jnit 4, as it would take way more than 30 min. I've left those expected tags to be fixed later in the @todo

public void reportsIncorrectlyAddedThrows() throws Exception {
final byte[] bytecode = new BytecodeMocker()
.withSource(
Expand Down Expand Up @@ -107,7 +107,7 @@ public void ignoresCorrectlyAddedThrows() throws Exception {
* FindbugsValidator throw exception for invalid file.
* @throws Exception If something wrong happens inside
*/
@Test(expected = ValidationException.class)
@org.junit.Test(expected = ValidationException.class)
public void throwsExceptionOnViolation() throws Exception {
final byte[] bytecode = new BytecodeMocker()
.withSource("class Foo { public Foo clone() { return this; } }")
Expand Down
2 changes: 1 addition & 1 deletion qulice-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.3</version>
<version>3.4</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
Expand Down
8 changes: 8 additions & 0 deletions qulice-pmd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion qulice-pmd/src/test/java/com/qulice/pmd/LocalVariableCouldBeFinalRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import org.hamcrest.core.IsEqual;
import org.hamcrest.core.StringStartsWith;
import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* Test case for LocalVariableCouldBeFinal.
Expand Down
2 changes: 1 addition & 1 deletion qulice-pmd/src/test/java/com/qulice/pmd/PmdEmptyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
package com.qulice.pmd;

import org.hamcrest.Matchers;
import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link PmdValidator} class.
Expand Down
2 changes: 1 addition & 1 deletion qulice-pmd/src/test/java/com/qulice/pmd/PmdValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.hamcrest.Matchers;
import org.hamcrest.core.IsEqual;
import org.hamcrest.core.IsNot;
import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link PmdValidator} class.
Expand Down
2 changes: 1 addition & 1 deletion qulice-pmd/src/test/java/com/qulice/pmd/UnusedImportsRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import org.hamcrest.core.IsEqual;
import org.hamcrest.core.StringStartsWith;
import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* Test case for LocalVariableCouldBeFinal.
Expand Down
18 changes: 9 additions & 9 deletions qulice-pmd/src/test/java/com/qulice/pmd/UseStringIsEmptyRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
import org.hamcrest.Matchers;
import org.hamcrest.core.IsEqual;
import org.hamcrest.core.StringContains;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link UseStringIsEmptyRule}.
* Test case for {@link com.qulice.pmd.rules.UseStringIsEmptyRule}.
* @since 0.18
* @todo #950:30min UseStringIsEmptyRuleTest is not comparing all possible
* targets. Implement the tests for the remaining targets (see complete list in
Expand Down Expand Up @@ -99,7 +99,7 @@ public void detectsLengthLessThanOne() throws Exception {
* 0.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthEqualsZeroThis() throws Exception {
new PmdAssert(
Expand All @@ -112,7 +112,7 @@ public void detectsLengthEqualsZeroThis() throws Exception {
* UseStringIsEmptyRule can detect when this.String.length() >= 1.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthGreaterOrEqualOneThis() throws Exception {
new PmdAssert(
Expand All @@ -125,7 +125,7 @@ public void detectsLengthGreaterOrEqualOneThis() throws Exception {
* UseStringIsEmptyRule can detect when this.String.length() < 1.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthLessThanOneThis() throws Exception {
new PmdAssert(
Expand All @@ -139,7 +139,7 @@ public void detectsLengthLessThanOneThis() throws Exception {
* 0, when String is returned by a method.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthEqualsZeroMethod() throws Exception {
new PmdAssert(
Expand All @@ -153,7 +153,7 @@ public void detectsLengthEqualsZeroMethod() throws Exception {
* String is returned by a method.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthGreaterOrEqualOneMethod() throws Exception {
new PmdAssert(
Expand All @@ -167,7 +167,7 @@ public void detectsLengthGreaterOrEqualOneMethod() throws Exception {
* String is returned by a method.
* @throws Exception If something goes wrong
*/
@Ignore
@Disabled
@Test
public void detectsLengthLessThanOneMethod() throws Exception {
new PmdAssert(
Expand Down
8 changes: 8 additions & 0 deletions qulice-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion qulice-spi/src/test/java/com/qulice/spi/EnvironmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import java.io.File;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link Environment}.
Expand Down
Loading