You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mo...@apache.org on 2015/11/08 18:15:18 UTC
[19/50] wicket git commit: Zero warnings in wicket-util
Zero warnings in wicket-util
Brought several test cases into the 2010's by refactoring old idioms.
Added @SuppressWarnings where logical (javadoc for unit tests),
suppressed several serial warnings (if we aren't going to add those
SerialVersionUID's we should kill the warning).
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dfee6a2a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dfee6a2a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dfee6a2a
Branch: refs/heads/lambdas
Commit: dfee6a2a5e2971df92becc4d4e5c44d073ac52a7
Parents: 52f4ec4
Author: Martijn Dashorst <da...@apache.org>
Authored: Sat Oct 24 17:53:00 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sat Oct 24 18:13:52 2015 +0200
----------------------------------------------------------------------
.../collections/UrlExternalFormComparator.java | 2 +
.../convert/converter/AbstractConverter.java | 1 -
.../converter/AbstractDateConverter.java | 2 +
.../convert/converter/BigDecimalConverter.java | 4 +-
.../convert/converter/BigIntegerConverter.java | 4 +-
.../util/file/FileCleanerTrackerAdapter.java | 6 +
.../wicket/util/io/FullyBufferedReader.java | 2 +
.../java/org/apache/wicket/util/lang/Args.java | 5 +-
.../wicket/util/listener/ChangeListenerSet.java | 6 +-
.../util/resource/IResourceStreamWriter.java | 1 +
.../util/resource/ResourceStreamWrapper.java | 12 +
.../apache/wicket/util/string/StringValue.java | 2 +
.../org/apache/wicket/util/string/Strings.java | 2 +
.../interpolator/MapVariableInterpolator.java | 1 +
.../SystemVariableInterpolator.java | 1 +
.../interpolator/VariableInterpolator.java | 1 +
.../java/org/apache/wicket/util/time/Time.java | 10 +-
.../wicket/util/collections/IntHashMapTest.java | 8 +-
.../converter/BigIntegerConverterTest.java | 4 +-
.../util/convert/converters/ConvertersTest.java | 540 ++++++++-----------
.../wicket/util/crypt/SunJceCryptTest.java | 1 +
...UnlimitedStrengthJurisdictionPolicyTest.java | 1 +
.../wicket/util/encoding/UrlDecoderTest.java | 2 +-
.../wicket/util/encoding/UrlEncoderTest.java | 5 +-
.../apache/wicket/util/io/ConnectionsTest.java | 6 +-
.../apache/wicket/util/io/XmlReaderTest.java | 129 ++---
.../apache/wicket/util/lang/ClassesTest.java | 3 +-
.../apache/wicket/util/lang/NumbersTest.java | 1 +
.../apache/wicket/util/lang/PackagesTest.java | 1 +
.../util/string/AppendingStringBufferTest.java | 28 +-
.../wicket/util/string/StringValueTest.java | 6 +-
.../apache/wicket/util/string/StringsTest.java | 296 +++-------
.../org/apache/wicket/util/time/TimeTest.java | 19 +-
33 files changed, 425 insertions(+), 687 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
index 6d15848..ce4caa7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
@@ -32,6 +32,8 @@ import java.util.Comparator;
*/
public class UrlExternalFormComparator implements Comparator<URL>, Serializable
{
+ private static final long serialVersionUID = 1L;
+
@Override
public int compare(URL url1, URL url2)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
index 2d59b52..d1030a1 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractConverter.java
@@ -32,7 +32,6 @@ import org.apache.wicket.util.convert.IConverter;
*/
public abstract class AbstractConverter<C> implements IConverter<C>
{
- /** */
private static final long serialVersionUID = 1L;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java
index bf93837..22598cc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java
@@ -30,6 +30,8 @@ import org.apache.wicket.util.string.Strings;
*/
public abstract class AbstractDateConverter<D extends Date> extends AbstractConverter<D>
{
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of D out of the passed date(time) as long
* @param date
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
index 7b545e6..dc4df1b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigDecimalConverter.java
@@ -19,12 +19,12 @@ package org.apache.wicket.util.convert.converter;
import java.math.BigDecimal;
import java.util.Locale;
-import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.convert.IConverter;
/**
* BigDecimal converter
*
- * see IConverter
+ * @see IConverter
*/
public class BigDecimalConverter extends AbstractDecimalConverter<BigDecimal>
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigIntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigIntegerConverter.java
index 42bb39c..0d102e8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigIntegerConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/BigIntegerConverter.java
@@ -20,12 +20,12 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Locale;
-import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.convert.IConverter;
/**
* BigInteger converter
*
- * see IConverter
+ * see {@link IConverter}
*/
public class BigIntegerConverter extends AbstractIntegerConverter<BigInteger>
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleanerTrackerAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleanerTrackerAdapter.java b/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleanerTrackerAdapter.java
index d58e23f..059ef49 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleanerTrackerAdapter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/FileCleanerTrackerAdapter.java
@@ -28,6 +28,12 @@ public class FileCleanerTrackerAdapter extends FileCleaningTracker
{
private final IFileCleaner fileCleaner;
+ /**
+ * Creates an adaptor for a {@code fileCleaner}
+ *
+ * @param fileCleaner
+ * the cleaner to adapt
+ */
public FileCleanerTrackerAdapter(IFileCleaner fileCleaner)
{
this.fileCleaner = Args.notNull(fileCleaner, "fileCleaner");
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java b/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
index 45c7966..9317427 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/io/FullyBufferedReader.java
@@ -227,6 +227,7 @@ public final class FullyBufferedReader
* @param startPos
* The index to start at
* @return -1 if not found
+ * @throws ParseException
*/
public int findOutOfQuotes(final char ch, int startPos) throws ParseException
{
@@ -244,6 +245,7 @@ public final class FullyBufferedReader
* @param quotationChar
* The current quotation char. Must be ' or ", otherwise will be ignored.
* @return -1 if not found
+ * @throws ParseException
*/
public int findOutOfQuotes(final char ch, int startPos, char quotationChar)
throws ParseException
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
index 5f8ee7d..5d62b17 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import org.apache.wicket.util.string.Strings;
/**
- *
+ * Class with methods for asserting conditions on arguments.
*/
public class Args
{
@@ -74,6 +74,7 @@ public class Args
* @param collection
* @param message
* @param params
+ * @return the {code collection}
* @throws IllegalArgumentException
* if the passed collection is either null or empty
*/
@@ -92,6 +93,7 @@ public class Args
*
* @param collection
* @param name
+ * @return the {code collection}
* @throws IllegalArgumentException
* if the passed collection is either null or empty
*/
@@ -108,6 +110,7 @@ public class Args
* @param max
* @param value
* @param name
+ * @return the {code value}
* @throws IllegalArgumentException
*/
public static <T extends Comparable<? super T>> T withinRange(final T min, final T max,
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java b/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
index c67c7fe..d94d070 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
@@ -21,17 +21,19 @@ package org.apache.wicket.util.listener;
*
* Note that these classes are not meant to be serializable or for you to hold them in session (see
* WICKET-2697)
- *
- * @author Jonathan Locke
*/
public final class ChangeListenerSet<T> extends ListenerCollection<IChangeListener<T>>
{
private static final long serialVersionUID = 1L;
+ /**
+ * Notifies all change listeners.
+ */
public void notifyListeners(final T t)
{
notify(new INotifier<IChangeListener<T>>()
{
+ @SuppressWarnings("unchecked")
@Override
public void notify(final IChangeListener<T> listener)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java
index 8af6ede..bb7cdcf 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStreamWriter.java
@@ -37,6 +37,7 @@ public interface IResourceStreamWriter extends IResourceStream
*
* @param output
* The response where the resource can write its content into.
+ * @throws IOException
*/
void write(OutputStream output) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
index 11b6253..d0c23b6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
@@ -29,13 +29,25 @@ import org.apache.wicket.util.time.Time;
*/
public class ResourceStreamWrapper implements IResourceStream
{
+ private static final long serialVersionUID = 1L;
+
private final IResourceStream delegate;
+ /**
+ * Creates the wrapper around the {@code delegate} resource stream.
+ *
+ * @param delegate
+ */
public ResourceStreamWrapper(IResourceStream delegate)
{
this.delegate = Args.notNull(delegate, "delegate");
}
+ /**
+ * Returns the wrapped delegate.
+ *
+ * @return the wrapped delegate.
+ */
public IResourceStream getDelegate()
{
return delegate;
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
index df4bd65..5ec2860 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
@@ -308,6 +308,7 @@ public class StringValue implements IClusterable
* @return The converted value
* @throws StringValueConversionException
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public final <T> T to(final Class<T> type) throws StringValueConversionException
{
if (type == null)
@@ -889,6 +890,7 @@ public class StringValue implements IClusterable
* This will be returned if there is an error converting the value
* @return The value as an enum
*/
+ @SuppressWarnings("unchecked")
public final <T extends Enum<T>> T toEnum(final T defaultValue)
{
Args.notNull(defaultValue, "defaultValue");
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
index 3ac1c10..01240a6 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
@@ -1543,6 +1543,8 @@ public final class Strings
/**
* Return this value as en enum value.
*
+ * @param value
+ * the value to convert to an enum value
* @param enumClass
* the enum type
* @return an enum value
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
index 1c09c04..f4f21995 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/MapVariableInterpolator.java
@@ -27,6 +27,7 @@ import org.apache.wicket.util.string.Strings;
* @author Jonathan Locke
* @since 1.2.6
*/
+@SuppressWarnings("serial")
public class MapVariableInterpolator extends VariableInterpolator
{
/** Map of variables */
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/SystemVariableInterpolator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/SystemVariableInterpolator.java b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/SystemVariableInterpolator.java
index ae4c763..864c44d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/SystemVariableInterpolator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/SystemVariableInterpolator.java
@@ -22,6 +22,7 @@ package org.apache.wicket.util.string.interpolator;
* @author Jonathan Locke
* @since 1.2.6
*/
+@SuppressWarnings("serial")
public final class SystemVariableInterpolator extends MapVariableInterpolator
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
index 86add15..e56197b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
@@ -37,6 +37,7 @@ import org.apache.wicket.util.io.IClusterable;
* @author Jonathan Locke
* @since 1.2.6
*/
+@SuppressWarnings("serial")
public abstract class VariableInterpolator implements IClusterable
{
/** The <code>String</code> to interpolate into */
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
index 2aac2be..a4497c6 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
@@ -552,11 +552,11 @@ public final class Time extends AbstractTime
}
/**
- * return timestamp string in RFC1123 format
- * <p/>
- * Contrary to {@link java.text.SimpleDateFormat} this is thread-safe.
- * <p/>
- * taken from the source code of jetty 7.3.0, credits + thanks to Greg Wilkins!
+ * Returns this time stamp in RFC1123 string format. Contrary to
+ * {@link java.text.SimpleDateFormat} this is thread-safe. Taken from the source code of jetty
+ * 7.3.0, credits + thanks to Greg Wilkins!
+ *
+ * @return timestamp string in RFC1123 format
*/
public String toRfc1123TimestampString()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java
index f38ee54..b5c7da1 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java
@@ -19,20 +19,20 @@ package org.apache.wicket.util.collections;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.Iterator;
import org.apache.wicket.util.io.ByteArrayOutputStream;
-import org.junit.Assert;
import org.junit.Test;
-public class IntHashMapTest extends Assert
+@SuppressWarnings("javadoc")
+public class IntHashMapTest
{
-
+ @SuppressWarnings({ "resource", "unchecked" })
@Test
public void serialize() throws IOException, ClassNotFoundException
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
index fb92c96..479be0e 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/BigIntegerConverterTest.java
@@ -23,9 +23,7 @@ import org.apache.wicket.util.convert.ConversionException;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Tests for BigIntegerConverter
- */
+@SuppressWarnings("javadoc")
public class BigIntegerConverterTest extends Assert
{
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index fd2bc14..58c7fb2 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.util.convert.converters;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
import java.math.BigDecimal;
import java.text.ChoiceFormat;
import java.text.NumberFormat;
@@ -35,22 +39,14 @@ import org.apache.wicket.util.convert.converter.FloatConverter;
import org.apache.wicket.util.convert.converter.IntegerConverter;
import org.apache.wicket.util.convert.converter.LongConverter;
import org.apache.wicket.util.convert.converter.ShortConverter;
-import org.junit.Assert;
import org.junit.Test;
-/**
- * Tests for the base converters.
- *
- * @author Eelco Hillenius
- */
-public final class ConvertersTest extends Assert
+@SuppressWarnings("javadoc")
+public final class ConvertersTest
{
/** Dutch locale for localized testing. */
private static final Locale DUTCH_LOCALE = new Locale("nl", "NL");
- /**
- * @throws Exception
- */
@Test
public void thousandSeperator() throws Exception
{
@@ -86,18 +82,8 @@ public final class ConvertersTest extends Assert
assertEquals(Float.valueOf(1234f), fc.convertToObject(string, Locale.FRENCH));
}
- /**
- * @throws Exception
- * WICKET-1344 public void testBigDecimalRounding() throws Exception {
- * BigDecimalConverter bdc = new BigDecimalConverter(); assertEquals("123.45",
- * bdc.convertToObject("123.45", Locale.ENGLISH).toString()); }
- */
-
- /**
- * Test boolean conversions.
- */
@Test
- public void booleanConversions()
+ public void validBooleanConversions()
{
BooleanConverter converter = new BooleanConverter();
assertEquals(Boolean.FALSE, converter.convertToObject("", Locale.US));
@@ -105,61 +91,49 @@ public final class ConvertersTest extends Assert
assertEquals("false", converter.convertToString(Boolean.FALSE, Locale.getDefault()));
assertEquals(Boolean.TRUE, converter.convertToObject("true", Locale.getDefault()));
assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault()));
- try
- {
- converter.convertToObject("whatever", Locale.getDefault());
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
}
- /**
- * Test byte conversions.
- */
+ @Test(expected = ConversionException.class)
+ public void invalidBooleanConversion()
+ {
+ BooleanConverter converter = new BooleanConverter();
+
+ // should throw an exception
+ converter.convertToObject("whatever", Locale.getDefault());
+ }
+
@Test
- public void byteConversions()
+ public void validByteConversions()
{
ByteConverter converter = new ByteConverter();
assertNull(converter.convertToObject("", Locale.US));
assertEquals(new Byte((byte)10), converter.convertToObject("10", Locale.US));
assertEquals("10", converter.convertToString((byte)10, Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("10whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("256", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
}
- /**
- * Test double conversions.
- */
+ @Test(expected = ConversionException.class)
+ public void invalidByteConversion1()
+ {
+ ByteConverter converter = new ByteConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidByteConversion2()
+ {
+ ByteConverter converter = new ByteConverter();
+ converter.convertToObject("10whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidByteConversion3()
+ {
+ ByteConverter converter = new ByteConverter();
+ converter.convertToObject("256", Locale.US);
+ }
+
@Test
- public void doubleConversions()
+ public void validDoubleConversions()
{
DoubleConverter converter = new DoubleConverter();
assertEquals("7.1", converter.convertToString(7.1, Locale.US));
@@ -167,198 +141,152 @@ public final class ConvertersTest extends Assert
assertNull(converter.convertToObject("", Locale.US));
assertEquals(1.1, converter.convertToObject("1.1", Locale.US), 0.001);
assertEquals("1.1", converter.convertToString(1.1, Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
- try
- {
- converter.convertToObject("1.1whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ }
- try
- {
- converter.convertToObject("1" + Double.MAX_VALUE, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidDoubleConversion1()
+ {
+ DoubleConverter converter = new DoubleConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidDoubleConversion2()
+ {
+ DoubleConverter converter = new DoubleConverter();
+ converter.convertToObject("1.1whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidDoubleConversion3()
+ {
+ DoubleConverter converter = new DoubleConverter();
+ converter.convertToObject("1" + Double.MAX_VALUE, Locale.US);
}
- /**
- * Test float conversions.
- */
@Test
- public void floatConversions()
+ public void validFloatConversions()
{
FloatConverter converter = new FloatConverter();
assertNull(converter.convertToObject("", Locale.US));
assertEquals(new Float(1.1), converter.convertToObject("1.1", Locale.US));
assertEquals("1.1", converter.convertToString(new Float(1.1), Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
- try
- {
- converter.convertToObject("1.1whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ }
+ @Test(expected = ConversionException.class)
+ public void invalidFloatConversion1()
+ {
+ FloatConverter converter = new FloatConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
- try
- {
- converter.convertToObject("1" + Float.MAX_VALUE, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidFloatConversion2()
+ {
+ FloatConverter converter = new FloatConverter();
+ converter.convertToObject("1.1whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidFloatConversion3()
+ {
+ FloatConverter converter = new FloatConverter();
+ converter.convertToObject("1" + Float.MAX_VALUE, Locale.US);
}
- /**
- * Test integer conversions.
- */
@Test
- public void integerConversions()
+ public void validIntegerConversions()
{
IntegerConverter converter = new IntegerConverter();
assertEquals("7", converter.convertToString(7, Locale.US));
assertNull(converter.convertToObject("", Locale.US));
assertEquals(new Integer(10), converter.convertToObject("10", Locale.US));
assertEquals("10", converter.convertToString(10, Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("10whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ }
- try
- {
- converter.convertToObject("1.0", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidIntegerConversion1()
+ {
+ IntegerConverter converter = new IntegerConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
- try
- {
- converter.convertToObject("1" + Integer.MAX_VALUE, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidIntegerConversion2()
+ {
+ IntegerConverter converter = new IntegerConverter();
+ converter.convertToObject("10whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidIntegerConversion3()
+ {
+ IntegerConverter converter = new IntegerConverter();
+ converter.convertToObject("1.0", Locale.US);
+ fail("Conversion should have thrown an exception");
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidIntegerConversion4()
+ {
+ IntegerConverter converter = new IntegerConverter();
+ converter.convertToObject("1" + Integer.MAX_VALUE, Locale.US);
}
- /**
- * Test long conversions.
- */
@Test
- public void longConversions()
+ public void validLongConversions()
{
LongConverter converter = new LongConverter();
assertNull(converter.convertToObject("", Locale.US));
assertEquals(new Long(10), converter.convertToObject("10", Locale.US));
assertEquals("10", converter.convertToString((long)10, Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("10whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("1" + Long.MAX_VALUE, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ }
- try
- {
- // WICKET-5853 assert that the compared number is out of range of Long
- final String biggerThanLong = "9223372036854776833";
- assertEquals(1,
- new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
- converter.convertToObject(biggerThanLong, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidLongConversion1()
+ {
+ LongConverter converter = new LongConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
- try
- {
- // WICKET-5853 assert that the compared number is out of range of Long
- final String biggerThanLong = "9223372036854776832";
- assertEquals(1,
- new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
- converter.convertToObject(biggerThanLong, Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidLongConversion2()
+ {
+ LongConverter converter = new LongConverter();
+ converter.convertToObject("10whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidLongConversion3()
+ {
+ LongConverter converter = new LongConverter();
+ converter.convertToObject("1" + Long.MAX_VALUE, Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidLongConversion4()
+ {
+ LongConverter converter = new LongConverter();
+
+ // WICKET-5853 assert that the compared number is out of range of Long
+ final String biggerThanLong = "9223372036854776833";
+ assertEquals(1,
+ new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
+ converter.convertToObject(biggerThanLong, Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidLongConversion5()
+ {
+ LongConverter converter = new LongConverter();
+
+ // WICKET-5853 assert that the compared number is out of range of Long
+ final String biggerThanLong = "9223372036854776832";
+ assertEquals(1,
+ new BigDecimal(biggerThanLong).compareTo(BigDecimal.valueOf(Long.MAX_VALUE)));
+ converter.convertToObject(biggerThanLong, Locale.US);
}
- /**
- * Test short conversions
- */
@Test
public void shortConversions()
{
@@ -366,64 +294,49 @@ public final class ConvertersTest extends Assert
assertNull(converter.convertToObject("", Locale.US));
assertEquals(new Short((short)10), converter.convertToObject("10", Locale.US));
assertEquals("10", converter.convertToString((short)10, Locale.US));
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
- try
- {
- converter.convertToObject("10whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ }
- try
- {
- converter.convertToObject("" + (Short.MAX_VALUE + 1), Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // This is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidShortConversion1()
+ {
+ ShortConverter converter = new ShortConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidShortConversion2()
+ {
+ ShortConverter converter = new ShortConverter();
+ converter.convertToObject("10whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidShortConversion3()
+ {
+ ShortConverter converter = new ShortConverter();
+ converter.convertToObject("" + (Short.MAX_VALUE + 1), Locale.US);
}
- /**
- * Test for character locale conversions.
- */
@Test
- public void characterConverter()
+ public void validCharacterConverter()
{
CharacterConverter converter = new CharacterConverter();
assertNull(converter.convertToObject("", Locale.US));
assertEquals("A", converter.convertToString('A', DUTCH_LOCALE));
assertEquals((Object)'A', converter.convertToObject("A", DUTCH_LOCALE));
+ }
- try
- {
- converter.convertToObject("AA", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidCharacterConversion1()
+ {
+ CharacterConverter converter = new CharacterConverter();
+ converter.convertToObject("AA", Locale.US);
+ fail("Conversion should have thrown an exception");
}
- /**
- * Test date locale conversions.
- */
@Test
- public void dateConverter()
+ public void validDateConverters()
{
DateConverter converter = new DateConverter();
@@ -439,30 +352,22 @@ public final class ConvertersTest extends Assert
assertEquals("10/24/02", converter.convertToString(date, Locale.US));
assertEquals(date, converter.convertToObject("10/24/02", Locale.US));
+ }
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
- try
- {
- converter.convertToObject("10/24/02whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidDateConversion1()
+ {
+ DateConverter converter = new DateConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
+
+ @Test(expected = ConversionException.class)
+ public void invalidDateConversion2()
+ {
+ DateConverter converter = new DateConverter();
+ converter.convertToObject("10/24/02whatever", Locale.US);
}
- /**
- * Test calendar locale conversions.
- */
@Test
public void calendarConverter()
{
@@ -480,26 +385,20 @@ public final class ConvertersTest extends Assert
cal.set(2011, Calendar.MAY, 1);
assertEquals("5/1/11", converter.convertToString(cal, Locale.US));
assertEquals(cal, converter.convertToObject("5/1/11", Locale.US));
+ }
- try
- {
- converter.convertToObject("whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidCalendarConversion1()
+ {
+ CalendarConverter converter = new CalendarConverter();
+ converter.convertToObject("whatever", Locale.US);
+ }
- try
- {
- converter.convertToObject("5/1/11whatever", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
- {
- // this is correct
- }
+ @Test(expected = ConversionException.class)
+ public void invalidCalendarConversion2()
+ {
+ CalendarConverter converter = new CalendarConverter();
+ converter.convertToObject("5/1/11whatever", Locale.US);
}
/**
@@ -523,27 +422,34 @@ public final class ConvertersTest extends Assert
@Test
public void customFormat()
{
+ @SuppressWarnings("serial")
IntegerConverter converter = new IntegerConverter()
{
protected NumberFormat newNumberFormat(Locale locale)
{
- return new ChoiceFormat(new double[] { 1, 2, 3 }, new String[] { "one", "two",
- "three" });
+ return new ChoiceFormat(new double[] { 1, 2, 3 },
+ new String[] { "one", "two", "three" });
}
};
Integer integer = converter.convertToObject("two", Locale.US);
-
assertEquals(new Integer(2), integer);
+ }
- try
- {
- converter.convertToObject("four", Locale.US);
- fail("Conversion should have thrown an exception");
- }
- catch (ConversionException e)
+ @Test(expected = ConversionException.class)
+ public void invalidCustomConversion1()
+ {
+ @SuppressWarnings("serial")
+ IntegerConverter converter = new IntegerConverter()
{
- // this is correct
- }
+ protected NumberFormat newNumberFormat(Locale locale)
+ {
+ return new ChoiceFormat(new double[] { 1, 2, 3 },
+ new String[] { "one", "two", "three" });
+ }
+ };
+
+ converter.convertToObject("four", Locale.US);
+ fail("Conversion should have thrown an exception");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
index 1d366bd..fec7194 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/SunJceCryptTest.java
@@ -28,6 +28,7 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
+@SuppressWarnings("javadoc")
public class SunJceCryptTest extends Assert
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
index 19515e0..0dfc711 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java
@@ -38,6 +38,7 @@ import org.junit.Test;
* A demo how to create {@link org.apache.wicket.util.crypt.ICrypt} implementation that
* uses <em>PBKDF2WithHmacSHA1</em> for encryption
*/
+@SuppressWarnings("javadoc")
public class UnlimitedStrengthJurisdictionPolicyTest extends Assert
{
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
index 334ecfc..9b01915 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlDecoderTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
+@SuppressWarnings("javadoc")
public class UrlDecoderTest
{
@Test
@@ -42,7 +43,6 @@ public class UrlDecoderTest
/**
* https://issues.apache.org/jira/browse/WICKET-4803
- * @throws Exception
*/
@Test
public void badUrlEntities() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
index 3691c74..4cbbfce 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
@@ -21,12 +21,9 @@ import org.apache.wicket.util.encoding.UrlEncoder;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Tests for {@link org.apache.wicket.util.encoding.UrlDecoder}
- */
+@SuppressWarnings("javadoc")
public class UrlEncoderTest extends Assert
{
-
/**
* <a href="https://issues.apache.org/jira/browse/WICKET-3721">WICKET-3721</a> Encode
* apostrophes because otherwise they get XML encoded by ComponentTag#writeOutput() to
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
index cde53f6..b5e994f 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.io;
+import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -23,14 +24,13 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import java.net.URL;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
import org.junit.Test;
-public class ConnectionsTest extends Assert
+@SuppressWarnings("javadoc")
+public class ConnectionsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-5838
- * @throws Exception
*/
@Test
public void getLastModified() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
index c3cb0c7..1cbb1d6 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
@@ -21,137 +21,118 @@ import java.io.BufferedReader;
import org.junit.Assert;
import org.junit.Test;
-/**
- *
- * @author Juergen Donnerstag
- */
+@SuppressWarnings("javadoc")
public class XmlReaderTest extends Assert
{
- /**
- *
- * @throws Exception
- */
@Test
- public void test_1() throws Exception
+ public void readHtmlFileWithoutAnyTags() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_1.html"), null);
assertNull(reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("Zeile 1", bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("Zeile 1", bufReader.readLine());
- assertNull(bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_2() throws Exception
+ public void readHtmlFileWithHtmlAndBody() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_2.html"), null);
assertNull(reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("<html>", bufReader.readLine());
- assertEquals("<body>", bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("<html>", bufReader.readLine());
+ assertEquals("<body>", bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_3() throws Exception
+ public void readHtmlFileWithXmlPreambleSansVersionAndHtmlTag() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_3.html"), null);
assertNull(reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_4() throws Exception
+ public void readHtmlFileWithXmlPreambleWithVersionAndHtmlTag() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_4.html"), null);
assertNull(reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_5() throws Exception
+ public void readHtmlFileWithXmlPreambleWithVersionAndEncodingAndHtmlTag() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_5.html"), null);
assertEquals("UTF-8", reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_6() throws Exception
+ public void readHtmlFileWithXmlPreambleWithVersionAndEncodingInSingleQuotesAndHtmlTag() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_6.html"), null);
assertEquals("UTF-8", reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void test_7() throws Exception
+ public void readHtmlFileWithXmlPreambleWithVersionAndEncodingSansQuotesAndHtmlTag() throws Exception
{
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_7.html"), null);
assertEquals("UTF-8", reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
- /**
- *
- * @throws Exception
- */
@Test
- public void ignoreBOM() throws Exception
+ public void readHtmlFileWithBomAndXmlPreambleWithEncodingSansQuotesAndHtmlTag() throws Exception
{
// test_8.html starts with <U+FEFF> character
XmlReader reader = new XmlReader(this.getClass().getResourceAsStream("test_8.html"), null);
assertEquals("UTF-8", reader.getEncoding());
- BufferedReader bufReader = new BufferedReader(reader);
- assertEquals("", bufReader.readLine().trim());
- assertEquals("<html>", bufReader.readLine());
- assertNull(bufReader.readLine());
+ try (BufferedReader bufReader = new BufferedReader(reader);)
+ {
+ assertEquals("", bufReader.readLine().trim());
+ assertEquals("<html>", bufReader.readLine());
+ assertNull(bufReader.readLine());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
index 7b66f57..80e7d7f 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
/**
* @since 1.5.8
*/
+@SuppressWarnings({"javadoc", "serial"})
public class ClassesTest extends Assert
{
@Test
@@ -51,6 +52,4 @@ public class ClassesTest extends Assert
// anonymous interface impl
assertEquals("java.lang.Object", Classes.name(new Cloneable() {}.getClass()));
}
-
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
index 14ec700..9b08c3a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
/**
* @since 1.5.8
*/
+@SuppressWarnings("javadoc")
public class NumbersTest extends Assert
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
index e676e7f..7b9be38 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
@@ -22,6 +22,7 @@ import org.junit.Test;
/**
* @since 1.5.5
*/
+@SuppressWarnings("javadoc")
public class PackagesTest extends Assert
{
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
index 27d883f..a7d8bc7 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
@@ -19,15 +19,9 @@ package org.apache.wicket.util.string;
import org.junit.Assert;
import org.junit.Test;
-/**
- * @author jcompagner
- */
+@SuppressWarnings("javadoc")
public class AppendingStringBufferTest extends Assert
{
-
- /**
- * Test method for 'org.apache.wicket.util.string.AppendingStringBuffer.append(String)'
- */
@Test
public void append()
{
@@ -40,9 +34,6 @@ public class AppendingStringBufferTest extends Assert
assertEquals("test1test2test3test4", asb.toString());
}
- /**
- * @throws Exception
- */
@Test
public void largeBegin() throws Exception
{
@@ -50,9 +41,6 @@ public class AppendingStringBufferTest extends Assert
assertEquals("123456789012345678901234567890", asb.toString());
}
- /**
- * @throws Exception
- */
@Test
public void charPrepend() throws Exception
{
@@ -61,9 +49,6 @@ public class AppendingStringBufferTest extends Assert
assertEquals("1234567890", asb.toString());
}
- /**
- * @throws Exception
- */
@Test
public void equalsToAppeningBuffer() throws Exception
{
@@ -72,9 +57,6 @@ public class AppendingStringBufferTest extends Assert
assertEquals(asb1, asb2);
}
- /**
- * @throws Exception
- */
@Test
public void equalsToCharSequence() throws Exception
{
@@ -88,9 +70,6 @@ public class AppendingStringBufferTest extends Assert
assertFalse(asb.equals("01234567890"));
}
- /**
- * @throws Exception
- */
@Test
public void startsWidth() throws Exception
{
@@ -105,9 +84,6 @@ public class AppendingStringBufferTest extends Assert
assertFalse(asb.startsWith("01234"));
}
- /**
- * @throws Exception
- */
@Test
public void endsWidth() throws Exception
{
@@ -156,7 +132,5 @@ public class AppendingStringBufferTest extends Assert
asb = new AppendingStringBuffer("123456789");
asb.insert(5, (Integer)null);
assertEquals("12345null6789", asb.toString());
-
}
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
index 4f0a60b..81c002f 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
@@ -23,9 +23,7 @@ import org.apache.wicket.util.time.Time;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Tests for StringValue
- */
+@SuppressWarnings("javadoc")
public class StringValueTest extends Assert
{
/**
@@ -132,7 +130,7 @@ public class StringValueTest extends Assert
}
@Test
- public void enums() throws Exception
+ public void enums()
{
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.class));
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.BAR));
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
index b0e3970..9c495c7 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
@@ -16,56 +16,21 @@
*/
package org.apache.wicket.util.string;
+import static org.junit.Assert.*;
+
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.util.lang.Args;
-import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Tests for {@link Strings}
- *
- * @author Jonathan Locke
- * @author Martijn Dashorst
- */
-public class StringsTest extends Assert
+@SuppressWarnings("javadoc")
+public class StringsTest
{
private static final Logger log = LoggerFactory.getLogger(StringsTest.class);
- /**
- *
- */
- @Test
- public void logger()
- {
- log.debug("Test: '{}'", 1);
-
- try
- {
- throw new IllegalArgumentException("meine Exception");
- }
- catch (Exception ex)
- {
- log.debug("Test: '{}'", 1, ex);
- }
-
- try
- {
- Args.isTrue(false, "args error: %s", 123);
- }
- catch (Exception ex)
- {
- log.debug("Test: '{}'", 321, ex);
- }
- }
-
- /**
- *
- */
@Test
public void stripJSessionId()
{
@@ -86,34 +51,28 @@ public class StringsTest extends Assert
Strings.stripJSessionId(url + ";a=b;c=d;jsessionid=12345?param=a;b"));
}
- /**
- *
- */
@Test
public void test()
{
- Assert.assertEquals("foo", Strings.lastPathComponent("bar:garply:foo", ':'));
- Assert.assertEquals("foo", Strings.lastPathComponent("foo", ':'));
- Assert.assertEquals("bar", Strings.firstPathComponent("bar:garply:foo", ':'));
- Assert.assertEquals("foo", Strings.lastPathComponent("foo", ':'));
- Assert.assertEquals("garply:foo", Strings.afterFirstPathComponent("bar:garply:foo", ':'));
- Assert.assertEquals("", Strings.afterFirstPathComponent("foo", ':'));
- Assert.assertEquals("bar:baz", Strings.beforeLast("bar:baz:foo", ':'));
- Assert.assertEquals("", Strings.beforeLast("bar", ':'));
- Assert.assertEquals("bar", Strings.beforeFirst("bar:baz:foo", ':'));
- Assert.assertEquals("", Strings.beforeFirst("bar", ':'));
- Assert.assertEquals("baz:foo", Strings.afterFirst("bar:baz:foo", ':'));
- Assert.assertEquals("", Strings.afterFirst("bar", ':'));
- Assert.assertEquals("foo", Strings.afterLast("bar:baz:foo", ':'));
- Assert.assertEquals("", Strings.afterLast("bar", ':'));
- Assert.assertEquals("foo", Strings.replaceAll("afaooaaa", "a", "").toString());
- Assert.assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy",
+ assertEquals("foo", Strings.lastPathComponent("bar:garply:foo", ':'));
+ assertEquals("foo", Strings.lastPathComponent("foo", ':'));
+ assertEquals("bar", Strings.firstPathComponent("bar:garply:foo", ':'));
+ assertEquals("foo", Strings.lastPathComponent("foo", ':'));
+ assertEquals("garply:foo", Strings.afterFirstPathComponent("bar:garply:foo", ':'));
+ assertEquals("", Strings.afterFirstPathComponent("foo", ':'));
+ assertEquals("bar:baz", Strings.beforeLast("bar:baz:foo", ':'));
+ assertEquals("", Strings.beforeLast("bar", ':'));
+ assertEquals("bar", Strings.beforeFirst("bar:baz:foo", ':'));
+ assertEquals("", Strings.beforeFirst("bar", ':'));
+ assertEquals("baz:foo", Strings.afterFirst("bar:baz:foo", ':'));
+ assertEquals("", Strings.afterFirst("bar", ':'));
+ assertEquals("foo", Strings.afterLast("bar:baz:foo", ':'));
+ assertEquals("", Strings.afterLast("bar", ':'));
+ assertEquals("foo", Strings.replaceAll("afaooaaa", "a", "").toString());
+ assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy",
Strings.replaceAll("afaooaaa", "a", "fuzzy").toString());
}
- /**
- * Tests the <code>beforeFirst</code> method.
- */
@Test
public void beforeFirst()
{
@@ -127,9 +86,6 @@ public class StringsTest extends Assert
assertEquals("com foo", Strings.beforeFirst("com foo.bar", '.'));
}
- /**
- * Tests the <code>afterFirst</code> method.
- */
@Test
public void afterFirst()
{
@@ -143,9 +99,6 @@ public class StringsTest extends Assert
assertEquals("bar", Strings.afterFirst("com.foo bar", ' '));
}
- /**
- * Tests the <code>afterLast</code> method.
- */
@Test
public void afterLast()
{
@@ -159,9 +112,6 @@ public class StringsTest extends Assert
assertEquals("bar", Strings.afterLast("com foo.bar", '.'));
}
- /**
- * Tests the beforeLastPathComponent method
- */
@Test
public void beforeLastPathComponent()
{
@@ -176,22 +126,18 @@ public class StringsTest extends Assert
assertEquals("com.foo", Strings.beforeLastPathComponent("com.foo.bar", '.'));
}
- /**
- * Tests the capitalize method.
- */
@Test
public void capitalize()
{
- assertEquals("Lorem ipsum dolor sit amet", Strings.capitalize("lorem ipsum dolor sit amet"));
- assertEquals("Lorem ipsum dolor sit amet", Strings.capitalize("Lorem ipsum dolor sit amet"));
+ assertEquals("Lorem ipsum dolor sit amet",
+ Strings.capitalize("lorem ipsum dolor sit amet"));
+ assertEquals("Lorem ipsum dolor sit amet",
+ Strings.capitalize("Lorem ipsum dolor sit amet"));
assertEquals(" abcdefghijklm", Strings.capitalize(" abcdefghijklm"));
assertEquals("", Strings.capitalize(""));
assertNull(Strings.capitalize(null));
}
- /**
- * Tests the escapeMarkup method.
- */
@Test
public void escapeMarkup()
{
@@ -224,9 +170,6 @@ public class StringsTest extends Assert
Strings.escapeMarkup(controlCharacters.toString()).toString());
}
- /**
- * Tests the escapeMarkup method with whitespace.
- */
@Test
public void escapeMarkupWhiteSpace()
{
@@ -234,46 +177,35 @@ public class StringsTest extends Assert
assertEquals("", Strings.escapeMarkup("", true).toString());
assertEquals("\n \t", Strings.escapeMarkup("\n \t", false).toString());
- assertEquals("\n ", Strings.escapeMarkup("\n \t", true)
- .toString());
+ assertEquals("\n ",
+ Strings.escapeMarkup("\n \t", true).toString());
assertEquals(" ", Strings.escapeMarkup(" ", false).toString());
assertEquals(" ", Strings.escapeMarkup(" ", true).toString());
}
- /**
- * Tests the escapeMarkup method with unicode escapes.
- *
- * @throws UnsupportedEncodingException
- */
@Test
- public void escapeMarkupUnicode() throws UnsupportedEncodingException
+ public void escapeMarkupUnicode()
{
assertNull(Strings.escapeMarkup(null, true, true));
assertEquals("", Strings.escapeMarkup("", true, true).toString());
// The escaped unicode is ����������"
- assertEquals(
- "Çüéâäàåçêë",
+ assertEquals("Çüéâäàåçêë",
Strings.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
false, true).toString());
}
- /**
- * Tests the <code>replaceHtmlEscapeNumber</code> method.
- *
- * @throws UnsupportedEncodingException
- */
@Test
- public void replaceHtmlEscapeNumber() throws UnsupportedEncodingException
+ public void replaceHtmlEscapeNumber()
{
assertNull(Strings.replaceHtmlEscapeNumber(null));
assertEquals("", Strings.replaceHtmlEscapeNumber(""));
assertEquals("abcdefghijklm�", Strings.replaceHtmlEscapeNumber("abcdefghijklm�"));
assertEquals("a &#", Strings.replaceHtmlEscapeNumber("a &#"));
- assertEquals(
- "\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
- Strings.replaceHtmlEscapeNumber("Çüéâäàåçêë"));
+ assertEquals("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
+ Strings.replaceHtmlEscapeNumber(
+ "Çüéâäàåçêë"));
}
private String convertNonASCIIString(final String str) throws UnsupportedEncodingException
@@ -281,9 +213,6 @@ public class StringsTest extends Assert
return new String(str.getBytes(), "iso-8859-1");
}
- /**
- * Tests the <code>firstPathComponent</code> method.
- */
@Test
public void firstPathComponent()
{
@@ -294,9 +223,6 @@ public class StringsTest extends Assert
assertEquals("foo bar", Strings.firstPathComponent("foo bar", '.'));
}
- /**
- * Tests the <code>isEmpty</code> method.
- */
@Test
public void isEmpty()
{
@@ -309,11 +235,6 @@ public class StringsTest extends Assert
assertFalse(Strings.isEmpty(" a"));
}
- /**
- * Tests the <code>isTrue</code> method.
- *
- * @throws StringValueConversionException
- */
@Test
public void isTrue() throws StringValueConversionException
{
@@ -337,21 +258,14 @@ public class StringsTest extends Assert
assertTrue(Strings.isTrue("Y"));
assertTrue(Strings.isTrue("tRuE"));
assertTrue(Strings.isTrue("1"));
+ }
- try
- {
- Strings.isTrue("foo");
- fail("Exception expected");
- }
- catch (StringValueConversionException e)
- {
- assertTrue(true);
- }
+ @Test(expected = StringValueConversionException.class)
+ public void invalidIsTrue()
+ {
+ Strings.isTrue("foo");
}
- /**
- * Tests the <code>replaceAll</code> method.
- */
@Test
public void replaceAll()
{
@@ -386,25 +300,19 @@ public class StringsTest extends Assert
assertEquals("aaaa", Strings.replaceAll(asb, "a", "aa").toString());
}
- /**
- * Tests the <code>split</code> method.
- */
@Test
public void split()
{
- assertEquals(new String[0], Strings.split(null, '.'));
- assertEquals(new String[0], Strings.split("", '.'));
- assertEquals(new String[] { "", "" }, Strings.split(".", '.'));
- assertEquals(new String[] { "a", "" }, Strings.split("a.", '.'));
- assertEquals(new String[] { "a", "b" }, Strings.split("a.b", '.'));
- assertEquals(new String[] { "a", "b", "c" }, Strings.split("a.b.c", '.'));
- assertEquals(new String[] { "a", "b", "c" }, Strings.split("a b c", ' '));
- assertEquals(new String[] { "abc" }, Strings.split("abc", ' '));
+ assertArrayEquals(new String[0], Strings.split(null, '.'));
+ assertArrayEquals(new String[0], Strings.split("", '.'));
+ assertArrayEquals(new String[] { "", "" }, Strings.split(".", '.'));
+ assertArrayEquals(new String[] { "a", "" }, Strings.split("a.", '.'));
+ assertArrayEquals(new String[] { "a", "b" }, Strings.split("a.b", '.'));
+ assertArrayEquals(new String[] { "a", "b", "c" }, Strings.split("a.b.c", '.'));
+ assertArrayEquals(new String[] { "a", "b", "c" }, Strings.split("a b c", ' '));
+ assertArrayEquals(new String[] { "abc" }, Strings.split("abc", ' '));
}
- /**
- * Tests the <code>stripEnding</code> method.
- */
@Test
public void stripEnding()
{
@@ -417,11 +325,6 @@ public class StringsTest extends Assert
assertEquals("abc", Strings.stripEnding("abc", "ab"));
}
- /**
- * Tests the <code>toBoolean</code> method.
- *
- * @throws StringValueConversionException
- */
@Test
public void toBoolean() throws StringValueConversionException
{
@@ -437,58 +340,39 @@ public class StringsTest extends Assert
assertEquals(Boolean.TRUE, Strings.toBoolean("y"));
assertEquals(Boolean.TRUE, Strings.toBoolean("true"));
assertEquals(Boolean.TRUE, Strings.toBoolean("1"));
+ }
- try
- {
- Strings.toBoolean("waar");
- fail("Exception expected");
- }
- catch (StringValueConversionException e)
- {
- assertTrue(true);
- }
+ @Test(expected = StringValueConversionException.class)
+ public void invalidToBoolean()
+ {
+ Strings.toBoolean("waar");
}
- /**
- * Tests the <code>toChar</code> method.
- *
- * @throws StringValueConversionException
- */
@Test
- public void toChar() throws StringValueConversionException
+ public void toChar()
{
assertEquals(' ', Strings.toChar(" "));
assertEquals('a', Strings.toChar("a"));
+ }
- try
- {
- Strings.toChar("");
- fail("Exception expected");
- }
- catch (StringValueConversionException e)
- {
- }
- try
- {
- Strings.toChar(null);
- fail("Exception expected");
- }
- catch (StringValueConversionException e)
- {
- }
- try
- {
- Strings.toChar("aa");
- fail("Exception expected");
- }
- catch (StringValueConversionException e)
- {
- }
+ @Test(expected = StringValueConversionException.class)
+ public void invalidToChar1()
+ {
+ Strings.toChar("");
+ }
+
+ @Test(expected = StringValueConversionException.class)
+ public void invalidToChar2()
+ {
+ Strings.toChar(null);
+ }
+
+ @Test(expected = StringValueConversionException.class)
+ public void invalidToChar3()
+ {
+ Strings.toChar("aa");
}
- /**
- * Tests the <code>toMultilineMarkup</code> method.
- */
@Test
public void toMultilineMarkup()
{
@@ -500,14 +384,15 @@ public class StringsTest extends Assert
assertEquals("<p>abc<br/></p>", Strings.toMultilineMarkup("abc\n").toString());
assertEquals("<p>abc<br/>def</p>", Strings.toMultilineMarkup("abc\ndef").toString());
assertEquals("<p>abc<br/>def</p>", Strings.toMultilineMarkup("abc\r\ndef").toString());
- assertEquals("<p>abc<br/>def<br/>ghi</p>", Strings.toMultilineMarkup("abc\ndef\nghi")
- .toString());
+ assertEquals("<p>abc<br/>def<br/>ghi</p>",
+ Strings.toMultilineMarkup("abc\ndef\nghi").toString());
// WICKET-4837
assertEquals(
"<p><a href=\"mailto:john@doe.com\">john@doe.com</a><br/><a href=\"http://apache.wicket.org\">http://apache.wicket.org</a></p>",
- Strings.toMultilineMarkup(
- "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
+ Strings
+ .toMultilineMarkup(
+ "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
.toString());
assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
@@ -521,9 +406,6 @@ public class StringsTest extends Assert
assertEquals("<p>a\\nbc</p>", Strings.toMultilineMarkup("a\\nbc").toString());
}
- /**
- * Tests the <code>toString</code> method.
- */
@Test
public void testToString()
{
@@ -543,9 +425,6 @@ public class StringsTest extends Assert
}
}
- /**
- * Test the toString(throwable)
- */
@Test
public void toStringThrowable()
{
@@ -555,35 +434,16 @@ public class StringsTest extends Assert
assertTrue(exceptionString.length() > 1);
assertTrue(exceptionString.contains("RuntimeException"));
}
-
- /**
- * Tests the <code>join</code> method.
- */
+
@Test
public void testJoin() throws Exception
{
List<String> fragments = Arrays.asList("foo", "bar", "baz");
-
+
assertEquals("foo-bar-baz", Strings.join("-", fragments));
-
- //empty separator
- assertEquals("foobarbaz", Strings.join("", fragments));
- }
- /**
- * Asserts that both string arrays are equal.
- *
- * @param expected
- * the expected value
- * @param actual
- * the actual value
- */
- private void assertEquals(final String[] expected, final String[] actual)
- {
- if (expected == null)
- {
- assertNull(actual);
- }
- assertEquals(stringValue(expected), stringValue(actual));
+
+ // empty separator
+ assertEquals("foobarbaz", Strings.join("", fragments));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfee6a2a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
index cc88b83..b13b745 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
@@ -23,26 +23,14 @@ import java.util.Calendar;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Test cases for this object
- *
- * @author Jonathan Locke
- */
+@SuppressWarnings("javadoc")
public final class TimeTest extends Assert
{
- /**
- *
- * @throws ParseException
- */
@Test
public void test() throws ParseException
{
Time.now();
- // TODO Post 1.2: Bug: Eelco mentioned this test fails on his computer
- // from time to time. I have seen this and it's very weird -- Jonathan
- // Assert.assertTrue(Time.now().after(start) || Time.now().equals(start));
-
final Time birthday = Time.parseDate("1966.06.01");
assertEquals(1966, birthday.getYear());
@@ -58,12 +46,9 @@ public final class TimeTest extends Assert
* WICKET-5442 getHour() should be on 24-hour clock
*/
@Test
- public void hour() throws Exception
+ public void hour() throws ParseException
{
-
Time time = Time.valueOf("2000.10.30-9.30PM");
-
assertEquals(21, time.getHour());
}
-
}