rpms/apache-commons-lang3
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.11, enable tests

Browse Source
This commit is contained in:
Marian Koncek 2020-08-04 15:51:48 +02:00
parent 06b5a2eafd
commit 888738d975
4 changed files with 352 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/commons-lang3-3.7-src.tar.gz
/commons-lang3-3.9-src.tar.gz
/commons-lang3-3.10-src.tar.gz
/commons-lang3-3.11-src.tar.gz

325
0001-Remove-usage-of-junit-pioneer.patch Normal file
View File

@ -0,0 +1,325 @@
From 5f6b1a0420d0a95826ccd73e53a4840e9df70cee Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Tue, 4 Aug 2020 14:49:48 +0200
Subject: [PATCH] Remove usage of junit pioneer
---
.../lang3/StringUtilsContainsTest.java | 5 ++--
.../lang3/time/DateFormatUtilsTest.java | 10 ++++---
.../commons/lang3/time/DateUtilsTest.java | 21 +++++++++----
.../lang3/time/FastDateFormatTest.java | 30 +++++++++++++------
.../lang3/time/FastDatePrinterTest.java | 14 +++++----
5 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
index 4a0a4cc..3fd6d99 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Locale;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.DefaultLocale;
/**
* Unit tests {@link org.apache.commons.lang3.StringUtils} - Contains methods
@@ -227,9 +226,10 @@ public class StringUtilsContainsTest {
assertTrue(StringUtils.containsAny("abc", "d", "abc"));
}
- @DefaultLocale(language = "de", country = "DE")
@Test
public void testContainsIgnoreCase_LocaleIndependence() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("de", "DE"));
final Locale[] locales = { Locale.ENGLISH, new Locale("tr"), Locale.getDefault() };
final String[][] tdata = { { "i", "I" }, { "I", "i" }, { "\u03C2", "\u03C3" }, { "\u03A3", "\u03C2" },
@@ -248,6 +248,7 @@ public class StringUtilsContainsTest {
Locale.getDefault() + ": " + j + " " + fdata[j][0] + " " + fdata[j][1]);
}
}
+ Locale.setDefault(current_locale);
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
index 31679de..20155e8 100644
--- a/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DateFormatUtilsTest.java
@@ -30,8 +30,6 @@ import java.util.Locale;
import java.util.TimeZone;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.DefaultLocale;
-import org.junitpioneer.jupiter.DefaultTimeZone;
/**
* TestCase for DateFormatUtils.
@@ -166,9 +164,10 @@ public class DateFormatUtilsTest {
testUTC("09:11:12Z", DateFormatUtils.ISO_TIME_NO_T_TIME_ZONE_FORMAT.getPattern());
}
- @DefaultLocale(language = "en")
@Test
public void testSMTP() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en"));
TimeZone timeZone = TimeZone.getTimeZone("GMT-3");
Calendar june = createJuneTestDate(timeZone);
@@ -179,6 +178,7 @@ public class DateFormatUtilsTest {
june = createJuneTestDate(timeZone);
assertFormats("Sun, 08 Jun 2003 10:11:12 +0000", DateFormatUtils.SMTP_DATETIME_FORMAT.getPattern(),
timeZone, june);
+ Locale.setDefault(current_locale);
}
@Test
@@ -187,14 +187,16 @@ public class DateFormatUtilsTest {
DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.parse(date);
}
- @DefaultTimeZone("UTC")
@Test
public void testLang530() throws ParseException {
+ TimeZone current_time_zone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
final Date d = new Date();
final String isoDateStr = DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.format(d);
final Date d2 = DateUtils.parseDate(isoDateStr, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
// the format loses milliseconds so have to reintroduce them
assertEquals(d.getTime(), d2.getTime() + d.getTime() % 1000, "Date not equal to itself ISO formatted and parsed");
+ TimeZone.setDefault(current_time_zone);
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
index 14dbf89..db0a51a 100644
--- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
@@ -39,7 +39,6 @@ import java.util.TimeZone;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.DefaultLocale;
/**
* Unit tests {@link org.apache.commons.lang3.time.DateUtils}.
@@ -1553,39 +1552,49 @@ public class DateUtilsTest {
dateParser.parse("December 2, 2001"));
}
- @DefaultLocale(language = "en")
@Test
public void testLANG799_EN_OK() throws ParseException {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en"));
DateUtils.parseDate("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
DateUtils.parseDateStrictly("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
+ Locale.setDefault(current_locale);
}
// Parse German date with English Locale
- @DefaultLocale(language = "en")
@Test
public void testLANG799_EN_FAIL() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en"));
assertThrows(ParseException.class, () -> DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz"));
+ Locale.setDefault(current_locale);
}
- @DefaultLocale(language = "de")
@Test
public void testLANG799_DE_OK() throws ParseException {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("de"));
DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
DateUtils.parseDateStrictly("Mi, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz");
+ Locale.setDefault(current_locale);
}
// Parse English date with German Locale
- @DefaultLocale(language = "de")
@Test
public void testLANG799_DE_FAIL() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("de"));
assertThrows(ParseException.class, () -> DateUtils.parseDate("Wed, 09 Apr 2008 23:55:38 GMT", "EEE, dd MMM yyyy HH:mm:ss zzz"));
+ Locale.setDefault(current_locale);
}
// Parse German date with English Locale, specifying German Locale override
- @DefaultLocale(language = "en")
@Test
public void testLANG799_EN_WITH_DE_LOCALE() throws ParseException {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en"));
DateUtils.parseDate("Mi, 09 Apr 2008 23:55:38 GMT", Locale.GERMAN, "EEE, dd MMM yyyy HH:mm:ss zzz");
+ Locale.setDefault(current_locale);
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
index 31c4ea8..f96da11 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
@@ -36,8 +36,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLongArray;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.DefaultLocale;
-import org.junitpioneer.jupiter.DefaultTimeZone;
/**
* Unit tests {@link org.apache.commons.lang3.time.FastDateFormat}.
@@ -70,11 +68,13 @@ public class FastDateFormatTest {
assertEquals(TimeZone.getDefault(), format2.getTimeZone());
}
- @DefaultLocale(language = "en", country = "US")
- @DefaultTimeZone("America/New_York")
@Test
public void test_getInstance_String_TimeZone() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
+ TimeZone current_time_zone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy",
TimeZone.getTimeZone("Atlantic/Reykjavik"));
final FastDateFormat format2 = FastDateFormat.getInstance("MM/DD/yyyy");
@@ -89,11 +89,14 @@ public class FastDateFormatTest {
assertSame(format3, format4);
assertNotSame(format3, format5);
assertNotSame(format4, format6);
+ Locale.setDefault(current_locale);
+ TimeZone.setDefault(current_time_zone);
}
- @DefaultLocale(language = "en", country = "US")
@Test
public void test_getInstance_String_Locale() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY);
final FastDateFormat format2 = FastDateFormat.getInstance("MM/DD/yyyy");
final FastDateFormat format3 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY);
@@ -101,11 +104,13 @@ public class FastDateFormatTest {
assertNotSame(format1, format2);
assertSame(format1, format3);
assertEquals(Locale.GERMANY, format1.getLocale());
+ Locale.setDefault(current_locale);
}
- @DefaultLocale(language = "en", country = "US")
@Test
public void test_changeDefault_Locale_DateInstance() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
final FastDateFormat format1 = FastDateFormat.getDateInstance(FastDateFormat.FULL, Locale.GERMANY);
final FastDateFormat format2 = FastDateFormat.getDateInstance(FastDateFormat.FULL);
Locale.setDefault(Locale.GERMANY);
@@ -116,11 +121,13 @@ public class FastDateFormatTest {
assertSame(Locale.GERMANY, format3.getLocale());
assertNotSame(format1, format2);
assertNotSame(format2, format3);
+ Locale.setDefault(current_locale);
}
- @DefaultLocale(language = "en", country = "US")
@Test
public void test_changeDefault_Locale_DateTimeInstance() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
final FastDateFormat format1 = FastDateFormat.getDateTimeInstance(FastDateFormat.FULL, FastDateFormat.FULL, Locale.GERMANY);
final FastDateFormat format2 = FastDateFormat.getDateTimeInstance(FastDateFormat.FULL, FastDateFormat.FULL);
Locale.setDefault(Locale.GERMANY);
@@ -131,12 +138,15 @@ public class FastDateFormatTest {
assertSame(Locale.GERMANY, format3.getLocale());
assertNotSame(format1, format2);
assertNotSame(format2, format3);
+ Locale.setDefault(current_locale);
}
- @DefaultLocale(language = "en", country = "US")
- @DefaultTimeZone("America/New_York")
@Test
public void test_getInstance_String_TimeZone_Locale() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
+ TimeZone current_time_zone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
final FastDateFormat format1 = FastDateFormat.getInstance("MM/DD/yyyy",
TimeZone.getTimeZone("Atlantic/Reykjavik"), Locale.GERMANY);
final FastDateFormat format2 = FastDateFormat.getInstance("MM/DD/yyyy", Locale.GERMANY);
@@ -150,6 +160,8 @@ public class FastDateFormatTest {
assertEquals(Locale.GERMANY, format1.getLocale());
assertEquals(Locale.GERMANY, format2.getLocale());
assertEquals(Locale.GERMANY, format3.getLocale());
+ Locale.setDefault(current_locale);
+ TimeZone.setDefault(current_time_zone);
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
index 096cbbb..32dcf6f 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
@@ -32,8 +32,6 @@ import java.util.TimeZone;
import org.apache.commons.lang3.SerializationUtils;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.DefaultLocale;
-import org.junitpioneer.jupiter.DefaultTimeZone;
/**
* Unit tests {@link org.apache.commons.lang3.time.FastDatePrinter}.
@@ -75,10 +73,12 @@ public class FastDatePrinterTest {
return new FastDatePrinter(format, timeZone, locale);
}
- @DefaultLocale(language = "en", country = "US")
- @DefaultTimeZone("America/New_York")
@Test
public void testFormat() {
+ Locale current_locale = Locale.getDefault();
+ Locale.setDefault(new Locale("en", "US"));
+ TimeZone current_time_zone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
final GregorianCalendar cal1 = new GregorianCalendar(2003, 0, 10, 15, 33, 20);
final GregorianCalendar cal2 = new GregorianCalendar(2003, 6, 10, 9, 0, 0);
final Date date1 = cal1.getTime();
@@ -121,6 +121,8 @@ public class FastDatePrinterTest {
// SDF bug fix starting with Java 7
assertEquals(sdf.format(date1).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date1));
assertEquals(sdf.format(date2).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date2));
+ Locale.setDefault(current_locale);
+ TimeZone.setDefault(current_time_zone);
}
/**
@@ -259,9 +261,10 @@ public class FastDatePrinterTest {
assertEquals(NEW_YORK, printer.getTimeZone());
}
- @DefaultTimeZone("UTC")
@Test
public void testTimeZoneAsZ() {
+ TimeZone current_time_zone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
final Calendar c = Calendar.getInstance(FastTimeZone.getGmtTimeZone());
final FastDateFormat noColonFormat = FastDateFormat.getInstance("Z");
assertEquals("+0000", noColonFormat.format(c));
@@ -271,6 +274,7 @@ public class FastDatePrinterTest {
final FastDateFormat colonFormat = FastDateFormat.getInstance("ZZZ");
assertEquals("+00:00", colonFormat.format(c));
+ TimeZone.setDefault(current_time_zone);
}
private static Calendar initializeCalendar(final TimeZone tz) {
--
2.25.4

30
apache-commons-lang3.spec
View File

@ -1,5 +1,5 @@
Name: apache-commons-lang3
Version: 3.10
Version: 3.11
Release: 1%{?dist}
Summary: Provides a host of helper utilities for the java.lang API
License: ASL 2.0
@ -7,10 +7,16 @@ URL: https://commons.apache.org/lang
BuildArch: noarch
Source0: https://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz
Patch1: 0001-Remove-usage-of-junit-pioneer.patch
BuildRequires: maven-local-openjdk8
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.easymock:easymock)
BuildRequires: mvn(org.hamcrest:hamcrest)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
%description
The standard Java libraries fail to provide enough methods for
@ -33,22 +39,33 @@ package.
%{?javadoc_package}
%prep
%autosetup -n commons-lang3-%{version}-src
%setup -n commons-lang3-%{version}-src
%patch1 -p1
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_dep org.junit-pioneer:junit-pioneer
%pom_remove_dep org.openjdk.jmh:jmh-core
%pom_remove_dep org.openjdk.jmh:jmh-generator-annprocess
%mvn_file : %{name} commons-lang3
# testParseSync() test fails on ARM and PPC64LE for unknown reason
sed -i 's/\s*public void testParseSync().*/@org.junit.Ignore\n&/' \
sed -i 's/\s*public void testParseSync().*/@org.junit.jupiter.api.Disabled\n&/' \
src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
# non-deterministic tests fail randomly
rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
# Missing dependencies
rm src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java
# Remove limits and Java 11 options
sed -i '/<argLine>/d' pom.xml
%build
# FIXME tests run against current system version of commons-lang3, not the one being built
%mvn_build -f
# See "-DcommonsLang3Version" in maven-surefire for the tested version
%mvn_build
%install
%mvn_install
@ -58,6 +75,9 @@ rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
%doc RELEASE-NOTES.txt
%changelog
* Tue Aug 04 2020 Marian Koncek <mkoncek@redhat.com> - 3.11-1
- Update to upstream version 3.11
* Wed Apr 15 2020 Marian Koncek <mkoncek@redhat.com> - 3.10-1
- Update to upstream version 3.10

2
sources
View File

@ -1 +1 @@
SHA512 (commons-lang3-3.10-src.tar.gz) = 8c3e90e60bbb0b83c8e5e8d173d5a982d6f5bf3d2392e11cd17b153484a87c42f3003a7ae84ff3c34a11c16df61d7a4fb8e902b31e0e9c2cef2a17115c0c468b
SHA512 (commons-lang3-3.11-src.tar.gz) = ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087