Bumped hamcrest to 2.2 (#590)

* Bumped hamcrest to 2.2

* updated to hamcrest 2.2

Author: chrjohn

quickfixj-core/pom.xml

@@ -33,8 +33,8 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>1.1</version>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

quickfixj-core/src/test/java/quickfix/DefaultDataDictionaryProviderTest.java

@@ -19,8 +19,12 @@
 
 package quickfix;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static quickfix.field.ApplVerID.*;
 
 import org.junit.BeforeClass;
@@ -77,7 +81,7 @@ public void throwExceptionIfSessionDictionaryIsNotFound() throws Exception {
         try {
             provider.getSessionDataDictionary("FIX44_Invalid_Test");
         } catch (QFJException e) {
-            assertThat(e.getCause(), is(ConfigError.class));
+            assertThat(e.getCause(), instanceOf(ConfigError.class));
         }
     }
 

quickfixj-core/src/test/java/quickfix/MessageUtilsTest.java

@@ -33,11 +33,12 @@
 import quickfix.fix40.Logon;
 import quickfix.fix50.Email;
 
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import org.junit.Test;
 import static org.mockito.ArgumentMatchers.any;
@@ -194,7 +195,7 @@ public void testParseFixt() throws Exception {
         Message message = MessageUtils.parse(mockSession, email.toString());
 
         assertThat(message, is(notNullValue()));
-        assertThat(message, is(quickfix.fix40.Email.class));
+        assertThat(message, instanceOf(quickfix.fix40.Email.class));
     }
 
     @Test
@@ -210,7 +211,7 @@ public void testParseFixtLogon() throws Exception {
         Message message = MessageUtils.parse(mockSession, logon.toString());
 
         assertThat(message, is(notNullValue()));
-        assertThat(message, is(quickfix.fixt11.Logon.class));
+        assertThat(message, instanceOf(quickfix.fixt11.Logon.class));
     }
 
     @Test
@@ -225,7 +226,7 @@ public void testParseFixtLogout() throws Exception {
         Message message = MessageUtils.parse(mockSession, logout.toString());
 
         assertThat(message, is(notNullValue()));
-        assertThat(message, is(quickfix.fixt11.Logout.class));
+        assertThat(message, instanceOf(quickfix.fixt11.Logout.class));
     }
 
     @Test
@@ -243,7 +244,7 @@ public void testParseFix50() throws Exception {
         Message message = MessageUtils.parse(mockSession, email.toString());
 
         assertThat(message, is(notNullValue()));
-        assertThat(message, is(quickfix.fix50.Email.class));
+        assertThat(message, instanceOf(quickfix.fix50.Email.class));
     }
 
     // QFJ-973