Skip to content

Commit e25640f

Browse files
garydgregorygarydgregory
committed
Revert "Normalize test class names to *Test"
This reverts commit 61d0b32.
1 parent 61d0b32 commit e25640f

9 files changed

+3
-70
lines changed

‎src/test/java/org/apache/commons/lang3/time/CalendarUtilsTest.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@
3434
import org.junit.jupiter.api.Test;
3535
import org.junit.jupiter.params.ParameterizedTest;
3636
import org.junit.jupiter.params.provider.MethodSource;
37-
import org.junitpioneer.jupiter.DefaultLocale;
38-
import org.junitpioneer.jupiter.DefaultTimeZone;
39-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
40-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
4137

42-
/* Make test reproducible */ @DefaultLocale(language = "en")
43-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
44-
/* Make test reproducible */ @ReadsDefaultLocale
45-
/* Make test reproducible */ @ReadsDefaultTimeZone
4638
class CalendarUtilsTest extends AbstractLangTest {
4739

4840
@Test

‎src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,11 @@
3333
import org.junit.jupiter.api.Test;
3434
import org.junitpioneer.jupiter.DefaultLocale;
3535
import org.junitpioneer.jupiter.DefaultTimeZone;
36-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
37-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
3836

3937
/**
4038
* TestCase for DateFormatUtils.
4139
*/
4240
@SuppressWarnings("deprecation") // tests lots of deprecated items
43-
/* Make test reproducible */ @DefaultLocale(language = "en")
44-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
45-
/* Make test reproducible */ @ReadsDefaultLocale
46-
/* Make test reproducible */ @ReadsDefaultTimeZone
4741
class DateFormatUtilsTest extends AbstractLangTest {
4842
private void assertFormats(final String expectedValue, final String pattern, final TimeZone timeZone, final Calendar cal) {
4943
assertEquals(expectedValue, DateFormatUtils.format(cal.getTime(), pattern, timeZone));

‎src/test/java/org/apache/commons/lang3/time/DateUtilsFragmentTest.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,7 @@
2525
import org.apache.commons.lang3.AbstractLangTest;
2626
import org.junit.jupiter.api.BeforeEach;
2727
import org.junit.jupiter.api.Test;
28-
import org.junitpioneer.jupiter.DefaultLocale;
29-
import org.junitpioneer.jupiter.DefaultTimeZone;
30-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
31-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
32-
33-
/* Make test reproducible */ @DefaultLocale(language = "en")
34-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
35-
/* Make test reproducible */ @ReadsDefaultLocale
36-
/* Make test reproducible */ @ReadsDefaultTimeZone
28+
3729
class DateUtilsFragmentTest extends AbstractLangTest {
3830

3931
private static final int months = 7; // second final prime before 12

‎src/test/java/org/apache/commons/lang3/time/DateUtilsRoundingTest.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
import org.apache.commons.lang3.AbstractLangTest;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
31-
import org.junitpioneer.jupiter.DefaultLocale;
32-
import org.junitpioneer.jupiter.DefaultTimeZone;
33-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
34-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
3531

3632
/**
3733
* These Unit-tests will check all possible extremes when using some rounding-methods of DateUtils.
@@ -43,10 +39,6 @@
4339
* A month with 29 or 30 days will be rounded up from the 16th
4440
* A month with 31 days will be rounded up from the 17th
4541
*/
46-
/* Make test reproducible */ @DefaultLocale(language = "en")
47-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
48-
/* Make test reproducible */ @ReadsDefaultLocale
49-
/* Make test reproducible */ @ReadsDefaultTimeZone
5042
class DateUtilsRoundingTest extends AbstractLangTest {
5143

5244
DateFormat dateTimeParser;

‎src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,14 @@
3434
import org.apache.commons.lang3.AbstractLangTest;
3535
import org.apache.commons.lang3.time.DurationFormatUtils.Token;
3636
import org.junit.jupiter.api.Test;
37-
import org.junitpioneer.jupiter.DefaultLocale;
3837
import org.junitpioneer.jupiter.DefaultTimeZone;
39-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
40-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
4138

4239
/**
4340
* Tests {@link DurationFormatUtils}.
4441
* <p>
4542
* NOT THREAD-SAFE.
4643
* </p>
4744
*/
48-
/* Make test reproducible */ @DefaultLocale(language = "en")
49-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
50-
/* Make test reproducible */ @ReadsDefaultLocale
51-
/* Make test reproducible */ @ReadsDefaultTimeZone
5245
class DurationFormatUtilsTest extends AbstractLangTest {
5346

5447
private static final int FOUR_YEARS = 365 * 3 + 366;

‎src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,7 @@
2828

2929
import org.apache.commons.lang3.AbstractLangTest;
3030
import org.junit.jupiter.api.Test;
31-
import org.junitpioneer.jupiter.DefaultLocale;
32-
import org.junitpioneer.jupiter.DefaultTimeZone;
33-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
34-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
35-
36-
/* Make test reproducible */ @DefaultLocale(language = "en")
37-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
38-
/* Make test reproducible */ @ReadsDefaultLocale
39-
/* Make test reproducible */ @ReadsDefaultTimeZone
31+
4032
class FastDateParser_MoreOrLessTest extends AbstractLangTest {
4133

4234
private static final TimeZone NEW_YORK = TimeZone.getTimeZone("America/New_York");

‎src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,10 @@
3535
import org.junit.jupiter.api.Test;
3636
import org.junitpioneer.jupiter.DefaultLocale;
3737
import org.junitpioneer.jupiter.DefaultTimeZone;
38-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
39-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
4038

4139
/**
4240
* Tests {@link org.apache.commons.lang3.time.FastDatePrinter}.
4341
*/
44-
/* Make test reproducible */ @DefaultLocale(language = "en")
45-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
46-
/* Make test reproducible */ @ReadsDefaultLocale
47-
/* Make test reproducible */ @ReadsDefaultTimeZone
4842
class FastDatePrinterTest extends AbstractLangTest {
4943

5044
private enum Expected1806 {

‎src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,7 @@
2626
import org.apache.commons.lang3.AbstractLangTest;
2727
import org.junit.jupiter.params.ParameterizedTest;
2828
import org.junit.jupiter.params.provider.MethodSource;
29-
import org.junitpioneer.jupiter.DefaultLocale;
30-
import org.junitpioneer.jupiter.DefaultTimeZone;
31-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
32-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
33-
34-
/* Make test reproducible */ @DefaultLocale(language = "en")
35-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
36-
/* Make test reproducible */ @ReadsDefaultLocale
37-
/* Make test reproducible */ @ReadsDefaultTimeZone
29+
3830
class FastDatePrinterTimeZonesTest extends AbstractLangTest {
3931

4032
private static final String PATTERN = "h:mma z";

‎src/test/java/org/apache/commons/lang3/time/Java15BugFastDateParserTest.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
import org.junit.jupiter.api.Test;
3030
import org.junit.jupiter.params.ParameterizedTest;
3131
import org.junit.jupiter.params.provider.MethodSource;
32-
import org.junitpioneer.jupiter.DefaultLocale;
33-
import org.junitpioneer.jupiter.DefaultTimeZone;
34-
import org.junitpioneer.jupiter.ReadsDefaultLocale;
35-
import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
3632

3733
/**
3834
* These tests fail on Java 15 due to a bug which was only fixed for Java 16.
@@ -41,10 +37,6 @@
4137
* <li>https://bugs.openjdk.java.net/browse/JDK-8248655</li>
4238
* </ul>
4339
*/
44-
/* Make test reproducible */ @DefaultLocale(language = "en")
45-
/* Make test reproducible */ @DefaultTimeZone(TimeZones.GMT_ID)
46-
/* Make test reproducible */ @ReadsDefaultLocale
47-
/* Make test reproducible */ @ReadsDefaultTimeZone
4840
class Java15BugFastDateParserTest extends AbstractLangTest {
4941

5042
/** @see org.apache.commons.lang3.time.FastDateParserTest#dateParserParameters() */

0 commit comments

Comments
 (0)