iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mkae minor amendments to make tests pass

Browse Source
This commit is contained in:
Alex Theedom 2016-07-03 12:35:08 +01:00
parent 8f929a7ba5
commit b0565a2882
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherTest.java
View File

@ -1,13 +1,12 @@
package org.baeldung.hamcrest; package org.baeldung.hamcrest;
import org.junit.Test;
import java.util.*;
import static org.baeldung.hamcrest.IsPositiveInteger.isAPositiveInteger; import static org.baeldung.hamcrest.IsPositiveInteger.isAPositiveInteger;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.beans.HasProperty.hasProperty; import static org.hamcrest.beans.HasProperty.hasProperty;
import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
import static org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs; import static org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs;
@ -19,37 +18,29 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.collection.IsEmptyCollection.empty;
import static org.hamcrest.collection.IsIn.isIn; import static org.hamcrest.collection.IsIn.isIn;
import static org.hamcrest.collection.IsIn.isOneOf; import static org.hamcrest.collection.IsIn.isOneOf;
import static org.hamcrest.collection.IsMapContaining.hasKey;
import static org.hamcrest.collection.IsMapContaining.hasEntry;
import static org.hamcrest.collection.IsMapContaining.hasValue;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase; import static org.hamcrest.collection.IsMapContaining.hasEntry;
import static org.hamcrest.text.IsEmptyString.isEmptyOrNullString; import static org.hamcrest.collection.IsMapContaining.hasKey;
import static org.hamcrest.text.IsEmptyString.isEmptyString; import static org.hamcrest.collection.IsMapContaining.hasValue;
import static org.hamcrest.text.IsEqualIgnoringWhiteSpace.equalToIgnoringWhiteSpace;
import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder;
import static org.hamcrest.object.HasToString.hasToString;
import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.AllOf.allOf;
import static org.hamcrest.core.AnyOf.anyOf; import static org.hamcrest.core.AnyOf.anyOf;
import static org.hamcrest.core.Every.everyItem; import static org.hamcrest.core.Every.everyItem;
import static org.hamcrest.core.Is.is;//class import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.IsNot.not;//matcher import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.core.IsNull.notNullValue;//without arg import static org.hamcrest.core.IsNull.notNullValue;
import static org.hamcrest.core.IsSame.sameInstance; import static org.hamcrest.core.IsSame.sameInstance;
import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.core.StringContains.containsString;
import static org.hamcrest.core.StringEndsWith.endsWith; import static org.hamcrest.core.StringEndsWith.endsWith;
import static org.hamcrest.core.StringStartsWith.startsWith; import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.hamcrest.object.HasToString.hasToString;
import java.util.ArrayList; import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
import java.util.Arrays; import static org.hamcrest.text.IsEmptyString.isEmptyOrNullString;
import java.util.HashMap; import static org.hamcrest.text.IsEmptyString.isEmptyString;
import java.util.List; import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase;
import java.util.Map; import static org.hamcrest.text.IsEqualIgnoringWhiteSpace.equalToIgnoringWhiteSpace;
import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder;
import org.junit.Test;
public class HamcrestMatcherTest { public class HamcrestMatcherTest {
@Test @Test
@ -150,7 +141,7 @@ public class HamcrestMatcherTest {
public void givenValueAndArray_whenValueFoundInArray_thenCorrect() { public void givenValueAndArray_whenValueFoundInArray_thenCorrect() {
String[] array = new String[] { "collections", "beans", "text", String[] array = new String[] { "collections", "beans", "text",
"number" }; "number" };
assertThat("bean", isIn(array)); assertThat("beans", isIn(array));
} }
@ -299,7 +290,7 @@ public class HamcrestMatcherTest {
public void givenString_whenMeetsAllOfGivenConditions_thenCorrect() { public void givenString_whenMeetsAllOfGivenConditions_thenCorrect() {
String str = "calligraphy"; String str = "calligraphy";
String start = "call"; String start = "call";
String end = "foo"; String end = "phy";
assertThat(str, allOf(startsWith(start), endsWith(end))); assertThat(str, allOf(startsWith(start), endsWith(end)));
} }