assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -51,7 +51,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -62,7 +62,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -76,7 +76,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -91,7 +91,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -107,7 +107,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
@@ -124,7 +124,7 @@
/**
* Creates a matcher that matches if the examined object matches ALL of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", allOf(startsWith("my"), containsString("Val")))
*/
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java 2012-05-20 11:26:37.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java 2017-09-08 09:15:48.806422798 +0200
@@ -30,7 +30,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -41,7 +41,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -52,7 +52,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -66,7 +66,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -81,7 +81,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -97,7 +97,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
@@ -114,7 +114,7 @@
/**
* Creates a matcher that matches if the examined object matches ANY of the specified matchers.
- *
+ *
* For example:
* assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))
*/
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/CombinableMatcher.java 2012-05-20 11:29:50.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/CombinableMatcher.java 2017-09-08 09:15:48.806422798 +0200
@@ -42,7 +42,7 @@
/**
* Creates a matcher that matches when both of the specified matchers match the examined object.
- *
+ *
* For example:
* assertThat("fab", both(containsString("a")).and(containsString("b")))
*/
@@ -63,7 +63,7 @@
/**
* Creates a matcher that matches when either of the specified matchers match the examined object.
- *
+ *
* For example:
* assertThat("fan", either(containsString("a")).and(containsString("b")))
*/
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java 2012-06-10 16:53:10.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java 2017-09-08 09:15:48.810422798 +0200
@@ -56,7 +56,7 @@
/**
* Wraps an existing matcher, overriding its description with that specified. All other functions are
* delegated to the decorated matcher, including its mismatch description.
- *
+ *
* For example:
* describedAs("a big decimal equal to %0", equalTo(myBigDecimal), myBigDecimal.toPlainString())
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/Every.java 2012-05-20 11:19:43.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/Every.java 2017-09-08 09:15:48.806422798 +0200
@@ -33,7 +33,7 @@
* Creates a matcher for {@link Iterable}s that only matches when a single pass over the
* examined {@link Iterable} yields items that are all matched by the specified
* itemMatcher.
- *
+ *
* For example:
* assertThat(Arrays.asList("bar", "baz"), everyItem(startsWith("ba")))
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsCollectionContaining.java 2012-05-20 11:54:27.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsCollectionContaining.java 2017-09-08 09:15:48.806422798 +0200
@@ -47,7 +47,7 @@
* examined {@link Iterable} yields at least one item that is matched by the specified
* itemMatcher. Whilst matching, the traversal of the examined {@link Iterable}
* will stop as soon as a matching item is found.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), hasItem(startsWith("ba")))
*
@@ -64,7 +64,7 @@
* examined {@link Iterable} yields at least one item that is equal to the specified
* item. Whilst matching, the traversal of the examined {@link Iterable}
* will stop as soon as a matching item is found.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), hasItem("bar"))
*
@@ -82,7 +82,7 @@
* examined {@link Iterable} yield at least one item that is matched by the corresponding
* matcher from the specified itemMatchers. Whilst matching, each traversal of
* the examined {@link Iterable} will stop as soon as a matching item is found.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar", "baz"), hasItems(endsWith("z"), endsWith("o")))
*
@@ -106,7 +106,7 @@
* examined {@link Iterable} yield at least one item that is equal to the corresponding
* item from the specified items. Whilst matching, each traversal of the
* examined {@link Iterable} will stop as soon as a matching item is found.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar", "baz"), hasItems("baz", "foo"))
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java 2012-05-20 12:27:35.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java 2017-09-08 09:15:48.806422798 +0200
@@ -79,7 +79,7 @@
* it will match if both the operand and the examined object are arrays of the same length and
* contain items that are equal to each other (according to the above rules) in the same
* indexes.
- *
+ *
* For example:
*
* assertThat("foo", equalTo("foo"));
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java 2012-05-20 12:41:25.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java 2017-09-08 09:15:48.806422798 +0200
@@ -65,7 +65,7 @@
* the examined object.
*
* The created matcher assumes no relationship between specified type and the examined object.
- *
+ *
* For example:
* assertThat(new Canoe(), instanceOf(Paddlable.class));
*
@@ -84,7 +84,7 @@
* The created matcher forces a relationship between specified type and the examined object, and should be
* used when it is necessary to make generics conform, for example in the JMock clause
* with(any(Thing.class))
- *
+ *
* For example:
* assertThat(new Canoe(), instanceOf(Canoe.class));
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/Is.java 2012-05-20 11:35:36.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/Is.java 2017-09-08 09:20:42.623568709 +0200
@@ -40,7 +40,7 @@
/**
* Decorates another Matcher, retaining its behaviour, but allowing tests
* to be slightly more expressive.
- *
+ *
* For example:
* assertThat(cheese, is(equalTo(smelly)))
* instead of:
@@ -54,7 +54,7 @@
/**
* A shortcut to the frequently used is(equalTo(x)).
- *
+ *
* For example:
* assertThat(cheese, is(smelly))
* instead of:
@@ -68,13 +68,13 @@
/**
* A shortcut to the frequently used is(instanceOf(SomeClass.class)).
- *
+ *
* For example:
* assertThat(cheese, is(Cheddar.class))
* instead of:
* assertThat(cheese, is(instanceOf(Cheddar.class)))
*
- * @deprecated use isA(Class type) instead.
+ * @deprecated use isA(Class<T> type) instead.
*/
@Factory
@Deprecated
@@ -85,7 +85,7 @@
/**
* A shortcut to the frequently used is(instanceOf(SomeClass.class)).
- *
+ *
* For example:
* assertThat(cheese, isA(Cheddar.class))
* instead of:
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java 2012-05-20 12:49:02.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java 2017-09-08 09:15:48.806422798 +0200
@@ -34,7 +34,7 @@
/**
* Creates a matcher that wraps an existing matcher, but inverts the logic by which
* it will match.
- *
+ *
* For example:
* assertThat(cheese, is(not(equalTo(smelly))))
*
@@ -48,7 +48,7 @@
/**
* A shortcut to the frequently used not(equalTo(x)).
- *
+ *
* For example:
* assertThat(cheese, is(not(smelly)))
* instead of:
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java 2012-05-20 12:56:27.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java 2017-09-08 09:15:48.806422798 +0200
@@ -24,7 +24,7 @@
/**
* Creates a matcher that matches if examined object is null.
- *
+ *
* For example:
* assertThat(cheese, is(nullValue())
*
@@ -36,7 +36,7 @@
/**
* A shortcut to the frequently used not(nullValue()).
- *
+ *
* For example:
* assertThat(cheese, is(notNullValue()))
* instead of:
@@ -51,7 +51,7 @@
/**
* Creates a matcher that matches if examined object is null. Accepts a
* single dummy argument to facilitate type inference.
- *
+ *
* For example:
* assertThat(cheese, is(nullValue(Cheese.class))
*
@@ -66,7 +66,7 @@
/**
* A shortcut to the frequently used not(nullValue(X.class)). Accepts a
* single dummy argument to facilitate type inference..
- *
+ *
* For example:
* assertThat(cheese, is(notNullValue(X.class)))
* instead of:
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringContains.java 2012-05-20 13:02:47.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringContains.java 2017-09-08 09:15:48.806422798 +0200
@@ -26,7 +26,7 @@
/**
* Creates a matcher that matches if the examined {@link String} contains the specified
* {@link String} anywhere.
- *
+ *
* For example:
* assertThat("myStringOfNote", containsString("ring"))
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringEndsWith.java 2012-05-20 13:02:23.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringEndsWith.java 2017-09-08 09:15:48.806422798 +0200
@@ -26,7 +26,7 @@
/**
* Creates a matcher that matches if the examined {@link String} ends with the specified
* {@link String}.
- *
+ *
* For example:
* assertThat("myStringOfNote", endsWith("Note"))
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringStartsWith.java 2012-05-20 13:02:14.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/core/StringStartsWith.java 2017-09-08 09:15:48.806422798 +0200
@@ -26,7 +26,7 @@
/**
* Creates a matcher that matches if the examined {@link String} starts with the specified
* {@link String}.
- *
+ *
* For example:
* assertThat("myStringOfNote", startsWith("my"))
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java 2012-05-10 21:16:11.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java 2017-09-08 09:18:12.562425252 +0200
@@ -6,7 +6,7 @@
*
* Matcher<String> aNonEmptyString = new CustomMatcher<String>("a non empty string") {
* public boolean matches(Object object) {
- * return ((object instanceof String) && !((String) object).isEmpty();
+ * return ((object instanceof String) && !((String) object).isEmpty();
* }
* };
*
--- hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/Matcher.java 2012-05-19 17:09:09.000000000 +0200
+++ hamcrest-1.3/hamcrest-core/src/main/java/org/hamcrest/Matcher.java 2017-09-08 09:15:48.810422798 +0200
@@ -5,15 +5,15 @@
/**
* A matcher over acceptable values.
* A matcher is able to describe itself to give feedback when it fails.
- *
+ *
* Matcher implementations should NOT directly implement this interface.
* Instead, extend the {@link BaseMatcher} abstract class,
* which will ensure that the Matcher API can grow to support
* new features and remain compatible with all Matcher implementations.
- *
+ *
* For easy access to common Matcher implementations, use the static factory
* methods in {@link CoreMatchers}.
- *
+ *
* N.B. Well designed matchers should be immutable.
*
* @see CoreMatchers
@@ -23,7 +23,7 @@
/**
* Evaluates the matcher for argument item.
- *
+ *
* This method matches against Object, instead of the generic type T. This is
* because the caller of the Matcher does not know at runtime what the type is
* (because of type erasure with Java generics). It is down to the implementations
--- hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/FactoryMethod.java 2012-06-10 16:42:53.000000000 +0200
+++ hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/FactoryMethod.java 2017-09-08 09:10:08.403506109 +0200
@@ -6,7 +6,7 @@
/**
* Represents a Matcher Factory method.
- *
+ *
* This class uses Strings to represent things instead of java.lang.reflect equivalents,
* allowing methods to be defined from sources other than reflection of classes in the
* classpath.
@@ -72,7 +72,7 @@
/**
* List of Parameters passed to factory method.
- * ie. 'public Matcher<...&ht;> blah(THIS, AND, THAT)'
+ * ie. 'public Matcher<...> blah(THIS, AND, THAT)'
*/
public List getParameters() {
return unmodifiableList(parameters);
--- hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/FactoryWriter.java 2012-05-10 21:16:11.000000000 +0200
+++ hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/FactoryWriter.java 2017-09-08 09:11:58.739507993 +0200
@@ -8,11 +8,11 @@
* Writes syntactic sugar code for factories.
* Implementations of this could include vanilla factory methods for
* Hamcrest matchers, wrapped factories for other libraries or factories
- * in other languages (jython, jruby, groovy, etc).
+ * in other languages (jython, jruby, groovy, etc).
* Usage:
*
* writer.writeHeader(...);
- *
+ *
* writer.writeMethod(...);
* writer.writeMethod(...);
* writer.writeMethod(...);
--- hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java 2012-06-17 11:52:43.000000000 +0200
+++ hamcrest-1.3/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java 2017-09-08 09:15:48.806422798 +0200
@@ -17,7 +17,7 @@
* ...
* }
*
- * All methods matching signature '@Factory public static Matcher blah(blah)' will be
+ * All methods matching signature '@Factory public static Matcher<blah> blah(blah)' will be
* treated as factory methods. To change this behavior, override {@link #isFactoryMethod(Method)}.
*
Caveat: Reflection is hassle-free, but unfortunately cannot expose method parameter names or JavaDoc
* comments, making the sugar slightly more obscure.
@@ -77,12 +77,12 @@
/**
* Determine whether a particular method is classified as a matcher factory method.
- *
+ *
* The rules for determining this are:
* 1. The method must be public static.
* 2. It must have a return type of org.hamcrest.Matcher (or something that extends this).
* 3. It must be marked with the org.hamcrest.Factory annotation.
- *
+ *
* To use another set of rules, override this method.
*/
protected boolean isFactoryMethod(Method javaMethod) {
@@ -158,7 +158,7 @@
/*
* Get String representation of Type (e.g. java.lang.String or Map<Stuff,? extends Cheese>).
- *
+ *
* Annoyingly this method wouldn't be needed if java.lang.reflect.Type.toString() behaved consistently
* across implementations. Rock on Liskov.
*/
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java 2012-05-20 14:46:40.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java 2017-09-08 09:15:48.802422798 +0200
@@ -46,7 +46,7 @@
/**
* Creates a matcher that matches when the examined object has a JavaBean property
* with the specified name.
- *
+ *
* For example:
* assertThat(myBean, hasProperty("foo"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java 2012-05-20 14:44:00.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java 2017-09-08 09:15:48.802422798 +0200
@@ -20,7 +20,7 @@
* mock object meets the provided matcher. This is useful for when objects
* are created within code under test and passed to a mock object, and you wish
* to assert that the created object has certain properties.
- *
+ *
* Example Usage
* Consider the situation where we have a class representing a person, which
* follows the basic JavaBean convention of having get() and possibly set()
@@ -55,11 +55,11 @@
* does not exist, is not readable, or a reflection related exception is thrown
* when trying to invoke it then this is treated as an evaluation failure and
* the matches method will return false.
- *
+ *
* This matcher class will also work with JavaBean objects that have explicit
* bean descriptions via an associated BeanInfo description class. See the
* JavaBeans specification for more information:
- *
+ *
* http://java.sun.com/products/javabeans/docs/index.html
*
* @author Iain McGinniss
@@ -136,7 +136,7 @@
/**
* Creates a matcher that matches when the examined object has a JavaBean property
* with the specified name whose value satisfies the specified matcher.
- *
+ *
* For example:
* assertThat(myBean, hasProperty("foo", equalTo("bar"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/PropertyUtil.java 2012-05-10 21:16:11.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/PropertyUtil.java 2017-09-08 09:15:48.802422798 +0200
@@ -8,7 +8,7 @@
/**
* Utility class for accessing properties on JavaBean objects.
- *
+ *
* See http://java.sun.com/products/javabeans/docs/index.html for
* more information on JavaBeans.
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java 2012-05-20 14:46:38.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java 2017-09-08 09:15:48.802422798 +0200
@@ -124,7 +124,7 @@
* Creates a matcher that matches when the examined object has values for all of
* its JavaBean properties that are equal to the corresponding values of the
* specified bean.
- *
+ *
* For example:
* assertThat(myBean, samePropertyValuesAs(myExpectedBean))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java 2012-05-20 16:39:49.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java 2017-09-08 09:15:48.806422798 +0200
@@ -42,7 +42,7 @@
* examined array satisfies one matcher anywhere in the specified matchers.
* For a positive match, the examined array must be of the same length as the number of
* specified matchers.
- *
+ *
* N.B. each of the specified matchers will only be used once during a given examination, so be
* careful when specifying matchers that may be satisfied by more than one entry in an examined
* array.
@@ -63,7 +63,7 @@
* examined array satisfies one matcher anywhere in the specified collection of matchers.
* For a positive match, the examined array must be of the same length as the specified collection
* of matchers.
- *
+ *
* N.B. each matcher in the specified collection will only be used once during a given
* examination, so be careful when specifying matchers that may be satisfied by more than
* one entry in an examined array.
@@ -84,7 +84,7 @@
* examined array is logically equal to one item anywhere in the specified items.
* For a positive match, the examined array must be of the same length as the number of
* specified items.
- *
+ *
* N.B. each of the specified items will only be used once during a given examination, so be
* careful when specifying items that may be equal to more than one entry in an examined
* array.
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java 2012-05-20 16:46:29.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java 2017-09-08 09:15:48.802422798 +0200
@@ -40,7 +40,7 @@
* Creates a matcher for arrays that matcheswhen each item in the examined array is
* logically equal to the corresponding item in the specified items. For a positive match,
* the examined array must be of the same length as the number of specified items.
- *
+ *
* For example:
* assertThat(new String[]{"foo", "bar"}, contains("foo", "bar"))
*
@@ -60,7 +60,7 @@
* Creates a matcher for arrays that matches when each item in the examined array satisfies the
* corresponding matcher in the specified matchers. For a positive match, the examined array
* must be of the same length as the number of specified matchers.
- *
+ *
* For example:
* assertThat(new String[]{"foo", "bar"}, contains(equalTo("foo"), equalTo("bar")))
*
@@ -76,7 +76,7 @@
* Creates a matcher for arrays that matches when each item in the examined array satisfies the
* corresponding matcher in the specified list of matchers. For a positive match, the examined array
* must be of the same length as the specified list of matchers.
- *
+ *
* For example:
* assertThat(new String[]{"foo", "bar"}, contains(Arrays.asList(equalTo("foo"), equalTo("bar"))))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java 2012-05-20 15:04:17.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java 2017-09-08 09:15:48.806422798 +0200
@@ -44,7 +44,7 @@
* Creates a matcher for arrays that matches when the examined array contains at least one item
* that is matched by the specified elementMatcher. Whilst matching, the traversal
* of the examined array will stop as soon as a matching element is found.
- *
+ *
* For example:
* assertThat(new String[] {"foo", "bar"}, hasItemInArray(startsWith("ba")))
*
@@ -58,7 +58,7 @@
/**
* A shortcut to the frequently used hasItemInArray(equalTo(x)).
- *
+ *
* For example:
* assertThat(hasItemInArray(x))
* instead of:
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java 2012-05-20 14:54:52.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java 2017-09-08 09:15:48.802422798 +0200
@@ -83,7 +83,7 @@
* Creates a matcher that matches arrays whose elements are satisfied by the specified matchers. Matches
* positively only if the number of matchers specified is equal to the length of the examined array and
* each matcher[i] is satisfied by array[i].
- *
+ *
* For example:
* assertThat(new Integer[]{1,2,3}, is(array(equalTo(1), equalTo(2), equalTo(3))))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java 2012-05-20 16:19:19.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayWithSize.java 2017-09-08 09:15:48.802422798 +0200
@@ -23,7 +23,7 @@
/**
* Creates a matcher for arrays that matches when the length of the array
* satisfies the specified matcher.
- *
+ *
* For example:
* assertThat(new String[]{"foo", "bar"}, arrayWithSize(equalTo(2)))
*
@@ -38,7 +38,7 @@
/**
* Creates a matcher for arrays that matches when the length of the array
* equals the specified size.
- *
+ *
* For example:
* assertThat(new String[]{"foo", "bar"}, arrayWithSize(2))
*
@@ -53,7 +53,7 @@
/**
* Creates a matcher for arrays that matches when the length of the array
* is zero.
- *
+ *
* For example:
* assertThat(new String[0], emptyArray())
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java 2012-06-10 17:02:21.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java 2017-09-08 09:15:48.802422798 +0200
@@ -24,7 +24,7 @@
/**
* Creates a matcher for {@link java.util.Collection}s that matches when the size() method returns
* a value that satisfies the specified matcher.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), hasSize(equalTo(2)))
*
@@ -39,7 +39,7 @@
/**
* Creates a matcher for {@link java.util.Collection}s that matches when the size() method returns
* a value equal to the specified size.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), hasSize(2))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java 2012-06-18 23:49:04.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java 2017-09-08 09:15:48.802422798 +0200
@@ -30,7 +30,7 @@
/**
* Creates a matcher for {@link java.util.Collection}s matching examined collections whose isEmpty
* method returns true.
- *
+ *
* For example:
* assertThat(new ArrayList<String>(), is(empty()))
*
@@ -43,7 +43,7 @@
/**
* Creates a matcher for {@link java.util.Collection}s matching examined collections whose isEmpty
* method returns true.
- *
+ *
* For example:
* assertThat(new ArrayList<String>(), is(emptyCollectionOf(String.class)))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyIterable.java 2012-06-18 23:49:30.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyIterable.java 2017-09-08 09:15:48.806422798 +0200
@@ -26,7 +26,7 @@
/**
* Creates a matcher for {@link Iterable}s matching examined iterables that yield no items.
- *
+ *
* For example:
* assertThat(new ArrayList<String>(), is(emptyIterable()))
*
@@ -38,7 +38,7 @@
/**
* Creates a matcher for {@link Iterable}s matching examined iterables that yield no items.
- *
+ *
* For example:
* assertThat(new ArrayList<String>(), is(emptyIterableOf(String.class)))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java 2012-05-20 17:43:01.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java 2017-09-08 09:15:48.802422798 +0200
@@ -33,7 +33,7 @@
/**
* Creates a matcher that matches when the examined object is found within the
* specified collection.
- *
+ *
* For example:
* assertThat("foo", isIn(Arrays.asList("bar", "foo")))
*
@@ -49,7 +49,7 @@
/**
* Creates a matcher that matches when the examined object is found within the
* specified array.
- *
+ *
* For example:
* assertThat("foo", isIn(new String[]{"bar", "foo"}))
*
@@ -65,7 +65,7 @@
/**
* Creates a matcher that matches when the examined object is equal to one of the
* specified elements.
- *
+ *
* For example:
* assertThat("foo", isIn("bar", "foo"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java 2012-05-20 17:43:31.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java 2017-09-08 09:27:24.901132454 +0200
@@ -87,11 +87,11 @@
* Creates a matcher for {@link Iterable}s that matches when a single pass over the
* examined {@link Iterable} yields a single item that satisfies the specified matcher.
* For a positive match, the examined iterable must only yield one item.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo"), containsInAnyOrder(equalTo("foo")))
*
- * @deprecated use contains(Matcher itemMatcher) instead
+ * @deprecated use contains(Matcher<? super E> itemMatcher) instead
*
* @param itemMatcher
* the matcher that must be satisfied by the single item provided by an
@@ -109,11 +109,11 @@
* the examined {@link Iterable} yields a series of items, each satisfying one matcher anywhere
* in the specified matchers. For a positive match, the examined iterable must be of the same
* length as the number of specified matchers.
- *
+ *
* N.B. each of the specified matchers will only be used once during a given examination, so be
* careful when specifying matchers that may be satisfied by more than one entry in an examined
* iterable.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder(equalTo("bar"), equalTo("foo")))
*
@@ -130,11 +130,11 @@
* the examined {@link Iterable} yields a series of items, each logically equal to one item
* anywhere in the specified items. For a positive match, the examined iterable
* must be of the same length as the number of specified items.
- *
+ *
* N.B. each of the specified items will only be used once during a given examination, so be
* careful when specifying items that may be equal to more than one entry in an examined
* iterable.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder("bar", "foo"))
*
@@ -156,11 +156,11 @@
* the examined {@link Iterable} yields a series of items, each satisfying one matcher anywhere
* in the specified collection of matchers. For a positive match, the examined iterable
* must be of the same length as the specified collection of matchers.
- *
+ *
* N.B. each matcher in the specified collection will only be used once during a given
* examination, so be careful when specifying matchers that may be satisfied by more than
* one entry in an examined iterable.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), containsInAnyOrder(Arrays.asList(equalTo("bar"), equalTo("foo"))))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java 2012-05-20 15:25:17.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java 2017-09-08 09:15:48.802422798 +0200
@@ -89,7 +89,7 @@
* examined {@link Iterable} yields a series of items, each logically equal to the
* corresponding item in the specified items. For a positive match, the examined iterable
* must be of the same length as the number of specified items.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), contains("foo", "bar"))
*
@@ -110,7 +110,7 @@
* Creates a matcher for {@link Iterable}s that matches when a single pass over the
* examined {@link Iterable} yields a single item that satisfies the specified matcher.
* For a positive match, the examined iterable must only yield one item.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo"), contains(equalTo("foo")))
*
@@ -129,7 +129,7 @@
* examined {@link Iterable} yields a series of items, each satisfying the corresponding
* matcher in the specified matchers. For a positive match, the examined iterable
* must be of the same length as the number of specified matchers.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), contains(equalTo("foo"), equalTo("bar")))
*
@@ -146,7 +146,7 @@
* examined {@link Iterable} yields a series of items, each satisfying the corresponding
* matcher in the specified list of matchers. For a positive match, the examined iterable
* must be of the same length as the specified list of matchers.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), contains(Arrays.asList(equalTo("foo"), equalTo("bar"))))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java 2012-05-20 16:14:03.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableWithSize.java 2017-09-08 09:15:48.802422798 +0200
@@ -28,7 +28,7 @@
* Creates a matcher for {@link Iterable}s that matches when a single pass over the
* examined {@link Iterable} yields an item count that satisfies the specified
* matcher.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), iterableWithSize(equalTo(2)))
*
@@ -44,7 +44,7 @@
* Creates a matcher for {@link Iterable}s that matches when a single pass over the
* examined {@link Iterable} yields an item count that is equal to the specified
* size argument.
- *
+ *
* For example:
* assertThat(Arrays.asList("foo", "bar"), iterableWithSize(2))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java 2012-06-10 17:04:41.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java 2017-09-08 09:15:48.802422798 +0200
@@ -48,7 +48,7 @@
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one entry whose key satisfies the specified keyMatcher and whose
* value satisfies the specified valueMatcher.
- *
+ *
* For example:
* assertThat(myMap, hasEntry(equalTo("bar"), equalTo("foo")))
*
@@ -66,7 +66,7 @@
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one entry whose key equals the specified key and whose value equals the
* specified value.
- *
+ *
* For example:
* assertThat(myMap, hasEntry("bar", "foo"))
*
@@ -83,7 +83,7 @@
/**
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one key that satisfies the specified matcher.
- *
+ *
* For example:
* assertThat(myMap, hasKey(equalTo("bar")))
*
@@ -98,7 +98,7 @@
/**
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one key that is equal to the specified key.
- *
+ *
* For example:
* assertThat(myMap, hasKey("bar"))
*
@@ -113,7 +113,7 @@
/**
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one value that satisfies the specified valueMatcher.
- *
+ *
* For example:
* assertThat(myMap, hasValue(equalTo("foo")))
*
@@ -128,7 +128,7 @@
/**
* Creates a matcher for {@link java.util.Map}s matching when the examined {@link java.util.Map} contains
* at least one value that is equal to the specified value.
- *
+ *
* For example:
* assertThat(myMap, hasValue("foo"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java 2012-06-10 17:06:51.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/BigDecimalCloseTo.java 2017-09-08 09:15:48.806422798 +0200
@@ -46,7 +46,7 @@
* Creates a matcher of {@link java.math.BigDecimal}s that matches when an examined BigDecimal is equal
* to the specified operand, within a range of +/- error. The comparison for equality
* is done by BigDecimals {@link java.math.BigDecimal#compareTo(java.math.BigDecimal)} method.
- *
+ *
* For example:
* assertThat(new BigDecimal("1.03"), is(closeTo(new BigDecimal("1.0"), new BigDecimal("0.03"))))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java 2012-05-20 17:44:07.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java 2017-09-08 09:15:48.806422798 +0200
@@ -48,7 +48,7 @@
/**
* Creates a matcher of {@link Double}s that matches when an examined double is equal
* to the specified operand, within a range of +/- error.
- *
+ *
* For example:
* assertThat(1.03, is(closeTo(1.0, 0.03)))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java 2012-05-20 16:59:41.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java 2017-09-08 09:15:48.806422798 +0200
@@ -58,7 +58,7 @@
* Creates a matcher of {@link Comparable} object that matches when the examined object is
* equal to the specified value, as reported by the compareTo method of the
* examined object.
- *
+ *
* For example:
* assertThat(1, comparesEqualTo(1))
*
@@ -75,7 +75,7 @@
* Creates a matcher of {@link Comparable} object that matches when the examined object is
* greater than the specified value, as reported by the compareTo method of the
* examined object.
- *
+ *
* For example:
* assertThat(2, greaterThan(1))
*
@@ -93,7 +93,7 @@
* Creates a matcher of {@link Comparable} object that matches when the examined object is
* greater than or equal to the specified value, as reported by the compareTo method
* of the examined object.
- *
+ *
* For example:
* assertThat(1, greaterThanOrEqualTo(1))
*
@@ -111,7 +111,7 @@
* Creates a matcher of {@link Comparable} object that matches when the examined object is
* less than the specified value, as reported by the compareTo method of the
* examined object.
- *
+ *
* For example:
* assertThat(1, lessThan(2))
*
@@ -129,7 +129,7 @@
* Creates a matcher of {@link Comparable} object that matches when the examined object is
* less than or equal to the specified value, as reported by the compareTo method
* of the examined object.
- *
+ *
* For example:
* assertThat(1, lessThanOrEqualTo(1))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java 2012-05-20 17:04:01.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java 2017-09-08 09:15:48.806422798 +0200
@@ -19,7 +19,7 @@
/**
* Creates a matcher that matches any examined object whose toString method
* returns a value that satisfies the specified matcher.
- *
+ *
* For example:
* assertThat(true, hasToString(equalTo("TRUE")))
*
@@ -34,7 +34,7 @@
/**
* Creates a matcher that matches any examined object whose toString method
* returns a value equalTo the specified string.
- *
+ *
* For example:
* assertThat(true, hasToString("TRUE"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java 2012-05-20 17:44:35.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java 2017-09-08 09:15:48.806422798 +0200
@@ -30,7 +30,7 @@
/**
* Creates a matcher of {@link Class} that matches when the specified baseType is
* assignable from the examined class.
- *
+ *
* For example:
* assertThat(Integer.class, typeCompatibleWith(Number.class))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java 2012-06-10 17:03:11.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java 2017-09-08 09:24:20.531572428 +0200
@@ -50,6 +50,7 @@
}
/**
+ *
* Creates a matcher of {@link java.util.EventObject} that matches any object
* derived from eventClass announced by source.
*
@@ -67,6 +68,7 @@
}
/**
+ *
* Creates a matcher of {@link java.util.EventObject} that matches any EventObject
* announced by source.
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java 2012-05-20 17:15:48.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java 2017-09-08 09:15:48.806422798 +0200
@@ -29,7 +29,7 @@
/**
* Creates a matcher of {@link String} that matches when the examined string has zero length.
- *
+ *
* For example:
* assertThat("", isEmptyString())
*
@@ -42,7 +42,7 @@
/**
* Creates a matcher of {@link String} that matches when the examined string is null, or
* has zero length.
- *
+ *
* For example:
* assertThat(((String)null), isEmptyString())
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java 2012-05-20 17:18:01.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java 2017-09-08 09:15:48.806422798 +0200
@@ -44,7 +44,7 @@
/**
* Creates a matcher of {@link String} that matches when the examined string is equal to
* the specified expectedString, ignoring case.
- *
+ *
* For example:
* assertThat("Foo", equalToIgnoringCase("FOO"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java 2012-05-20 17:25:03.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java 2017-09-08 09:15:48.806422798 +0200
@@ -69,7 +69,7 @@
* all leading and trailing whitespace of both the expectedString and the examined string are ignored
* any remaining whitespace, appearing within either string, is collapsed to a single space before comparison
*
- *
+ *
* For example:
* assertThat(" my\tfoo bar ", equalToIgnoringWhiteSpace(" my foo bar"))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java 2012-05-20 17:29:11.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java 2017-09-08 09:15:48.806422798 +0200
@@ -41,7 +41,7 @@
/**
* Creates a matcher of {@link String} that matches when the examined string contains all of
* the specified substrings, regardless of the order of their appearance.
- *
+ *
* For example:
* assertThat("myfoobarbaz", stringContainsInOrder(Arrays.asList("bar", "foo")))
*
--- hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java 2012-06-10 17:06:08.000000000 +0200
+++ hamcrest-1.3/hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java 2017-09-08 09:15:48.806422798 +0200
@@ -106,7 +106,7 @@
/**
* Creates a matcher of {@link org.w3c.dom.Node}s that matches when the examined node has a value at the
* specified xPath that satisfies the specified valueMatcher.
- *
+ *
* For example:
* assertThat(xml, hasXPath("/root/something[2]/cheese", equalTo("Cheddar")))
*
@@ -124,7 +124,7 @@
* Creates a matcher of {@link org.w3c.dom.Node}s that matches when the examined node has a value at the
* specified xPath, within the specified namespaceContext, that satisfies
* the specified valueMatcher.
- *
+ *
* For example:
* assertThat(xml, hasXPath("/root/something[2]/cheese", myNs, equalTo("Cheddar")))
*
@@ -143,7 +143,7 @@
/**
* Creates a matcher of {@link org.w3c.dom.Node}s that matches when the examined node contains a node
* at the specified xPath, with any content.
- *
+ *
* For example:
* assertThat(xml, hasXPath("/root/something[2]/cheese"))
*
@@ -158,7 +158,7 @@
/**
* Creates a matcher of {@link org.w3c.dom.Node}s that matches when the examined node contains a node
* at the specified xPath within the specified namespace context, with any content.
- *
+ *
* For example:
* assertThat(xml, hasXPath("/root/something[2]/cheese", myNs))
*