You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 22:24:26 UTC
svn commit: r1842194 [28/34] - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/
main/java/org/apache/commons/configuration2/builder/
main/java/org/apache/com...
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultListDelimiterHandler.java Thu Sep 27 22:24:23 2018
@@ -90,7 +90,7 @@ public class TestDefaultListDelimiterHan
@Test
public void testEscapeWithTransformer()
{
- ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
+ final ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
EasyMock.expect(trans.transformValue("a\\,b")).andReturn("ok");
EasyMock.replay(trans);
assertEquals("Wrong result", "ok", handler.escape("a,b", trans));
@@ -103,15 +103,15 @@ public class TestDefaultListDelimiterHan
@Test
public void testEscapeList()
{
- ValueTransformer trans = new ValueTransformer()
+ final ValueTransformer trans = new ValueTransformer()
{
@Override
- public Object transformValue(Object value)
+ public Object transformValue(final Object value)
{
return String.valueOf(value) + "_trans";
}
};
- List<String> data =
+ final List<String> data =
Arrays.asList("simple", "Hello,world!", "\\,\\", "end");
assertEquals("Wrong result", "simple_trans,Hello\\,world!_trans,"
+ "\\\\\\,\\\\_trans,end_trans",
@@ -127,14 +127,14 @@ public class TestDefaultListDelimiterHan
* @param trim the trim flag
* @param expectedElements the expected results
*/
- private void checkSplit(String value, boolean trim,
- String... expectedElements)
+ private void checkSplit(final String value, final boolean trim,
+ final String... expectedElements)
{
- Collection<String> elems = handler.split(value, trim);
+ final Collection<String> elems = handler.split(value, trim);
assertEquals("Wrong number of elements", expectedElements.length,
elems.size());
int idx = 0;
- for (String elem : elems)
+ for (final String elem : elems)
{
assertEquals("Wrong value at " + idx, expectedElements[idx++], elem);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java Thu Sep 27 22:24:23 2018
@@ -58,10 +58,10 @@ public class TestDisabledListDelimiterHa
*
* @param container the iterator to test
*/
- private static void checkIterator(Iterable<?> container)
+ private static void checkIterator(final Iterable<?> container)
{
- Iterator<?> it = container.iterator();
- for (Object o : VALUES)
+ final Iterator<?> it = container.iterator();
+ for (final Object o : VALUES)
{
assertEquals("Wrong value", o, it.next());
}
@@ -101,7 +101,7 @@ public class TestDisabledListDelimiterHa
@Test
public void testParseSimpleValue()
{
- Iterator<?> it = handler.parse(STR_VALUE).iterator();
+ final Iterator<?> it = handler.parse(STR_VALUE).iterator();
assertEquals("Wrong value", STR_VALUE, it.next());
assertFalse("Too many values", it.hasNext());
}
@@ -133,8 +133,8 @@ public class TestDisabledListDelimiterHa
@Test
public void testEscapeStringValueTransformer()
{
- ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
- String testStr = "Some other string";
+ final ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
+ final String testStr = "Some other string";
EasyMock.expect(trans.transformValue(testStr)).andReturn(STR_VALUE);
EasyMock.replay(trans);
assertEquals("Wrong escaped string", STR_VALUE,
@@ -149,7 +149,7 @@ public class TestDisabledListDelimiterHa
@Test
public void testEscapeNonStringValue()
{
- Object value = 42;
+ final Object value = 42;
assertEquals("Wrong escaped object", value,
handler.escape(value, ListDelimiterHandler.NOOP_TRANSFORMER));
}
@@ -161,8 +161,8 @@ public class TestDisabledListDelimiterHa
@Test
public void testEscapeNonStringValueTransformer()
{
- ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
- Object value = 42;
+ final ValueTransformer trans = EasyMock.createMock(ValueTransformer.class);
+ final Object value = 42;
EasyMock.expect(trans.transformValue(value)).andReturn(STR_VALUE);
EasyMock.replay(trans);
assertEquals("Wrong escaped object", STR_VALUE,
@@ -186,7 +186,7 @@ public class TestDisabledListDelimiterHa
@Test
public void testFlattenArrayWithLimit()
{
- Collection<?> res = handler.flatten(VALUES, 1);
+ final Collection<?> res = handler.flatten(VALUES, 1);
assertEquals("Wrong collection size", 1, res.size());
assertEquals("Wrong element", VALUES[0], res.iterator().next());
}
@@ -198,8 +198,8 @@ public class TestDisabledListDelimiterHa
@Test
public void testFlattenCollectionWithLimit()
{
- Collection<Object> src = Arrays.asList(VALUES);
- Collection<?> res = handler.flatten(src, 1);
+ final Collection<Object> src = Arrays.asList(VALUES);
+ final Collection<?> res = handler.flatten(src, 1);
assertEquals("Wrong collection size", 1, res.size());
assertEquals("Wrong element", VALUES[0], res.iterator().next());
}
@@ -211,12 +211,12 @@ public class TestDisabledListDelimiterHa
@Test
public void testFlattenCollectionWithArrayWithLimit()
{
- Collection<Object> src = new ArrayList<>(2);
+ final Collection<Object> src = new ArrayList<>(2);
src.add(STR_VALUE);
src.add(VALUES);
- Collection<?> res = handler.flatten(src, 2);
+ final Collection<?> res = handler.flatten(src, 2);
assertEquals("Wrong collection size", 2, res.size());
- Iterator<?> it = res.iterator();
+ final Iterator<?> it = res.iterator();
assertEquals("Wrong element (1)", STR_VALUE, it.next());
assertEquals("Wrong element (2)", VALUES[0], it.next());
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java Thu Sep 27 22:24:23 2018
@@ -48,7 +48,7 @@ public class TestPropertyConverter
@Test
public void testToFileDirect()
{
- File f = new File("dir", "file");
+ final File f = new File("dir", "file");
assertSame("Wrong file", f, PropertyConverter.toFile(f));
}
@@ -68,7 +68,7 @@ public class TestPropertyConverter
@Test
public void testToFileFromPath()
{
- Path p = Paths.get("dir", "file");
+ final Path p = Paths.get("dir", "file");
assertEquals("Wrong conversion result", new File("dir", "file"), PropertyConverter.toFile(p));
}
@@ -79,7 +79,7 @@ public class TestPropertyConverter
@Test
public void testToPathDirect()
{
- Path p = Paths.get("dir", "file");
+ final Path p = Paths.get("dir", "file");
assertSame("Wrong path", p, PropertyConverter.toPath(p));
}
@@ -99,7 +99,7 @@ public class TestPropertyConverter
@Test
public void testToPathFromFile()
{
- File f = new File("dir", "file");
+ final File f = new File("dir", "file");
assertEquals("Wrong conversion result", Paths.get("dir", "file"), PropertyConverter.toPath(f));
}
@@ -110,9 +110,9 @@ public class TestPropertyConverter
@Test
public void testToNumberDirect()
{
- Integer i = new Integer(42);
+ final Integer i = new Integer(42);
assertSame("Wrong integer", i, PropertyConverter.toNumber(i, Integer.class));
- BigDecimal d = new BigDecimal("3.1415");
+ final BigDecimal d = new BigDecimal("3.1415");
assertSame("Wrong BigDecimal", d, PropertyConverter.toNumber(d, Integer.class));
}
@@ -134,7 +134,7 @@ public class TestPropertyConverter
@Test
public void testToNumberFromHexString()
{
- Number n = PropertyConverter.toNumber("0x10", Integer.class);
+ final Number n = PropertyConverter.toNumber("0x10", Integer.class);
assertEquals("Incorrect Integer value", 16, n.intValue());
}
@@ -155,7 +155,7 @@ public class TestPropertyConverter
@Test
public void testToNumberFromBinaryString()
{
- Number n = PropertyConverter.toNumber("0b1111", Integer.class);
+ final Number n = PropertyConverter.toNumber("0b1111", Integer.class);
assertEquals("Incorrect Integer value", 15, n.intValue());
}
@@ -196,7 +196,7 @@ public class TestPropertyConverter
@Test
public void testToPatternDirect()
{
- Pattern p = Pattern.compile(".+");
+ final Pattern p = Pattern.compile(".+");
assertSame("Wrong pattern", p, PropertyConverter.toPattern(p));
}
@@ -207,7 +207,7 @@ public class TestPropertyConverter
@Test
public void testToPatternFromString()
{
- Pattern p = Pattern.compile(".+");
+ final Pattern p = Pattern.compile(".+");
assertEquals("Wrong conversion result", p.pattern(), PropertyConverter.toPattern(".+").pattern());
}
@@ -249,7 +249,7 @@ public class TestPropertyConverter
@Test
public void testToNoConversionNeeded()
{
- String value = "testValue";
+ final String value = "testValue";
assertEquals("Wrong conversion result", value, PropertyConverter.to(
String.class, value, new DefaultConversionHandler()));
}
@@ -272,7 +272,7 @@ public class TestPropertyConverter
@Test
public void testToCharViaToString()
{
- Object value = new Object()
+ final Object value = new Object()
{
@Override
public String toString()
@@ -301,8 +301,8 @@ public class TestPropertyConverter
@Test
public void testToStringConversion()
{
- Integer src = 42;
- Object result =
+ final Integer src = 42;
+ final Object result =
PropertyConverter.to(String.class, src,
new DefaultConversionHandler());
assertEquals("Wrong resulting string", "42", result);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java Thu Sep 27 22:24:23 2018
@@ -46,14 +46,14 @@ public abstract class AbstractEventListe
* @param source the event source (<b>null</b> if the source need not to be
* checked)
*/
- protected AbstractEventListenerTestImpl(Object source)
+ protected AbstractEventListenerTestImpl(final Object source)
{
expectedSource = source;
events = new LinkedList<>();
}
@Override
- public void onEvent(T event)
+ public void onEvent(final T event)
{
events.add(event);
}
@@ -63,7 +63,7 @@ public abstract class AbstractEventListe
*
* @param minEvents the minimum number of expected events
*/
- public void checkEventCount(int minEvents)
+ public void checkEventCount(final int minEvents)
{
assertTrue("Too view events received", events.size() >= minEvents);
}
@@ -74,10 +74,10 @@ public abstract class AbstractEventListe
* @param expectedType the expected type of the event
* @return the event object
*/
- public T nextEvent(EventType<?> expectedType)
+ public T nextEvent(final EventType<?> expectedType)
{
assertFalse("Too few events received", events.isEmpty());
- T e = events.remove(0);
+ final T e = events.remove(0);
if (expectedSource != null)
{
assertEquals("Wrong event source", expectedSource, e.getSource());
@@ -93,11 +93,11 @@ public abstract class AbstractEventListe
*
* @param type the event type
*/
- public void skipToLast(EventType<?> type)
+ public void skipToLast(final EventType<?> type)
{
while (events.size() > 1)
{
- T e = events.remove(0);
+ final T e = events.remove(0);
assertTrue("Found end event in details", type != e.getEventType());
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/ErrorListenerTestImpl.java Thu Sep 27 22:24:23 2018
@@ -33,7 +33,7 @@ public class ErrorListenerTestImpl exten
* @param source the event source (<b>null</b> if the source need not to be
* checked)
*/
- public ErrorListenerTestImpl(Object source)
+ public ErrorListenerTestImpl(final Object source)
{
super(source);
}
@@ -47,10 +47,10 @@ public class ErrorListenerTestImpl exten
* @param propValue the expected property value
* @return the exception stored in the next error event
*/
- public Throwable checkEvent(EventType<?> type, EventType<?> opType,
- String propName, Object propValue)
+ public Throwable checkEvent(final EventType<?> type, final EventType<?> opType,
+ final String propName, final Object propValue)
{
- ConfigurationErrorEvent e = nextEvent(type);
+ final ConfigurationErrorEvent e = nextEvent(type);
assertEquals("Wrong operation event type", opType,
e.getErrorOperationType());
assertEquals("Wrong property name", propName, e.getPropertyName());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/EventListenerTestImpl.java Thu Sep 27 22:24:23 2018
@@ -33,7 +33,7 @@ public class EventListenerTestImpl exten
* @param source the event source (<b>null</b> if the source need not to be
* checked)
*/
- public EventListenerTestImpl(Object source)
+ public EventListenerTestImpl(final Object source)
{
super(source);
}
@@ -46,10 +46,10 @@ public class EventListenerTestImpl exten
* @param propValue the expected property value
* @param before the expected before flag
*/
- public void checkEvent(EventType<?> type, String propName, Object propValue,
- boolean before)
+ public void checkEvent(final EventType<?> type, final String propName, final Object propValue,
+ final boolean before)
{
- ConfigurationEvent e = nextEvent(type);
+ final ConfigurationEvent e = nextEvent(type);
assertEquals("Wrong property name", propName, e.getPropertyName());
assertEquals("Wrong property value", propValue, e.getPropertyValue());
assertEquals("Wrong before flag", before, e.isBeforeUpdate());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java Thu Sep 27 22:24:23 2018
@@ -42,7 +42,7 @@ public class TestConfigurationEventTypes
@Test
public void testFetchSuperEventTypesNull()
{
- Set<EventType<?>> superTypes = EventType.fetchSuperEventTypes(null);
+ final Set<EventType<?>> superTypes = EventType.fetchSuperEventTypes(null);
assertTrue("Got super types", superTypes.isEmpty());
}
@@ -53,7 +53,7 @@ public class TestConfigurationEventTypes
@Test
public void testFetchSuperEventTypesForBaseType()
{
- Set<EventType<?>> superTypes =
+ final Set<EventType<?>> superTypes =
EventType.fetchSuperEventTypes(Event.ANY);
assertEquals("Wrong number of super types", 1, superTypes.size());
assertTrue("Wrong super types", superTypes.contains(Event.ANY));
@@ -65,9 +65,9 @@ public class TestConfigurationEventTypes
@Test
public void testFetchSuperEventTypesOfType()
{
- Set<EventType<?>> superTypes =
+ final Set<EventType<?>> superTypes =
EventType.fetchSuperEventTypes(ConfigurationEvent.ADD_NODES);
- List<EventType<? extends Event>> expected =
+ final List<EventType<? extends Event>> expected =
new LinkedList<>();
expected.add(ConfigurationEvent.ADD_NODES);
expected.add(ConfigurationEvent.ANY_HIERARCHICAL);
@@ -141,7 +141,7 @@ public class TestConfigurationEventTypes
*
* @param eventType the event type to check
*/
- private void checkUpdateEvent(EventType<ConfigurationEvent> eventType)
+ private void checkUpdateEvent(final EventType<ConfigurationEvent> eventType)
{
assertSame("Wrong super type for " + eventType, ConfigurationEvent.ANY,
eventType.getSuperType());
@@ -198,7 +198,7 @@ public class TestConfigurationEventTypes
*
* @param eventType the event type to check
*/
- private void checkHierarchicalEvent(EventType<ConfigurationEvent> eventType)
+ private void checkHierarchicalEvent(final EventType<ConfigurationEvent> eventType)
{
assertSame("Wrong super type for " + eventType,
ConfigurationEvent.ANY_HIERARCHICAL, eventType.getSuperType());
@@ -247,7 +247,7 @@ public class TestConfigurationEventTypes
*
* @param type the type to be checked
*/
- private void checkErrorEvent(EventType<ConfigurationErrorEvent> type)
+ private void checkErrorEvent(final EventType<ConfigurationErrorEvent> type)
{
assertSame("Wrong super type for " + type, ConfigurationErrorEvent.ANY,
type.getSuperType());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestDatabaseConfigurationEvents.java Thu Sep 27 22:24:23 2018
@@ -56,7 +56,7 @@ public class TestDatabaseConfigurationEv
{
return helper.setUpConfig();
}
- catch (ConfigurationException e)
+ catch (final ConfigurationException e)
{
throw new AssertionError(e);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEvent.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEvent.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEvent.java Thu Sep 27 22:24:23 2018
@@ -51,8 +51,8 @@ public class TestEvent
@Test
public void testToString()
{
- Event event = new Event(this, Event.ANY);
- String s = event.toString();
+ final Event event = new Event(this, Event.ANY);
+ final String s = event.toString();
assertEquals("Wrong string representation", "Event [ source=" + this
+ " eventType=" + Event.ANY + " ]", s);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java Thu Sep 27 22:24:23 2018
@@ -102,7 +102,7 @@ public class TestEventListenerList
@Test
public void testReceiveEventOfExactType()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeSub1, listener);
list.fire(new EventSub1(this, typeSub1, MESSAGE));
@@ -115,8 +115,8 @@ public class TestEventListenerList
@Test
public void testReceiveEventMultipleListeners()
{
- ListenerTestImpl listener1 = new ListenerTestImpl();
- ListenerTestImpl listener2 = new ListenerTestImpl();
+ final ListenerTestImpl listener1 = new ListenerTestImpl();
+ final ListenerTestImpl listener2 = new ListenerTestImpl();
list.addEventListener(typeSub1, listener1);
list.addEventListener(typeSub1, listener2);
@@ -132,8 +132,8 @@ public class TestEventListenerList
@Test
public void testReceiveEventDifferentType()
{
- ListenerTestImpl listener1 = new ListenerTestImpl();
- ListenerTestImpl listener2 = new ListenerTestImpl();
+ final ListenerTestImpl listener1 = new ListenerTestImpl();
+ final ListenerTestImpl listener2 = new ListenerTestImpl();
list.addEventListener(typeSub1, listener1);
list.addEventListener(typeSub2, listener2);
@@ -148,7 +148,7 @@ public class TestEventListenerList
@Test
public void testSuppressEventOfSuperType()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeSub1, listener);
list.fire(new EventBase(this, typeBase, MESSAGE));
@@ -162,7 +162,7 @@ public class TestEventListenerList
@Test
public void testReceiveEventSubType()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeBase, listener);
list.fire(new EventSub1(this, typeSub1, MESSAGE));
@@ -176,8 +176,8 @@ public class TestEventListenerList
@Test
public void testListenerRegistrationWithListenerData()
{
- ListenerTestImpl listener = new ListenerTestImpl();
- EventListenerRegistrationData<EventSub1> regData =
+ final ListenerTestImpl listener = new ListenerTestImpl();
+ final EventListenerRegistrationData<EventSub1> regData =
new EventListenerRegistrationData<>(typeSub1, listener);
list.addEventListener(regData);
@@ -212,7 +212,7 @@ public class TestEventListenerList
@Test
public void testRemoveEventListenerNonExistingEventType()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeSub1, listener);
assertFalse("Wrong result",
@@ -225,7 +225,7 @@ public class TestEventListenerList
@Test
public void testRemoveEventListenerExisting()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeSub1, listener);
assertTrue("Wrong result", list.removeEventListener(typeSub1, listener));
@@ -268,7 +268,7 @@ public class TestEventListenerList
@Test
public void testMultipleListenerRegistration()
{
- ListenerTestImpl listener = new ListenerTestImpl();
+ final ListenerTestImpl listener = new ListenerTestImpl();
list.addEventListener(typeSub1, listener);
list.addEventListener(typeSub2, listener);
@@ -284,10 +284,10 @@ public class TestEventListenerList
* @param iterable the iterable
* @return a list with the content of the iterable
*/
- private static <T> List<T> fetchElements(Iterable<? extends T> iterable)
+ private static <T> List<T> fetchElements(final Iterable<? extends T> iterable)
{
- List<T> elems = new LinkedList<>();
- for (T listener : iterable)
+ final List<T> elems = new LinkedList<>();
+ for (final T listener : iterable)
{
elems.add(listener);
}
@@ -302,10 +302,10 @@ public class TestEventListenerList
* @param expListeners the expected listeners
*/
private void checkEventListenersForType(
- EventType<? extends Event> eventType,
- EventListener<?>... expListeners)
+ final EventType<? extends Event> eventType,
+ final EventListener<?>... expListeners)
{
- List<?> listeners = fetchElements(list.getEventListeners(eventType));
+ final List<?> listeners = fetchElements(list.getEventListeners(eventType));
assertEquals("Wrong number of listeners", expListeners.length,
listeners.size());
assertTrue("Wrong event listeners: " + listeners,
@@ -339,8 +339,8 @@ public class TestEventListenerList
@Test
public void testGetEventListenersMatchingType()
{
- ListenerTestImpl listener1 = new ListenerTestImpl();
- ListenerTestImpl listener2 = new ListenerTestImpl();
+ final ListenerTestImpl listener1 = new ListenerTestImpl();
+ final ListenerTestImpl listener2 = new ListenerTestImpl();
list.addEventListener(typeSub1, listener1);
list.addEventListener(typeSub2, listener2);
checkEventListenersForType(typeSub1, listener1);
@@ -353,8 +353,8 @@ public class TestEventListenerList
@Test
public void testGetEventListenersBaseType()
{
- ListenerTestImpl listener1 = new ListenerTestImpl();
- ListenerTestImpl listener2 = new ListenerTestImpl();
+ final ListenerTestImpl listener1 = new ListenerTestImpl();
+ final ListenerTestImpl listener2 = new ListenerTestImpl();
list.addEventListener(typeBase, listener1);
list.addEventListener(typeBase, listener2);
checkEventListenersForType(typeSub1, listener1, listener2);
@@ -367,11 +367,11 @@ public class TestEventListenerList
@Test(expected = NoSuchElementException.class)
public void testGetEventListenersIteratorNextNoElement()
{
- ListenerTestImpl listener1 = new ListenerTestImpl();
- ListenerTestImpl listener2 = new ListenerTestImpl();
+ final ListenerTestImpl listener1 = new ListenerTestImpl();
+ final ListenerTestImpl listener2 = new ListenerTestImpl();
list.addEventListener(typeBase, listener1);
list.addEventListener(typeBase, listener2);
- Iterator<EventListener<? super EventBase>> iterator =
+ final Iterator<EventListener<? super EventBase>> iterator =
list.getEventListeners(typeBase).iterator();
for (int i = 0; i < 3; i++)
{
@@ -387,7 +387,7 @@ public class TestEventListenerList
public void testGetEventListenersIteratorRemove()
{
list.addEventListener(typeBase, new ListenerTestImpl());
- Iterator<EventListener<? super EventBase>> iterator =
+ final Iterator<EventListener<? super EventBase>> iterator =
list.getEventListeners(typeBase).iterator();
assertTrue("Wrong result", iterator.hasNext());
iterator.remove();
@@ -400,15 +400,15 @@ public class TestEventListenerList
@Test(expected = IllegalArgumentException.class)
public void testEventListenerIteratorWrongEvent()
{
- EventListener<EventSub2> listener = new EventListener<EventSub2>()
+ final EventListener<EventSub2> listener = new EventListener<EventSub2>()
{
@Override
- public void onEvent(EventSub2 event)
+ public void onEvent(final EventSub2 event)
{
}
};
list.addEventListener(typeSub2, listener);
- EventListenerList.EventListenerIterator<EventSub2> iterator =
+ final EventListenerList.EventListenerIterator<EventSub2> iterator =
list.getEventListenerIterator(typeSub2);
assertTrue("No elements", iterator.hasNext());
iterator.invokeNext(new EventBase(this, typeBase, "Test"));
@@ -421,7 +421,7 @@ public class TestEventListenerList
public void testEventListenerIteratorNullEvent()
{
list.addEventListener(typeBase, new ListenerTestImpl());
- EventListenerList.EventListenerIterator<EventBase> iterator =
+ final EventListenerList.EventListenerIterator<EventBase> iterator =
list.getEventListenerIterator(typeBase);
iterator.invokeNext(null);
}
@@ -432,16 +432,16 @@ public class TestEventListenerList
@Test
public void testGetRegistrations()
{
- EventListenerRegistrationData<EventSub1> reg1 =
+ final EventListenerRegistrationData<EventSub1> reg1 =
new EventListenerRegistrationData<>(typeSub1,
new ListenerTestImpl());
- EventListenerRegistrationData<EventSub2> reg2 =
+ final EventListenerRegistrationData<EventSub2> reg2 =
new EventListenerRegistrationData<>(typeSub2,
new ListenerTestImpl());
list.addEventListener(reg1);
list.addEventListener(reg2);
- List<EventListenerRegistrationData<?>> registrations =
+ final List<EventListenerRegistrationData<?>> registrations =
list.getRegistrations();
assertEquals("Wrong number of registrations", 2, registrations.size());
assertTrue("Registration 1 not found", registrations.contains(reg1));
@@ -478,16 +478,16 @@ public class TestEventListenerList
@Test
public void testAddAll()
{
- EventListener<EventBase> l1 = new ListenerTestImpl();
- EventListener<EventBase> l2 = new ListenerTestImpl();
- EventListener<EventBase> l3 = new ListenerTestImpl();
+ final EventListener<EventBase> l1 = new ListenerTestImpl();
+ final EventListener<EventBase> l2 = new ListenerTestImpl();
+ final EventListener<EventBase> l3 = new ListenerTestImpl();
list.addEventListener(typeBase, l1);
- EventListenerList list2 = new EventListenerList();
+ final EventListenerList list2 = new EventListenerList();
list2.addEventListener(typeSub1, l2);
list2.addEventListener(typeBase, l3);
list.addAll(list2);
- Iterator<EventListenerRegistrationData<?>> it =
+ final Iterator<EventListenerRegistrationData<?>> it =
list.getRegistrations().iterator();
EventListenerRegistrationData<?> reg = it.next();
assertEquals("Wrong type (1)", typeBase, reg.getEventType());
@@ -516,17 +516,18 @@ public class TestEventListenerList
@Test
public void testGetEventListenerRegistrationsForSuperType()
{
- ListenerTestImpl l1 = new ListenerTestImpl();
- ListenerTestImpl l2 = new ListenerTestImpl();
+ final ListenerTestImpl l1 = new ListenerTestImpl();
+ final ListenerTestImpl l2 = new ListenerTestImpl();
@SuppressWarnings("unchecked")
+ final
EventListener<Event> l3 = EasyMock.createMock(EventListener.class);
list.addEventListener(typeSub1, l1);
list.addEventListener(Event.ANY, l3);
list.addEventListener(typeBase, l2);
- List<EventListenerRegistrationData<? extends EventBase>> regs =
+ final List<EventListenerRegistrationData<? extends EventBase>> regs =
list.getRegistrationsForSuperType(typeBase);
- Iterator<EventListenerRegistrationData<? extends EventBase>> iterator =
+ final Iterator<EventListenerRegistrationData<? extends EventBase>> iterator =
regs.iterator();
assertEquals("Wrong listener 1", l1, iterator.next().getListener());
assertEquals("Wrong listener 2", l2, iterator.next().getListener());
@@ -545,8 +546,8 @@ public class TestEventListenerList
/** An event message for testing pay-load. */
private final String message;
- public EventBase(Object source, EventType<? extends EventBase> type,
- String msg)
+ public EventBase(final Object source, final EventType<? extends EventBase> type,
+ final String msg)
{
super(source, type);
message = msg;
@@ -565,8 +566,8 @@ public class TestEventListenerList
{
private static final long serialVersionUID = 1L;
- public EventSub1(Object source, EventType<? extends EventSub1> type,
- String msg)
+ public EventSub1(final Object source, final EventType<? extends EventSub1> type,
+ final String msg)
{
super(source, type, msg);
}
@@ -579,8 +580,8 @@ public class TestEventListenerList
{
private static final long serialVersionUID = 1L;
- public EventSub2(Object source, EventType<? extends EventSub2> type,
- String msg)
+ public EventSub2(final Object source, final EventType<? extends EventSub2> type,
+ final String msg)
{
super(source, type, msg);
}
@@ -597,7 +598,7 @@ public class TestEventListenerList
private EventBase receivedEvent;
@Override
- public void onEvent(EventBase event)
+ public void onEvent(final EventBase event)
{
assertNull("Too many events: " + event, receivedEvent);
receivedEvent = event;
@@ -620,8 +621,8 @@ public class TestEventListenerList
* @param expType the expected type
* @param expMessage the expected message
*/
- public void assertEvent(Object expSource, EventType<?> expType,
- String expMessage)
+ public void assertEvent(final Object expSource, final EventType<?> expType,
+ final String expMessage)
{
assertNotNull("No event received", receivedEvent);
assertEquals("Wrong source", expSource, receivedEvent.getSource());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventSource.java Thu Sep 27 22:24:23 2018
@@ -68,9 +68,9 @@ public class TestEventSource
@Test
public void testAddEventListener()
{
- EventListenerTestImpl l = new EventListenerTestImpl(this);
+ final EventListenerTestImpl l = new EventListenerTestImpl(this);
source.addEventListener(ConfigurationEvent.ANY, l);
- Collection<EventListener<? super ConfigurationEvent>> listeners =
+ final Collection<EventListener<? super ConfigurationEvent>> listeners =
source.getEventListeners(ConfigurationEvent.ANY);
assertEquals("Wrong number of listeners", 1, listeners.size());
assertTrue("Listener not in list", listeners.contains(l));
@@ -92,7 +92,7 @@ public class TestEventSource
@Test
public void testRemoveEventListener()
{
- EventListenerTestImpl l = new EventListenerTestImpl(this);
+ final EventListenerTestImpl l = new EventListenerTestImpl(this);
assertFalse("Listener can be removed?", source
.removeEventListener(ConfigurationEvent.ANY, l));
source.addEventListener(ConfigurationEvent.ADD_NODES, new EventListenerTestImpl(this));
@@ -126,7 +126,7 @@ public class TestEventSource
{
source.addEventListener(ConfigurationEvent.ANY,
new EventListenerTestImpl(null));
- Collection<EventListener<? super ConfigurationEvent>> list =
+ final Collection<EventListener<? super ConfigurationEvent>> list =
source.getEventListeners(ConfigurationEvent.ANY);
list.clear();
}
@@ -138,7 +138,7 @@ public class TestEventSource
@Test
public void testGetEventListenersAddNew()
{
- Collection<EventListener<? super ConfigurationEvent>> list =
+ final Collection<EventListener<? super ConfigurationEvent>> list =
source.getEventListeners(ConfigurationEvent.ANY);
source.addEventListener(ConfigurationEvent.ANY,
new EventListenerTestImpl(null));
@@ -166,7 +166,7 @@ public class TestEventSource
@Test
public void testFireEvent()
{
- EventListenerTestImpl l = new EventListenerTestImpl(source);
+ final EventListenerTestImpl l = new EventListenerTestImpl(source);
source.addEventListener(ConfigurationEvent.ANY, l);
source.fireEvent(ConfigurationEvent.ADD_PROPERTY, TEST_PROPNAME,
TEST_PROPVALUE, true);
@@ -192,7 +192,7 @@ public class TestEventSource
@Test
public void testFireEventNoDetails()
{
- EventListenerTestImpl l = new EventListenerTestImpl(source);
+ final EventListenerTestImpl l = new EventListenerTestImpl(source);
source.addEventListener(ConfigurationEvent.ANY, l);
source.setDetailEvents(false);
source.fireEvent(ConfigurationEvent.SET_PROPERTY, TEST_PROPNAME, TEST_PROPVALUE, false);
@@ -207,17 +207,17 @@ public class TestEventSource
@Test
public void testRemoveListenerInFireEvent()
{
- EventListener<ConfigurationEvent> lstRemove = new EventListener<ConfigurationEvent>()
+ final EventListener<ConfigurationEvent> lstRemove = new EventListener<ConfigurationEvent>()
{
@Override
- public void onEvent(ConfigurationEvent event)
+ public void onEvent(final ConfigurationEvent event)
{
source.removeEventListener(ConfigurationEvent.ANY, this);
}
};
source.addEventListener(ConfigurationEvent.ANY, lstRemove);
- EventListenerTestImpl l = new EventListenerTestImpl(source);
+ final EventListenerTestImpl l = new EventListenerTestImpl(source);
source.addEventListener(ConfigurationEvent.ANY, l);
source.fireEvent(ConfigurationEvent.ADD_PROPERTY, TEST_PROPNAME,
TEST_PROPVALUE, false);
@@ -233,13 +233,13 @@ public class TestEventSource
@Test
public void testFireError()
{
- ErrorListenerTestImpl lstRead = new ErrorListenerTestImpl(source);
- ErrorListenerTestImpl lstWrite = new ErrorListenerTestImpl(source);
- ErrorListenerTestImpl lstAll = new ErrorListenerTestImpl(source);
+ final ErrorListenerTestImpl lstRead = new ErrorListenerTestImpl(source);
+ final ErrorListenerTestImpl lstWrite = new ErrorListenerTestImpl(source);
+ final ErrorListenerTestImpl lstAll = new ErrorListenerTestImpl(source);
source.addEventListener(ConfigurationErrorEvent.READ, lstRead);
source.addEventListener(ConfigurationErrorEvent.WRITE, lstWrite);
source.addEventListener(ConfigurationErrorEvent.ANY, lstAll);
- Exception testException = new Exception("A test");
+ final Exception testException = new Exception("A test");
source.fireError(ConfigurationErrorEvent.WRITE,
ConfigurationEvent.ADD_PROPERTY, TEST_PROPNAME, TEST_PROPVALUE,
@@ -276,7 +276,7 @@ public class TestEventSource
public void testClone() throws CloneNotSupportedException
{
source.addEventListener(ConfigurationEvent.ANY, new EventListenerTestImpl(source));
- BaseEventSource copy = (BaseEventSource) source.clone();
+ final BaseEventSource copy = (BaseEventSource) source.clone();
assertTrue("Configuration listeners registered for clone", copy
.getEventListenerRegistrations().isEmpty());
}
@@ -306,12 +306,12 @@ public class TestEventSource
@Test
public void testCopyEventListeners()
{
- EventListenerTestImpl l1 = new EventListenerTestImpl(source);
- EventListenerTestImpl l2 = new EventListenerTestImpl(source);
+ final EventListenerTestImpl l1 = new EventListenerTestImpl(source);
+ final EventListenerTestImpl l2 = new EventListenerTestImpl(source);
source.addEventListener(ConfigurationEvent.ANY, l1);
source.addEventListener(ConfigurationEvent.ANY_HIERARCHICAL, l2);
- BaseEventSource source2 = new BaseEventSource();
+ final BaseEventSource source2 = new BaseEventSource();
source.copyEventListeners(source2);
Collection<EventListener<? super ConfigurationEvent>> listeners =
source2.getEventListeners(ConfigurationEvent.ANY_HIERARCHICAL);
@@ -338,17 +338,17 @@ public class TestEventSource
@Test
public void testClearErrorListeners()
{
- EventListener<ConfigurationEvent> cl = new EventListenerTestImpl(null);
- ErrorListenerTestImpl el1 = new ErrorListenerTestImpl(null);
- ErrorListenerTestImpl el2 = new ErrorListenerTestImpl(null);
- ErrorListenerTestImpl el3 = new ErrorListenerTestImpl(null);
+ final EventListener<ConfigurationEvent> cl = new EventListenerTestImpl(null);
+ final ErrorListenerTestImpl el1 = new ErrorListenerTestImpl(null);
+ final ErrorListenerTestImpl el2 = new ErrorListenerTestImpl(null);
+ final ErrorListenerTestImpl el3 = new ErrorListenerTestImpl(null);
source.addEventListener(ConfigurationErrorEvent.READ, el1);
source.addEventListener(ConfigurationErrorEvent.ANY, el2);
source.addEventListener(ConfigurationEvent.ANY, cl);
source.addEventListener(ConfigurationErrorEvent.WRITE, el3);
source.clearErrorListeners();
- List<EventListenerRegistrationData<?>> regs =
+ final List<EventListenerRegistrationData<?>> regs =
source.getEventListenerRegistrations();
assertEquals("Wrong number of event listener registrations", 1,
regs.size());
@@ -369,8 +369,8 @@ public class TestEventSource
@Override
protected <T extends ConfigurationEvent> ConfigurationEvent createEvent(
- EventType<T> eventType, String propName, Object propValue,
- boolean before)
+ final EventType<T> eventType, final String propName, final Object propValue,
+ final boolean before)
{
eventCount++;
return super.createEvent(eventType, propName, propValue, before);
@@ -378,9 +378,9 @@ public class TestEventSource
@Override
protected ConfigurationErrorEvent createErrorEvent(
- EventType<? extends ConfigurationErrorEvent> type,
- EventType<?> opType, String propName, Object propValue,
- Throwable ex)
+ final EventType<? extends ConfigurationErrorEvent> type,
+ final EventType<?> opType, final String propName, final Object propValue,
+ final Throwable ex)
{
errorCount++;
return super
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java Thu Sep 27 22:24:23 2018
@@ -43,7 +43,7 @@ public class TestEventType
@Test
public void testToString()
{
- String s = eventType.toString();
+ final String s = eventType.toString();
assertEquals("Wrong string", "EventType [ TEST ]", s);
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java Thu Sep 27 22:24:23 2018
@@ -51,10 +51,10 @@ public class TestHierarchicalConfigurati
@Test
public void testClearTreeEvent()
{
- BaseHierarchicalConfiguration hc = (BaseHierarchicalConfiguration) config;
- String key = EXIST_PROPERTY.substring(0, EXIST_PROPERTY.indexOf('.'));
- NodeHandler<ImmutableNode> nodeHandler = hc.getNodeModel().getNodeHandler();
- Collection<QueryResult<ImmutableNode>> nodes = hc.getExpressionEngine()
+ final BaseHierarchicalConfiguration hc = (BaseHierarchicalConfiguration) config;
+ final String key = EXIST_PROPERTY.substring(0, EXIST_PROPERTY.indexOf('.'));
+ final NodeHandler<ImmutableNode> nodeHandler = hc.getNodeModel().getNodeHandler();
+ final Collection<QueryResult<ImmutableNode>> nodes = hc.getExpressionEngine()
.query(nodeHandler.getRootNode(), key, nodeHandler);
hc.clearTree(key);
listener.checkEvent(ConfigurationEvent.CLEAR_TREE, key, null,
@@ -70,8 +70,8 @@ public class TestHierarchicalConfigurati
@Test
public void testAddNodesEvent()
{
- BaseHierarchicalConfiguration hc = (BaseHierarchicalConfiguration) config;
- Collection<ImmutableNode> nodes = new ArrayList<>(1);
+ final BaseHierarchicalConfiguration hc = (BaseHierarchicalConfiguration) config;
+ final Collection<ImmutableNode> nodes = new ArrayList<>(1);
nodes.add(NodeStructureHelper.createNode("a_key", TEST_PROPVALUE));
hc.addNodes(TEST_PROPNAME, nodes);
listener.checkEvent(ConfigurationEvent.ADD_NODES, TEST_PROPNAME,
@@ -100,7 +100,7 @@ public class TestHierarchicalConfigurati
@Test
public void testSubConfigurationChangedEventConnected()
{
- HierarchicalConfiguration<ImmutableNode> sub =
+ final HierarchicalConfiguration<ImmutableNode> sub =
((BaseHierarchicalConfiguration) config)
.configurationAt(EXIST_PROPERTY, true);
sub.addProperty("newProp", "newValue");
@@ -119,7 +119,7 @@ public class TestHierarchicalConfigurati
@Test
public void testSubConfigurationChangedEventNotConnected()
{
- HierarchicalConfiguration<ImmutableNode> sub =
+ final HierarchicalConfiguration<ImmutableNode> sub =
((BaseHierarchicalConfiguration) config)
.configurationAt(EXIST_PROPERTY);
sub.addProperty("newProp", "newValue");
@@ -132,13 +132,13 @@ public class TestHierarchicalConfigurati
* @param event the event object
* @param before the expected before flag
*/
- private void checkSubnodeEvent(ConfigurationEvent event, boolean before)
+ private void checkSubnodeEvent(final ConfigurationEvent event, final boolean before)
{
assertEquals("Wrong before flag of nesting event", before, event
.isBeforeUpdate());
assertTrue("No subnode event found in value",
event.getPropertyValue() instanceof ConfigurationEvent);
- ConfigurationEvent evSub = (ConfigurationEvent) event
+ final ConfigurationEvent evSub = (ConfigurationEvent) event
.getPropertyValue();
assertEquals("Wrong event type",
ConfigurationEvent.ADD_PROPERTY, evSub.getEventType());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java Thu Sep 27 22:24:23 2018
@@ -79,7 +79,7 @@ public class TestConfigurationInterpolat
*/
private static Lookup setUpTestLookup(final String var, final Object value)
{
- Lookup lookup = EasyMock.createMock(Lookup.class);
+ final Lookup lookup = EasyMock.createMock(Lookup.class);
EasyMock.expect(lookup.lookup(EasyMock.anyObject(String.class)))
.andAnswer(new IAnswer<Object>()
{
@@ -114,7 +114,7 @@ public class TestConfigurationInterpolat
@Test
public void testRegisterLookup()
{
- Lookup lookup = EasyMock.createMock(Lookup.class);
+ final Lookup lookup = EasyMock.createMock(Lookup.class);
EasyMock.replay(lookup);
interpolator.registerLookup(TEST_PREFIX, lookup);
assertSame("New lookup not registered", lookup, interpolator
@@ -150,7 +150,7 @@ public class TestConfigurationInterpolat
@Test
public void testDeregisterLookup()
{
- Lookup lookup = EasyMock.createMock(Lookup.class);
+ final Lookup lookup = EasyMock.createMock(Lookup.class);
EasyMock.replay(lookup);
interpolator.registerLookup(TEST_PREFIX, lookup);
assertTrue("Derigstration not successfull", interpolator
@@ -203,9 +203,9 @@ public class TestConfigurationInterpolat
@Test
public void testResolveDefault()
{
- Lookup l1 = EasyMock.createMock(Lookup.class);
- Lookup l2 = EasyMock.createMock(Lookup.class);
- Lookup l3 = EasyMock.createMock(Lookup.class);
+ final Lookup l1 = EasyMock.createMock(Lookup.class);
+ final Lookup l2 = EasyMock.createMock(Lookup.class);
+ final Lookup l3 = EasyMock.createMock(Lookup.class);
EasyMock.expect(l1.lookup(TEST_NAME)).andReturn(null);
EasyMock.expect(l2.lookup(TEST_NAME)).andReturn(TEST_VALUE);
EasyMock.replay(l1, l2, l3);
@@ -288,14 +288,14 @@ public class TestConfigurationInterpolat
@Test
public void testRegisterLookups()
{
- Lookup l1 = setUpTestLookup();
- Lookup l2 = setUpTestLookup("someVar", "someValue");
- Map<String, Lookup> lookups = new HashMap<>();
+ final Lookup l1 = setUpTestLookup();
+ final Lookup l2 = setUpTestLookup("someVar", "someValue");
+ final Map<String, Lookup> lookups = new HashMap<>();
lookups.put(TEST_PREFIX, l1);
- String prefix2 = TEST_PREFIX + "_other";
+ final String prefix2 = TEST_PREFIX + "_other";
lookups.put(prefix2, l2);
interpolator.registerLookups(lookups);
- Map<String, Lookup> lookups2 = interpolator.getLookups();
+ final Map<String, Lookup> lookups2 = interpolator.getLookups();
assertEquals("Wrong number of lookups", 2, lookups2.size());
assertEquals("Wrong l1", l1, lookups2.get(TEST_PREFIX));
assertEquals("Wrong l2", l2, lookups2.get(prefix2));
@@ -317,7 +317,7 @@ public class TestConfigurationInterpolat
@Test
public void testGetLookupsModify()
{
- Map<String, Lookup> lookups = interpolator.getLookups();
+ final Map<String, Lookup> lookups = interpolator.getLookups();
lookups.put(TEST_PREFIX, setUpTestLookup());
assertTrue("Map was modified", interpolator.getLookups().isEmpty());
}
@@ -328,11 +328,11 @@ public class TestConfigurationInterpolat
@Test
public void testAddDefaultLookups()
{
- List<Lookup> lookups = new ArrayList<>();
+ final List<Lookup> lookups = new ArrayList<>();
lookups.add(setUpTestLookup());
lookups.add(setUpTestLookup("test", "value"));
interpolator.addDefaultLookups(lookups);
- List<Lookup> lookups2 = interpolator.getDefaultLookups();
+ final List<Lookup> lookups2 = interpolator.getDefaultLookups();
assertEquals("Wrong number of default lookups", 2, lookups2.size());
assertTrue("Wrong content", lookups2.containsAll(lookups));
}
@@ -355,7 +355,7 @@ public class TestConfigurationInterpolat
@Test
public void testGetDefaultLookupsModify()
{
- List<Lookup> lookups = interpolator.getDefaultLookups();
+ final List<Lookup> lookups = interpolator.getDefaultLookups();
lookups.add(setUpTestLookup());
assertTrue("List was modified", interpolator.getDefaultLookups()
.isEmpty());
@@ -367,7 +367,7 @@ public class TestConfigurationInterpolat
@Test
public void testRemoveDefaultLookup()
{
- List<Lookup> lookups = new ArrayList<>();
+ final List<Lookup> lookups = new ArrayList<>();
lookups.add(setUpTestLookup());
lookups.add(setUpTestLookup("test", "value"));
interpolator.addDefaultLookups(lookups);
@@ -396,7 +396,7 @@ public class TestConfigurationInterpolat
public void testPrefixSetModify()
{
interpolator.registerLookup(TEST_PREFIX, setUpTestLookup());
- Iterator<String> it = interpolator.prefixSet().iterator();
+ final Iterator<String> it = interpolator.prefixSet().iterator();
it.next();
it.remove();
}
@@ -408,7 +408,7 @@ public class TestConfigurationInterpolat
@Test
public void testResolveParentVariableFound()
{
- ConfigurationInterpolator parent =
+ final ConfigurationInterpolator parent =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.replay(parent);
interpolator.setParentInterpolator(parent);
@@ -424,7 +424,7 @@ public class TestConfigurationInterpolat
@Test
public void testResolveParentVariableNotFound()
{
- ConfigurationInterpolator parent =
+ final ConfigurationInterpolator parent =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.expect(parent.resolve(TEST_NAME)).andReturn(TEST_VALUE);
EasyMock.replay(parent);
@@ -439,7 +439,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolateObject()
{
- Object value = 42;
+ final Object value = 42;
assertSame("Value was changed", value, interpolator.interpolate(value));
}
@@ -449,7 +449,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolateString()
{
- String value = "${" + TEST_PREFIX + ':' + TEST_NAME + "}";
+ final String value = "${" + TEST_PREFIX + ':' + TEST_NAME + "}";
interpolator.registerLookup(TEST_PREFIX, setUpTestLookup());
assertEquals("Wrong result", TEST_VALUE,
interpolator.interpolate(value));
@@ -461,7 +461,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolateStringUnknownVariable()
{
- String value = "${unknownVariable}";
+ final String value = "${unknownVariable}";
assertEquals("Wrong result", value, interpolator.interpolate(value));
}
@@ -477,7 +477,7 @@ public class TestConfigurationInterpolat
interpolator.addDefaultLookup(setUpTestLookup("java.version", "1.4"));
interpolator.addDefaultLookup(setUpTestLookup("jre-1.4",
"C:\\java\\1.4"));
- String var = "${jre-${java.version}}";
+ final String var = "${jre-${java.version}}";
assertEquals("Wrong result (1)", var, interpolator.interpolate(var));
interpolator.setEnableSubstitutionInVariables(true);
assertTrue("Variable substitution not enabled",
@@ -492,7 +492,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolationMultipleVariables()
{
- String value = "The ${subject} jumps over ${object}.";
+ final String value = "The ${subject} jumps over ${object}.";
interpolator.addDefaultLookup(setUpTestLookup("subject", "quick brown fox"));
interpolator.addDefaultLookup(setUpTestLookup("object", "the lazy dog"));
assertEquals("Wrong result", "The quick brown fox jumps over the lazy dog.",
@@ -506,7 +506,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolationSingleVariable()
{
- Object value = 42;
+ final Object value = 42;
interpolator.addDefaultLookup(setUpTestLookup(TEST_NAME, value));
assertEquals("Wrong result", value,
interpolator.interpolate("${" + TEST_NAME + "}"));
@@ -518,7 +518,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolationVariableIncomplete()
{
- String value = "${" + TEST_NAME;
+ final String value = "${" + TEST_NAME;
interpolator.addDefaultLookup(setUpTestLookup(TEST_NAME, "someValue"));
assertEquals("Wrong result", value, interpolator.interpolate(value));
}
@@ -529,7 +529,7 @@ public class TestConfigurationInterpolat
@Test
public void testInterpolateEmptyVariable()
{
- String value = "${}";
+ final String value = "${}";
assertEquals("Wrong result", value, interpolator.interpolate(value));
}
@@ -548,10 +548,10 @@ public class TestConfigurationInterpolat
@Test
public void testFromSpecificationInterpolator()
{
- ConfigurationInterpolator ci =
+ final ConfigurationInterpolator ci =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.replay(ci);
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
new InterpolatorSpecification.Builder()
.withDefaultLookup(EasyMock.createMock(Lookup.class))
.withParentInterpolator(interpolator)
@@ -566,15 +566,15 @@ public class TestConfigurationInterpolat
@Test
public void testFromSpecificationNewInstance()
{
- Lookup defLookup = EasyMock.createMock(Lookup.class);
- Lookup preLookup = EasyMock.createMock(Lookup.class);
+ final Lookup defLookup = EasyMock.createMock(Lookup.class);
+ final Lookup preLookup = EasyMock.createMock(Lookup.class);
EasyMock.replay(defLookup, preLookup);
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
new InterpolatorSpecification.Builder()
.withDefaultLookup(defLookup)
.withPrefixLookup("p", preLookup)
.withParentInterpolator(interpolator).create();
- ConfigurationInterpolator ci =
+ final ConfigurationInterpolator ci =
ConfigurationInterpolator.fromSpecification(spec);
assertEquals("Wrong number of default lookups", 1, ci
.getDefaultLookups().size());
@@ -592,11 +592,11 @@ public class TestConfigurationInterpolat
@Test
public void testGetDefaultPrefixLookups()
{
- Map<String, Lookup> lookups =
+ final Map<String, Lookup> lookups =
ConfigurationInterpolator.getDefaultPrefixLookups();
assertEquals("Wrong number of lookups", DefaultLookups.values().length,
lookups.size());
- for (DefaultLookups l : DefaultLookups.values())
+ for (final DefaultLookups l : DefaultLookups.values())
{
assertSame("Wrong entry for " + l, l.getLookup(),
lookups.get(l.getPrefix()));
@@ -619,7 +619,7 @@ public class TestConfigurationInterpolat
@Test
public void testNullSafeLookupExisting()
{
- Lookup look = EasyMock.createMock(Lookup.class);
+ final Lookup look = EasyMock.createMock(Lookup.class);
EasyMock.replay(look);
assertSame("Wrong result", look,
ConfigurationInterpolator.nullSafeLookup(look));
@@ -631,7 +631,7 @@ public class TestConfigurationInterpolat
@Test
public void testNullSafeLookupNull()
{
- Lookup lookup = ConfigurationInterpolator.nullSafeLookup(null);
+ final Lookup lookup = ConfigurationInterpolator.nullSafeLookup(null);
assertNull("Got a lookup result", lookup.lookup("someVar"));
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConstantLookup.java Thu Sep 27 22:24:23 2018
@@ -55,7 +55,7 @@ public class TestConstantLookup
* @param field the field name
* @return the variable for looking up this field
*/
- private String variable(String field)
+ private String variable(final String field)
{
return getClass().getName() + '.' + field;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java Thu Sep 27 22:24:23 2018
@@ -50,10 +50,10 @@ public class TestEnvironmentLookup
@Test
public void testLookup()
{
- EnvironmentConfiguration envConf = new EnvironmentConfiguration();
- for (Iterator<String> it = envConf.getKeys(); it.hasNext();)
+ final EnvironmentConfiguration envConf = new EnvironmentConfiguration();
+ for (final Iterator<String> it = envConf.getKeys(); it.hasNext();)
{
- String var = it.next();
+ final String var = it.next();
assertEquals("Wrong value for " + var, envConf.getString(var),
lookup.lookup(var));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java Thu Sep 27 22:24:23 2018
@@ -59,8 +59,8 @@ public class TestExprLookup
*/
private static XMLConfiguration loadConfig() throws ConfigurationException
{
- XMLConfiguration config = new XMLConfiguration();
- FileHandler handler = new FileHandler(config);
+ final XMLConfiguration config = new XMLConfiguration();
+ final FileHandler handler = new FileHandler(config);
handler.load(TEST_FILE);
return config;
}
@@ -68,20 +68,20 @@ public class TestExprLookup
@Test
public void testLookup() throws Exception
{
- ConsoleAppender app = new ConsoleAppender(new SimpleLayout());
- Log log = LogFactory.getLog("TestLogger");
- Logger logger = ((Log4JLogger)log).getLogger();
+ final ConsoleAppender app = new ConsoleAppender(new SimpleLayout());
+ final Log log = LogFactory.getLog("TestLogger");
+ final Logger logger = ((Log4JLogger)log).getLogger();
logger.addAppender(app);
logger.setLevel(Level.DEBUG);
logger.setAdditivity(false);
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("String", org.apache.commons.lang3.StringUtils.class));
vars.add(new ExprLookup.Variable("Util", new Utility("Hello")));
vars.add(new ExprLookup.Variable("System", "Class:java.lang.System"));
- XMLConfiguration config = loadConfig();
- ConfigurationLogger testLogger = new ConfigurationLogger("TestLogger");
+ final XMLConfiguration config = loadConfig();
+ final ConfigurationLogger testLogger = new ConfigurationLogger("TestLogger");
config.setLogger(testLogger);
- ExprLookup lookup = new ExprLookup(vars);
+ final ExprLookup lookup = new ExprLookup(vars);
lookup.setInterpolator(config.getInterpolator());
lookup.setLogger(testLogger);
String str = lookup.lookup(PATTERN1);
@@ -97,10 +97,10 @@ public class TestExprLookup
@Test
public void testLookupNoConfigurationInterpolator()
{
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("String", org.apache.commons.lang3.StringUtils.class));
- ExprLookup lookup = new ExprLookup(vars);
- String value = "test";
+ final ExprLookup lookup = new ExprLookup(vars);
+ final String value = "test";
assertEquals("Wrong result", value, lookup.lookup(value));
}
@@ -110,9 +110,9 @@ public class TestExprLookup
@Test
public void testGetVariables()
{
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("String", org.apache.commons.lang3.StringUtils.class));
- ExprLookup lookup = new ExprLookup(vars);
+ final ExprLookup lookup = new ExprLookup(vars);
assertEquals("Wrong variables", vars, lookup.getVariables());
}
@@ -122,10 +122,10 @@ public class TestExprLookup
@Test
public void testGetVariablesDefensiveCopy()
{
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("String", org.apache.commons.lang3.StringUtils.class));
- ExprLookup lookup = new ExprLookup(vars);
- ExprLookup.Variables vars2 = lookup.getVariables();
+ final ExprLookup lookup = new ExprLookup(vars);
+ final ExprLookup.Variables vars2 = lookup.getVariables();
vars2.add(new ExprLookup.Variable("System", "Class:java.lang.System"));
assertEquals("Modified variables", vars, lookup.getVariables());
}
@@ -136,13 +136,13 @@ public class TestExprLookup
@Test
public void testLookupNonStringExpression() throws ConfigurationException
{
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("System", "Class:java.lang.System"));
- ExprLookup lookup = new ExprLookup(vars);
- XMLConfiguration config = loadConfig();
+ final ExprLookup lookup = new ExprLookup(vars);
+ final XMLConfiguration config = loadConfig();
lookup.setInterpolator(config.getInterpolator());
- String pattern = "System.currentTimeMillis()";
- String result = lookup.lookup(pattern);
+ final String pattern = "System.currentTimeMillis()";
+ final String result = lookup.lookup(pattern);
assertNotEquals("Not replaced", pattern, result);
}
@@ -152,10 +152,10 @@ public class TestExprLookup
@Test
public void testLookupNullExpression() throws ConfigurationException
{
- ExprLookup.Variables vars = new ExprLookup.Variables();
+ final ExprLookup.Variables vars = new ExprLookup.Variables();
vars.add(new ExprLookup.Variable("System", "Class:java.lang.System"));
- ExprLookup lookup = new ExprLookup(vars);
- XMLConfiguration config = loadConfig();
+ final ExprLookup lookup = new ExprLookup(vars);
+ final XMLConfiguration config = loadConfig();
lookup.setInterpolator(config.getInterpolator());
assertNull("Wrong result",
lookup.lookup("System.getProperty('undefined.property')"));
@@ -165,7 +165,7 @@ public class TestExprLookup
{
String message;
- public Utility(String msg)
+ public Utility(final String msg)
{
this.message = msg;
}
@@ -175,7 +175,7 @@ public class TestExprLookup
return message;
}
- public String str(String str)
+ public String str(final String str)
{
return str;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java Thu Sep 27 22:24:23 2018
@@ -58,9 +58,9 @@ public class TestInterpolatorSpecificati
* @param <T> the type of the mock
* @return the mock
*/
- private static <T> T createMock(Class<T> cls)
+ private static <T> T createMock(final Class<T> cls)
{
- T mock = EasyMock.createMock(cls);
+ final T mock = EasyMock.createMock(cls);
EasyMock.replay(mock);
return mock;
}
@@ -83,8 +83,8 @@ public class TestInterpolatorSpecificati
* @param prefLook1 prefix lookup 1
* @param prefLook2 prefix lookup 2
*/
- private static void checkPrefixLookups(InterpolatorSpecification spec,
- Lookup prefLook1, Lookup prefLook2)
+ private static void checkPrefixLookups(final InterpolatorSpecification spec,
+ final Lookup prefLook1, final Lookup prefLook2)
{
assertEquals("Wrong number of prefix lookups", 2, spec
.getPrefixLookups().size());
@@ -102,8 +102,8 @@ public class TestInterpolatorSpecificati
* @param defLook1 default lookup 1
* @param defLook2 default lookup 2
*/
- private static void checkDefaultLookups(InterpolatorSpecification spec,
- Lookup defLook1, Lookup defLook2)
+ private static void checkDefaultLookups(final InterpolatorSpecification spec,
+ final Lookup defLook1, final Lookup defLook2)
{
assertEquals("Wrong number of default lookups", 2, spec
.getDefaultLookups().size());
@@ -117,15 +117,15 @@ public class TestInterpolatorSpecificati
@Test
public void testCreateInstance()
{
- Lookup prefLook1 = createLookup();
- Lookup prefLook2 = createLookup();
- Lookup defLook1 = createLookup();
- Lookup defLook2 = createLookup();
- ConfigurationInterpolator interpolator =
+ final Lookup prefLook1 = createLookup();
+ final Lookup prefLook2 = createLookup();
+ final Lookup defLook1 = createLookup();
+ final Lookup defLook2 = createLookup();
+ final ConfigurationInterpolator interpolator =
createMock(ConfigurationInterpolator.class);
- ConfigurationInterpolator parent =
+ final ConfigurationInterpolator parent =
createMock(ConfigurationInterpolator.class);
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withPrefixLookup(PREFIX1, prefLook1)
.withDefaultLookup(defLook1)
.withPrefixLookup(PREFIX2, prefLook2)
@@ -145,14 +145,14 @@ public class TestInterpolatorSpecificati
@Test
public void testCreateInstanceCollections()
{
- Lookup prefLook1 = createLookup();
- Lookup prefLook2 = createLookup();
- Lookup defLook1 = createLookup();
- Lookup defLook2 = createLookup();
- Map<String, Lookup> prefixLookups = new HashMap<>();
+ final Lookup prefLook1 = createLookup();
+ final Lookup prefLook2 = createLookup();
+ final Lookup defLook1 = createLookup();
+ final Lookup defLook2 = createLookup();
+ final Map<String, Lookup> prefixLookups = new HashMap<>();
prefixLookups.put(PREFIX1, prefLook1);
prefixLookups.put(PREFIX2, prefLook2);
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withPrefixLookups(prefixLookups)
.withDefaultLookups(Arrays.asList(defLook1, defLook2))
.create();
@@ -166,7 +166,7 @@ public class TestInterpolatorSpecificati
@Test
public void testWithPrefixLookupsNull()
{
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withPrefixLookups(null).create();
assertTrue("No empty map with prefix lookups", spec.getPrefixLookups()
.isEmpty());
@@ -178,7 +178,7 @@ public class TestInterpolatorSpecificati
@Test
public void testWithDefaultLookupsNull()
{
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withDefaultLookups(null).create();
assertTrue("No empty default lookups collection", spec
.getDefaultLookups().isEmpty());
@@ -217,7 +217,7 @@ public class TestInterpolatorSpecificati
@Test(expected = UnsupportedOperationException.class)
public void testGetPrefixLookupsModify()
{
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withPrefixLookup(PREFIX1, createLookup()).create();
spec.getPrefixLookups().put(PREFIX1, createLookup());
}
@@ -228,7 +228,7 @@ public class TestInterpolatorSpecificati
@Test(expected = UnsupportedOperationException.class)
public void testGetDefaultLookupsModify()
{
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withDefaultLookup(createLookup()).create();
spec.getDefaultLookups().add(createLookup());
}
@@ -244,13 +244,13 @@ public class TestInterpolatorSpecificati
.withPrefixLookup("test", createLookup())
.withParentInterpolator(
createMock(ConfigurationInterpolator.class)).create();
- Lookup prefLook1 = createLookup();
- Lookup prefLook2 = createLookup();
- Lookup defLook1 = createLookup();
- Lookup defLook2 = createLookup();
- ConfigurationInterpolator parent =
+ final Lookup prefLook1 = createLookup();
+ final Lookup prefLook2 = createLookup();
+ final Lookup defLook1 = createLookup();
+ final Lookup defLook2 = createLookup();
+ final ConfigurationInterpolator parent =
createMock(ConfigurationInterpolator.class);
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
builder.withPrefixLookup(PREFIX1, prefLook1)
.withPrefixLookup(PREFIX2, prefLook2)
.withDefaultLookups(Arrays.asList(defLook1, defLook2))
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestSystemPropertiesLookup.java Thu Sep 27 22:24:23 2018
@@ -46,7 +46,7 @@ public class TestSystemPropertiesLookup
@Test
public void testLookupProperties()
{
- for(Map.Entry<Object, Object> e : System.getProperties().entrySet())
+ for(final Map.Entry<Object, Object> e : System.getProperties().entrySet())
{
assertEquals("Wrong property value for " + e.getKey(), e.getValue(), lookup.lookup(String.valueOf(e.getKey())));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestAbsoluteNameLocationStrategy.java Thu Sep 27 22:24:23 2018
@@ -54,7 +54,7 @@ public class TestAbsoluteNameLocationStr
@Test
public void testNoFileName()
{
- FileLocator locator = FileLocatorUtils.fileLocator().create();
+ final FileLocator locator = FileLocatorUtils.fileLocator().create();
assertNull("Got a URL", strategy.locate(fileSystem, locator));
}
@@ -64,7 +64,7 @@ public class TestAbsoluteNameLocationStr
@Test
public void testNoAbsoluteFileName()
{
- FileLocator locator =
+ final FileLocator locator =
FileLocatorUtils.fileLocator().fileName("test.xml").create();
assertNull("Got a URL", strategy.locate(fileSystem, locator));
}
@@ -76,8 +76,8 @@ public class TestAbsoluteNameLocationStr
@Test
public void testNonExistingAbsoluteFile()
{
- File file = ConfigurationAssert.getOutFile("NotExistingFile.tst");
- FileLocator locator =
+ final File file = ConfigurationAssert.getOutFile("NotExistingFile.tst");
+ final FileLocator locator =
FileLocatorUtils.fileLocator().fileName(file.getAbsolutePath())
.create();
assertNull("Got a URL", strategy.locate(fileSystem, locator));
@@ -89,11 +89,11 @@ public class TestAbsoluteNameLocationStr
@Test
public void testExistingAbsoluteFile()
{
- File file = ConfigurationAssert.getTestFile("test.xml");
- FileLocator locator =
+ final File file = ConfigurationAssert.getTestFile("test.xml");
+ final FileLocator locator =
FileLocatorUtils.fileLocator().fileName(file.getAbsolutePath())
.create();
- URL url = strategy.locate(fileSystem, locator);
+ final URL url = strategy.locate(fileSystem, locator);
assertEquals("Wrong URL", file.getAbsoluteFile(), FileLocatorUtils
.fileFromURL(url).getAbsoluteFile());
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestBasePathLocationStrategy.java Thu Sep 27 22:24:23 2018
@@ -56,7 +56,7 @@ public class TestBasePathLocationStrateg
*
* @param url the URL to be checked
*/
- private static void checkURL(URL url)
+ private static void checkURL(final URL url)
{
assertEquals("Wrong URL", FileLocatorUtils.fileFromURL(url)
.getAbsoluteFile(), ConfigurationAssert.getTestFile(TEST_FILE)
@@ -70,8 +70,8 @@ public class TestBasePathLocationStrateg
@Test
public void testLocateSuccess()
{
- File path = ConfigurationAssert.TEST_DIR;
- FileLocator locator =
+ final File path = ConfigurationAssert.TEST_DIR;
+ final FileLocator locator =
FileLocatorUtils.fileLocator().basePath(path.getAbsolutePath())
.fileName(TEST_FILE).create();
checkURL(strategy.locate(fileSystem, locator));
@@ -83,8 +83,8 @@ public class TestBasePathLocationStrateg
@Test
public void testLocateSuccessRelativePrefix()
{
- File path = ConfigurationAssert.TEST_DIR;
- FileLocator locator =
+ final File path = ConfigurationAssert.TEST_DIR;
+ final FileLocator locator =
FileLocatorUtils.fileLocator().basePath(path.getAbsolutePath())
.fileName("." + File.separator + TEST_FILE).create();
checkURL(strategy.locate(fileSystem, locator));
@@ -96,7 +96,7 @@ public class TestBasePathLocationStrateg
@Test
public void testNullFileName()
{
- FileLocator locator =
+ final FileLocator locator =
FileLocatorUtils
.fileLocator()
.basePath(
@@ -111,7 +111,7 @@ public class TestBasePathLocationStrateg
@Test
public void testNullBasePath()
{
- FileLocator locator =
+ final FileLocator locator =
FileLocatorUtils.fileLocator().fileName(TEST_FILE).create();
assertNull("Got a URL", strategy.locate(fileSystem, locator));
}