Skip to content

Commit 93cf62a

Browse files
rultorrultor
committedJan 30, 2019
Merge branch '__rultor'
·
0.24.00.18.13
2 parents 96a516c + b370a87 commit 93cf62a

File tree

18 files changed

+132
-40
lines changed

18 files changed

+132
-40
lines changed
 

‎pom.xml

+49
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,23 @@
134134
<artifactId>commons-lang3</artifactId>
135135
<version>3.7</version>
136136
</dependency>
137+
<!--
138+
@todo #939:30min Upgrade to Junit5. Continue to upgrade to Junit5
139+
updating qulice-maven-plugin sub-module and removing remaining
140+
junit4 tags.
141+
-->
142+
<dependency>
143+
<groupId>org.junit.jupiter</groupId>
144+
<artifactId>junit-jupiter-api</artifactId>
145+
<version>5.3.1</version>
146+
<scope>test</scope>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.junit.jupiter</groupId>
150+
<artifactId>junit-jupiter-engine</artifactId>
151+
<version>5.3.1</version>
152+
<scope>test</scope>
153+
</dependency>
137154
</dependencies>
138155
</dependencyManagement>
139156
<build>
@@ -175,6 +192,38 @@
175192
</tags>
176193
</configuration>
177194
</plugin>
195+
<plugin>
196+
<artifactId>maven-surefire-plugin</artifactId>
197+
<version>3.0.0-M3</version>
198+
<configuration>
199+
<useFile>false</useFile>
200+
<runOrder>random</runOrder>
201+
<trimStackTrace>false</trimStackTrace>
202+
<failIfNoTests>false</failIfNoTests>
203+
<failIfNoSpecifiedTests>true</failIfNoSpecifiedTests>
204+
<parallel>all</parallel>
205+
<parallelTestsTimeoutInSeconds>0</parallelTestsTimeoutInSeconds>
206+
<parallelTestsTimeoutForcedInSeconds>0</parallelTestsTimeoutForcedInSeconds>
207+
<perCoreThreadCount>true</perCoreThreadCount>
208+
<threadCount>4</threadCount>
209+
</configuration>
210+
</plugin>
211+
<plugin>
212+
<artifactId>maven-failsafe-plugin</artifactId>
213+
<version>3.0.0-M3</version>
214+
<configuration>
215+
<encoding>${project.build.sourceEncoding}</encoding>
216+
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
217+
<forkCount>0</forkCount>
218+
<parallel>all</parallel>
219+
<parallelTestsTimeoutForcedInSeconds>0</parallelTestsTimeoutForcedInSeconds>
220+
<parallelTestsTimeoutInSeconds>0</parallelTestsTimeoutInSeconds>
221+
<perCoreThreadCount>true</perCoreThreadCount>
222+
<runOrder>random</runOrder>
223+
<threadCount>8</threadCount>
224+
<trimStackTrace>false</trimStackTrace>
225+
</configuration>
226+
</plugin>
178227
</plugins>
179228
</pluginManagement>
180229
<plugins>

‎qulice-ant/pom.xml

+13-6
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,26 @@
8989
<artifactId>jcabi-aspects</artifactId>
9090
<scope>provided</scope>
9191
</dependency>
92-
<dependency>
93-
<groupId>org.apache.ant</groupId>
94-
<artifactId>ant</artifactId>
95-
<version>1.9.4</version>
96-
</dependency>
92+
<dependency>
93+
<groupId>org.apache.ant</groupId>
94+
<artifactId>ant</artifactId>
95+
<version>1.9.4</version>
96+
</dependency>
9797
<dependency>
9898
<groupId>commons-io</groupId>
9999
<artifactId>commons-io</artifactId>
100100
</dependency>
101+
<dependency>
102+
<groupId>org.junit.jupiter</groupId>
103+
<artifactId>junit-jupiter-api</artifactId>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.junit.jupiter</groupId>
107+
<artifactId>junit-jupiter-engine</artifactId>
108+
</dependency>
101109
</dependencies>
102110
<build>
103111
<plugins>
104-
105112
<plugin>
106113
<artifactId>maven-invoker-plugin</artifactId>
107114
<configuration combine.children="append">

‎qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
*/
3030
package com.qulice.ant;
3131

32-
import org.junit.Ignore;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.Disabled;
33+
import org.junit.jupiter.api.Test;
3434

3535
/**
3636
* Test for AntEnvironment.
@@ -45,7 +45,7 @@ public class AntEnvironmentTest {
4545
* @throws Exception If something wrong happens inside
4646
*/
4747
@Test
48-
@Ignore
48+
@Disabled
4949
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
5050
public void buildsClassloader() throws Exception {
5151
}
@@ -55,7 +55,7 @@ public void buildsClassloader() throws Exception {
5555
* @throws Exception If something wrong happens inside
5656
*/
5757
@Test
58-
@Ignore
58+
@Disabled
5959
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
6060
public void returnsFiles() throws Exception {
6161
}
@@ -65,7 +65,7 @@ public void returnsFiles() throws Exception {
6565
* @throws Exception If something wrong happens inside
6666
*/
6767
@Test
68-
@Ignore
68+
@Disabled
6969
@SuppressWarnings("PMD.UncommentedEmptyMethodBody")
7070
public void excludesFiles() throws Exception {
7171
}

‎qulice-checkstyle/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@
9494
<groupId>org.apache.commons</groupId>
9595
<artifactId>commons-lang3</artifactId>
9696
</dependency>
97+
<dependency>
98+
<groupId>org.junit.jupiter</groupId>
99+
<artifactId>junit-jupiter-api</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.junit.jupiter</groupId>
103+
<artifactId>junit-jupiter-engine</artifactId>
104+
</dependency>
97105
</dependencies>
98106
<build>
99107
<plugins>

‎qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
import org.hamcrest.Matchers;
4747
import org.hamcrest.TypeSafeMatcher;
4848
import org.hamcrest.collection.IsIterableContainingInOrder;
49-
import org.junit.Ignore;
5049
import org.junit.Rule;
51-
import org.junit.Test;
50+
import org.junit.jupiter.api.Disabled;
51+
import org.junit.jupiter.api.Test;
5252

5353
/**
5454
* Test case for {@link CheckstyleValidator} class.
@@ -430,7 +430,7 @@ public void allowsOnlyProperlyOrderedAtClauses() throws Exception {
430430
* @throws Exception If something wrong happens inside
431431
*/
432432
@Test
433-
@Ignore
433+
@Disabled
434434
public void passesWindowsEndsOfLineWithoutException() throws Exception {
435435
this.validate("WindowsEol.java", false, "LICENSE found:");
436436
}
@@ -444,7 +444,7 @@ public void passesWindowsEndsOfLineWithoutException() throws Exception {
444444
* correctly. (see changes done in #61)
445445
*/
446446
@Test
447-
@Ignore
447+
@Disabled
448448
public void testWindowsEndsOfLineWithLinuxSources() throws Exception {
449449
this.runValidation("WindowsEolLinux.java", false);
450450
}
@@ -689,7 +689,7 @@ public void allowsUppercaseAbbreviationExceptions() throws Exception {
689689
* being placed at end of lines. Correct this behavior and uncomment test
690690
* below.
691691
*/
692-
@Ignore
692+
@Disabled
693693
@Test
694694
public void checkLambdaAndGenericsAtEndOfLine() throws Exception {
695695
this.runValidation("ValidLambdaAndGenericsAtEndOfLine.java", true);

‎qulice-findbugs/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,14 @@
173173
</exclusion>
174174
</exclusions>
175175
</dependency>
176+
<dependency>
177+
<groupId>org.junit.jupiter</groupId>
178+
<artifactId>junit-jupiter-api</artifactId>
179+
</dependency>
180+
<dependency>
181+
<groupId>org.junit.jupiter</groupId>
182+
<artifactId>junit-jupiter-engine</artifactId>
183+
</dependency>
176184
</dependencies>
177185
<build>
178186
<plugins>

‎qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import com.google.common.base.Joiner;
3333
import com.qulice.spi.Environment;
3434
import com.qulice.spi.ValidationException;
35-
import org.junit.Ignore;
36-
import org.junit.Test;
35+
import org.junit.jupiter.api.Disabled;
36+
import org.junit.jupiter.api.Test;
3737

3838
/**
3939
* Test case for {@link FindBugsValidator}.
@@ -58,8 +58,8 @@ public void passesCorrectFilesWithNoExceptions() throws Exception {
5858
* FindbugsValidator can report incorrectly added throws.
5959
* @throws Exception If something wrong happens inside
6060
*/
61-
@Ignore
62-
@Test(expected = ValidationException.class)
61+
@Disabled
62+
@org.junit.Test(expected = ValidationException.class)
6363
public void reportsIncorrectlyAddedThrows() throws Exception {
6464
final byte[] bytecode = new BytecodeMocker()
6565
.withSource(
@@ -107,7 +107,7 @@ public void ignoresCorrectlyAddedThrows() throws Exception {
107107
* FindbugsValidator throw exception for invalid file.
108108
* @throws Exception If something wrong happens inside
109109
*/
110-
@Test(expected = ValidationException.class)
110+
@org.junit.Test(expected = ValidationException.class)
111111
public void throwsExceptionOnViolation() throws Exception {
112112
final byte[] bytecode = new BytecodeMocker()
113113
.withSource("class Foo { public Foo clone() { return this; } }")

‎qulice-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
</plugin>
261261
<plugin>
262262
<artifactId>maven-plugin-plugin</artifactId>
263-
<version>3.3</version>
263+
<version>3.4</version>
264264
<configuration>
265265
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
266266
</configuration>

‎qulice-pmd/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@
8686
<groupId>commons-io</groupId>
8787
<artifactId>commons-io</artifactId>
8888
</dependency>
89+
<dependency>
90+
<groupId>org.junit.jupiter</groupId>
91+
<artifactId>junit-jupiter-api</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.junit.jupiter</groupId>
95+
<artifactId>junit-jupiter-engine</artifactId>
96+
</dependency>
8997
</dependencies>
9098
<build>
9199
<plugins>

‎qulice-pmd/src/test/java/com/qulice/pmd/LocalVariableCouldBeFinalRuleTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import org.hamcrest.core.IsEqual;
3333
import org.hamcrest.core.StringStartsWith;
34-
import org.junit.Test;
34+
import org.junit.jupiter.api.Test;
3535

3636
/**
3737
* Test case for LocalVariableCouldBeFinal.

‎qulice-pmd/src/test/java/com/qulice/pmd/PmdEmptyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
package com.qulice.pmd;
3131

3232
import org.hamcrest.Matchers;
33-
import org.junit.Test;
33+
import org.junit.jupiter.api.Test;
3434

3535
/**
3636
* Test case for {@link PmdValidator} class.

‎qulice-pmd/src/test/java/com/qulice/pmd/PmdValidatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.hamcrest.Matchers;
4242
import org.hamcrest.core.IsEqual;
4343
import org.hamcrest.core.IsNot;
44-
import org.junit.Test;
44+
import org.junit.jupiter.api.Test;
4545

4646
/**
4747
* Test case for {@link PmdValidator} class.

‎qulice-pmd/src/test/java/com/qulice/pmd/UnusedImportsRuleTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import org.hamcrest.core.IsEqual;
3333
import org.hamcrest.core.StringStartsWith;
34-
import org.junit.Test;
34+
import org.junit.jupiter.api.Test;
3535

3636
/**
3737
* Test case for LocalVariableCouldBeFinal.

‎qulice-pmd/src/test/java/com/qulice/pmd/UseStringIsEmptyRuleTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
import org.hamcrest.core.IsEqual;
3333
import org.hamcrest.core.StringContains;
34-
import org.junit.Ignore;
35-
import org.junit.Test;
34+
import org.junit.jupiter.api.Disabled;
35+
import org.junit.jupiter.api.Test;
3636

3737
/**
3838
* Test case for {@link com.qulice.pmd.rules.UseStringIsEmptyRule}.
@@ -165,7 +165,7 @@ public void detectsLengthLessOrEqualZero() throws Exception {
165165
* 0.
166166
* @throws Exception If something goes wrong
167167
*/
168-
@Ignore
168+
@Disabled
169169
@Test
170170
public void detectsLengthEqualsZeroThis() throws Exception {
171171
new PmdAssert(
@@ -178,7 +178,7 @@ public void detectsLengthEqualsZeroThis() throws Exception {
178178
* UseStringIsEmptyRule can detect when this.String.length() >= 1.
179179
* @throws Exception If something goes wrong
180180
*/
181-
@Ignore
181+
@Disabled
182182
@Test
183183
public void detectsLengthGreaterOrEqualOneThis() throws Exception {
184184
new PmdAssert(
@@ -191,7 +191,7 @@ public void detectsLengthGreaterOrEqualOneThis() throws Exception {
191191
* UseStringIsEmptyRule can detect when this.String.length() < 1.
192192
* @throws Exception If something goes wrong
193193
*/
194-
@Ignore
194+
@Disabled
195195
@Test
196196
public void detectsLengthLessThanOneThis() throws Exception {
197197
new PmdAssert(
@@ -205,7 +205,7 @@ public void detectsLengthLessThanOneThis() throws Exception {
205205
* 0, when String is returned by a method.
206206
* @throws Exception If something goes wrong
207207
*/
208-
@Ignore
208+
@Disabled
209209
@Test
210210
public void detectsLengthEqualsZeroMethod() throws Exception {
211211
new PmdAssert(
@@ -219,7 +219,7 @@ public void detectsLengthEqualsZeroMethod() throws Exception {
219219
* String is returned by a method.
220220
* @throws Exception If something goes wrong
221221
*/
222-
@Ignore
222+
@Disabled
223223
@Test
224224
public void detectsLengthGreaterOrEqualOneMethod() throws Exception {
225225
new PmdAssert(
@@ -233,7 +233,7 @@ public void detectsLengthGreaterOrEqualOneMethod() throws Exception {
233233
* String is returned by a method.
234234
* @throws Exception If something goes wrong
235235
*/
236-
@Ignore
236+
@Disabled
237237
@Test
238238
public void detectsLengthLessThanOneMethod() throws Exception {
239239
new PmdAssert(

‎qulice-spi/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
<groupId>org.projectlombok</groupId>
5252
<artifactId>lombok</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>org.junit.jupiter</groupId>
56+
<artifactId>junit-jupiter-api</artifactId>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.junit.jupiter</groupId>
60+
<artifactId>junit-jupiter-engine</artifactId>
61+
</dependency>
5462
</dependencies>
5563
<build>
5664
<plugins>

‎qulice-spi/src/test/java/com/qulice/spi/EnvironmentTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.io.File;
3333
import org.hamcrest.MatcherAssert;
3434
import org.hamcrest.Matchers;
35-
import org.junit.Test;
35+
import org.junit.jupiter.api.Test;
3636

3737
/**
3838
* Test case for {@link Environment}.

‎qulice-spotbugs/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@
4949
<version>${project.version}</version>
5050
</dependency>
5151
<dependency>
52-
<groupId>junit</groupId>
53-
<artifactId>junit</artifactId>
52+
<groupId>org.junit.jupiter</groupId>
53+
<artifactId>junit-jupiter-api</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.junit.jupiter</groupId>
57+
<artifactId>junit-jupiter-engine</artifactId>
5458
</dependency>
5559
</dependencies>
5660
<build>

‎qulice-spotbugs/src/test/java/com.qulice.spotbugs/SpotBugsValidatorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
package com.qulice.spotbugs;
3131

3232
import com.qulice.spi.Environment;
33-
import org.junit.Ignore;
34-
import org.junit.Test;
33+
import org.junit.jupiter.api.Disabled;
34+
import org.junit.jupiter.api.Test;
3535

3636
/**
3737
* Test case for {@link SpotBugsValidator}.
@@ -42,7 +42,7 @@
4242
* remove FindBugs references from pom and from qulice executions.
4343
*/
4444
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
45-
@Ignore
45+
@Disabled
4646
public final class SpotBugsValidatorTest {
4747

4848
/**

1 commit comments

Comments
 (1)

0pdd commented on Jan 30, 2019

@0pdd
0pdd
on Jan 30, 2019
Collaborator

Puzzle 939-39a57206 discovered in pom.xml and submitted as #1019. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.