This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new b279e28dd Remove unused test code
new 5e9b391ce Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-collections.git
b279e28dd is described below
commit b279e28dd6197c37d85fe9b6e1df9e05b5b7aa25
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jun 6 10:22:34 2022 -0400
Remove unused test code
---
.../junit/AbstractAvailableLocalesTest.java | 94 ----------------------
.../junit/SetDefaultLocaleTestRule.java | 58 -------------
2 files changed, 152 deletions(-)
diff --git
a/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
b/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
deleted file mode 100644
index ab038f175..000000000
---
a/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.commons.collections4.junit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public abstract class AbstractAvailableLocalesTest {
-
-// public static List<Object[]> combine(final Object[] objects, final
List<Locale> locales) {
-// final List<Object[]> result = new ArrayList<>(objects.length *
locales.size());
-// Arrays.stream(objects).forEachOrdered(object ->
locales.stream().forEachOrdered(locale -> result.add(new Object[] { object,
locale })));
-// return result;
-// }
-//
-// public static List<Object[]> combine(final Object[] objects, final
Locale[] locales) {
-// final List<Object[]> result = new ArrayList<>(objects.length *
locales.length);
-// Arrays.stream(objects).forEachOrdered(object ->
Arrays.stream(locales).forEachOrdered(locale -> result.add(new Object[] {
object, locale })));
-// return result;
-// }
-
-// public static List<Object[]> combineAvailableLocales(final Object[]
objects) {
-// return combine(objects, getSortedAvailableLocales());
-// }
-//
-// public static List<Object[]> combineDeclaredLocales(final Object[]
objects) {
-// return combine(objects, getSortedDeclaredLocales());
-// }
-
- @Parameters(name = "{0}")
- public static Locale[] getSortedAvailableLocales() {
- final Locale[] availableLocales = Locale.getAvailableLocales();
- Arrays.sort(availableLocales, new ObjectToStringComparator());
- return availableLocales;
- }
-
- public static List<Locale> getSortedDeclaredLocales() {
- final Field[] allFields = FieldUtils.getAllFields(Locale.class);
- final List<Locale> availableLocales = new
ArrayList<>(allFields.length);
- for (final Field field : allFields) {
- final int modifiers = field.getModifiers();
- if (field.getType() == Locale.class &&
Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
- try {
- availableLocales.add((Locale) field.get(Locale.class));
- } catch (final IllegalArgumentException |
IllegalAccessException e) {
- throw new IllegalStateException("Field " + field, e);
- }
- }
- }
- availableLocales.sort(ObjectToStringComparator.INSTANCE);
- return availableLocales;
- }
-
- private final Locale locale;
-
- @Rule
- public final SetDefaultLocaleTestRule rule;
-
- public AbstractAvailableLocalesTest(final Locale locale) {
- this.locale = locale;
- this.rule = new SetDefaultLocaleTestRule(locale);
- }
-
- public Locale getLocale() {
- return locale;
- }
-}
-
diff --git
a/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java
b/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java
deleted file mode 100644
index d8671ae2c..000000000
---
a/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.commons.collections4.junit;
-
-import java.util.Locale;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-/**
- * Sets the default {@code Locale} to the given locale for the duration of the
test.
- */
-public class SetDefaultLocaleTestRule implements TestRule {
-
- private final Locale locale;
-
- public SetDefaultLocaleTestRule(final Locale locale) {
- this.locale = locale;
- }
-
- @Override
- public Statement apply(final Statement base, final Description
description) {
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- final Locale savedLocale = Locale.getDefault();
- Locale.setDefault(getLocale());
- try {
- base.evaluate();
- } finally {
- Locale.setDefault(savedLocale);
- }
- }
- };
- }
-
- public Locale getLocale() {
- return locale;
- }
-
-}
-
