Skip to content

Commit 75092c7

Browse files
scarytomscarytom
committed
whitespace rationalisation -- mainly replacing tabs with spaces.
1 parent 5881969 commit 75092c7

File tree

15 files changed

+121
-123
lines changed

15 files changed

+121
-123
lines changed

‎build.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
build/hamcrest-core-${version}.jar;
105105
build/hamcrest-library-${version}.jar"/>
106106
</target>
107-
107+
108108
<target name="unit-test"
109109
depends="core, library, integration, generator"
110110
description="Build and run unit tests.">
@@ -195,30 +195,30 @@
195195
</tar>
196196
</target>
197197

198-
<target name="javadoc" depends="library">
199-
<mkdir dir="build/javadoc"/>
200-
<javadoc destdir="build/javadoc" source="1.6" failonerror="yes"
201-
overview="overview.html">
202-
198+
<target name="javadoc" depends="library">
199+
<mkdir dir="build/javadoc"/>
200+
<javadoc destdir="build/javadoc" source="1.6" failonerror="yes"
201+
overview="overview.html">
202+
203203
<classpath>
204204
<fileset dir="lib/integration">
205205
<include name="*.jar"/>
206206
</fileset>
207207
</classpath>
208208

209-
<packageset dir="hamcrest-core/src/main/java"/>
210-
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
211-
<packageset dir="hamcrest-integration/src/main/java"/>
212-
<packageset dir="build/generated-code"/>
213-
214-
<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
215-
<group title="Matcher Library" packages="org.hamcrest.*"/>
216-
<group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
217-
218-
<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
219-
<link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
220-
</javadoc>
221-
</target>
209+
<packageset dir="hamcrest-core/src/main/java"/>
210+
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
211+
<packageset dir="hamcrest-integration/src/main/java"/>
212+
<packageset dir="build/generated-code"/>
213+
214+
<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
215+
<group title="Matcher Library" packages="org.hamcrest.*"/>
216+
<group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
217+
218+
<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
219+
<link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
220+
</javadoc>
221+
</target>
222222

223223
<macrodef name="java-to-jar"
224224
description="Compile Java source and build a Jar">

‎hamcrest-core/src/main/java/org/hamcrest/BaseMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public final void _dont_implement_Matcher___instead_extend_BaseMatcher_() {
2020

2121
@Override
2222
public void describeMismatch(Object item, Description description) {
23-
description.appendText("was ").appendValue(item);
23+
description.appendText("was ").appendValue(item);
2424
}
2525

2626
@Override

‎hamcrest-core/src/main/java/org/hamcrest/DiagnosingMatcher.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
*/
88
public abstract class DiagnosingMatcher<T> extends BaseMatcher<T> {
99

10-
@Override
11-
public final boolean matches(Object item) {
12-
return matches(item, Description.NONE);
13-
}
10+
@Override
11+
public final boolean matches(Object item) {
12+
return matches(item, Description.NONE);
13+
}
1414

15-
@Override
16-
public final void describeMismatch(Object item, Description mismatchDescription) {
17-
matches(item, mismatchDescription);
18-
}
15+
@Override
16+
public final void describeMismatch(Object item, Description mismatchDescription) {
17+
matches(item, mismatchDescription);
18+
}
1919

20-
protected abstract boolean matches(Object item, Description mismatchDescription);
20+
protected abstract boolean matches(Object item, Description mismatchDescription);
2121
}

‎hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
*/
1616
public class AllOf<T> extends DiagnosingMatcher<T> {
1717

18-
private final Iterable<Matcher<? super T>> matchers;
18+
private final Iterable<Matcher<? super T>> matchers;
1919

2020
public AllOf(Iterable<Matcher<? super T>> matchers) {
21-
this.matchers = matchers;
21+
this.matchers = matchers;
2222
}
2323

2424
@Override
2525
public boolean matches(Object o, Description mismatch) {
26-
for (Matcher<? super T> matcher : matchers) {
26+
for (Matcher<? super T> matcher : matchers) {
2727
if (!matcher.matches(o)) {
28-
mismatch.appendDescriptionOf(matcher).appendText(" ");
29-
matcher.describeMismatch(o, mismatch);
28+
mismatch.appendDescriptionOf(matcher).appendText(" ");
29+
matcher.describeMismatch(o, mismatch);
3030
return false;
3131
}
3232
}
33-
return true;
33+
return true;
3434
}
3535

3636
@Override
3737
public void describeTo(Description description) {
38-
description.appendList("(", " " + "and" + " ", ")", matchers);
38+
description.appendList("(", " " + "and" + " ", ")", matchers);
3939
}
4040

4141
/**

‎hamcrest-core/src/main/java/org/hamcrest/core/Every.java

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,35 @@
66
import org.hamcrest.TypeSafeDiagnosingMatcher;
77

88
public class Every<T> extends TypeSafeDiagnosingMatcher<Iterable<T>> {
9-
private final Matcher<? super T> matcher;
9+
private final Matcher<? super T> matcher;
1010

11-
public Every(Matcher<? super T> matcher) {
12-
this.matcher= matcher;
13-
}
14-
15-
@Override
16-
public boolean matchesSafely(Iterable<T> collection, Description mismatchDescription) {
17-
for (T t : collection) {
18-
if (!matcher.matches(t)) {
19-
mismatchDescription.appendText("an item ");
20-
matcher.describeMismatch(t, mismatchDescription);
21-
return false;
22-
}
23-
}
24-
return true;
25-
}
11+
public Every(Matcher<? super T> matcher) {
12+
this.matcher= matcher;
13+
}
2614

27-
@Override
28-
public void describeTo(Description description) {
29-
description.appendText("every item is ").appendDescriptionOf(matcher);
30-
}
31-
32-
33-
/**
34-
* @param itemMatcher A matcher to apply to every element in a collection.
35-
* @return Evaluates to TRUE for a collection in which every item matches itemMatcher
36-
*/
37-
@Factory
38-
public static <U> Matcher<Iterable<U>> everyItem(final Matcher<U> itemMatcher) {
39-
return new Every<U>(itemMatcher);
40-
}
15+
@Override
16+
public boolean matchesSafely(Iterable<T> collection, Description mismatchDescription) {
17+
for (T t : collection) {
18+
if (!matcher.matches(t)) {
19+
mismatchDescription.appendText("an item ");
20+
matcher.describeMismatch(t, mismatchDescription);
21+
return false;
22+
}
23+
}
24+
return true;
25+
}
4126

27+
@Override
28+
public void describeTo(Description description) {
29+
description.appendText("every item is ").appendDescriptionOf(matcher);
30+
}
31+
32+
/**
33+
* @param itemMatcher A matcher to apply to every element in a collection.
34+
* @return Evaluates to TRUE for a collection in which every item matches itemMatcher
35+
*/
36+
@Factory
37+
public static <U> Matcher<Iterable<U>> everyItem(final Matcher<U> itemMatcher) {
38+
return new Every<U>(itemMatcher);
39+
}
4240
}

‎hamcrest-core/src/main/java/org/hamcrest/core/Is.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void describeTo(Description description) {
3434

3535
@Override
3636
public void describeMismatch(Object item, Description mismatchDescription) {
37-
matcher.describeMismatch(item, mismatchDescription);
37+
matcher.describeMismatch(item, mismatchDescription);
3838
}
3939

4040
/**

‎hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import org.hamcrest.TypeSafeMatcher;
99

1010
/**
11-
* Matcher that checks that an object has a JavaBean property
12-
* with the specified name. If an error occurs while introspecting
13-
* the object then this is treated as a matcher failure.
11+
* A Matcher that checks that an object has a JavaBean property
12+
* with the specified name. If an error occurs during introspection
13+
* of the object then this is treated as a mismatch.
1414
*
1515
* @author Iain McGinniss
1616
* @author Nat Pryce
@@ -25,17 +25,17 @@ public HasProperty(String propertyName) {
2525
}
2626

2727
@Override
28-
public boolean matchesSafely(T obj) {
28+
public boolean matchesSafely(T obj) {
2929
try {
3030
return PropertyUtil.getPropertyDescriptor(propertyName, obj) != null;
3131
} catch (IllegalArgumentException e) {
3232
return false;
3333
}
3434
}
35-
35+
3636
@Override
3737
public void describeMismatchSafely(T item, Description mismatchDescription) {
38-
mismatchDescription.appendText("no ").appendValue(propertyName).appendText(" in ").appendValue(item);
38+
mismatchDescription.appendText("no ").appendValue(propertyName).appendText(" in ").appendValue(item);
3939
}
4040

4141
@Override

‎hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public HasPropertyWithValue(String propertyName, Matcher<?> valueMatcher) {
7575
}
7676

7777
@Override
78-
public boolean matchesSafely(T bean, Description mismatch) {
78+
public boolean matchesSafely(T bean, Description mismatch) {
7979
return propertyOn(bean, mismatch)
8080
.and(WITH_READ_METHOD)
8181
.and(withPropertyValue(bean))

‎hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
*/
1313
public class IsEmptyCollection<E> extends TypeSafeMatcher<Collection<? extends E>> {
1414

15-
@Override
16-
public boolean matchesSafely(Collection<? extends E> item) {
17-
return item.isEmpty();
18-
}
15+
@Override
16+
public boolean matchesSafely(Collection<? extends E> item) {
17+
return item.isEmpty();
18+
}
19+
20+
@Override
21+
public void describeMismatchSafely(Collection<? extends E> item, Description mismatchDescription) {
22+
mismatchDescription.appendValue(item);
23+
}
1924

20-
@Override
21-
public void describeMismatchSafely(Collection<? extends E> item, Description mismatchDescription) {
22-
mismatchDescription.appendValue(item);
23-
}
24-
2525
@Override
2626
public void describeTo(Description description) {
27-
description.appendText("an empty collection");
28-
}
27+
description.appendText("an empty collection");
28+
}
2929

3030
/**
3131
* Matches an empty collection.
3232
*/
33-
@Factory
34-
public static <E> Matcher<Collection<? extends E>> empty() {
35-
return new IsEmptyCollection<E>();
36-
}
33+
@Factory
34+
public static <E> Matcher<Collection<? extends E>> empty() {
35+
return new IsEmptyCollection<E>();
36+
}
3737
}

‎hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private HasXPath(String xPathExpression, NamespaceContext namespaceContext, Matc
5454
}
5555

5656
@Override
57-
public boolean matchesSafely(Node item, Description mismatch) {
57+
public boolean matchesSafely(Node item, Description mismatch) {
5858
return evaluated(item, mismatch)
5959
.and(NODE_EXISTS)
6060
.matching(valueMatcher);

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/AllOfTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public void testHasAReadableDescription() {
5151
}
5252

5353
public void testMismatchDescriptionDescribesFirstFailingMatch() {
54-
assertMismatchDescription("\"good\" was \"bad\"", allOf(equalTo("bad"), equalTo("good")), "bad");
55-
}
54+
assertMismatchDescription("\"good\" was \"bad\"", allOf(equalTo("bad"), equalTo("good")), "bad");
55+
}
5656
}

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/EveryTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
import static org.junit.Assert.assertEquals;
1313

1414
public class EveryTest {
15-
@Test public void isTrueWhenEveryValueMatches() {
16-
assertThat(asList("AaA", "BaB", "CaC"), Every.everyItem(containsString("a")));
17-
assertThat(asList("AbA", "BbB", "CbC"), not(Every.everyItem(containsString("a"))));
18-
}
19-
20-
@Test public void isAlwaysTrueForEmptyLists() {
21-
assertThat(new ArrayList<String>(), Every.everyItem(containsString("a")));
22-
}
23-
24-
@Test public void describesItself() {
25-
final Every<String> each= new Every<String>(containsString("a"));
26-
assertEquals("every item is a string containing \"a\"", each.toString());
27-
28-
StringDescription description = new StringDescription();
29-
each.matchesSafely(asList("BbB"), description);
30-
assertEquals("an item was \"BbB\"", description.toString());
31-
}
15+
@Test public void isTrueWhenEveryValueMatches() {
16+
assertThat(asList("AaA", "BaB", "CaC"), Every.everyItem(containsString("a")));
17+
assertThat(asList("AbA", "BbB", "CbC"), not(Every.everyItem(containsString("a"))));
18+
}
19+
20+
@Test public void isAlwaysTrueForEmptyLists() {
21+
assertThat(new ArrayList<String>(), Every.everyItem(containsString("a")));
22+
}
23+
24+
@Test public void describesItself() {
25+
final Every<String> each= new Every<String>(containsString("a"));
26+
assertEquals("every item is a string containing \"a\"", each.toString());
27+
28+
StringDescription description = new StringDescription();
29+
each.matchesSafely(asList("BbB"), description);
30+
assertEquals("an item was \"BbB\"", description.toString());
31+
}
3232
}

‎hamcrest-unit-test/src/main/java/org/hamcrest/object/HasToStringTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public class HasToStringTest extends AbstractMatcherTest {
1313
private static final String TO_STRING_RESULT = "toString result";
1414
private static final Object ARG = new Object() {
1515
@Override
16-
public String toString() {
16+
public String toString() {
1717
return TO_STRING_RESULT;
1818
}
1919
};
2020

2121
@Override
22-
protected Matcher<?> createMatcher() {
22+
protected Matcher<?> createMatcher() {
2323
return hasToString(equalTo("irrelevant"));
2424
}
2525

@@ -41,9 +41,9 @@ public void testHasReadableDescription() {
4141
}
4242

4343
public void testMismatchContainsToStringValue() {
44-
String expectedMismatchString = "toString() was \"Cheese\"";
44+
String expectedMismatchString = "toString() was \"Cheese\"";
4545
assertMismatchDescription(expectedMismatchString, hasToString(TO_STRING_RESULT), "Cheese");
46-
}
46+
}
4747

4848
private static String descriptionOf(Matcher<?> matcher) {
4949
return StringDescription.asString(matcher);

0 commit comments

Comments
 (0)