TRUNK-5812:Replace all Junit4 assertThat with Hamcrest assertThat

openmrs · Jun 25, 2020 · 885d77c · 885d77c
1 parent 5bd0fb4
commit 885d77c
Show file tree

Hide file tree

Showing 38 changed files with 97 additions and 96 deletions.
diff --git a/api/src/test/java/org/openmrs/CohortMembershipTest.java b/api/src/test/java/org/openmrs/CohortMembershipTest.java
@@ -9,20 +9,19 @@
  */
 package org.openmrs;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.number.OrderingComparison.greaterThan;
 import static org.hamcrest.number.OrderingComparison.lessThan;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;

diff --git a/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java b/api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java
@@ -9,12 +9,12 @@
  */
 package org.openmrs;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Calendar;

diff --git a/api/src/test/java/org/openmrs/PatientTest.java b/api/src/test/java/org/openmrs/PatientTest.java
@@ -9,10 +9,10 @@
  */
 package org.openmrs;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertSame;
 

diff --git a/api/src/test/java/org/openmrs/PersonAddressTest.java b/api/src/test/java/org/openmrs/PersonAddressTest.java
@@ -10,7 +10,7 @@
 package org.openmrs;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Date;
 

diff --git a/api/src/test/java/org/openmrs/PersonNameTest.java b/api/src/test/java/org/openmrs/PersonNameTest.java
@@ -10,7 +10,7 @@
 package org.openmrs;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java b/api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.annotation;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;

diff --git a/api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java b/api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.annotation;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 import org.openmrs.test.BaseContextSensitiveTest;

diff --git a/api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java b/api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
@@ -13,15 +13,14 @@
  */
 package org.openmrs.aop;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
 
+import javax.annotation.Resource;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.annotation.Resource;
-
 import org.junit.Test;
 import org.openmrs.Concept;
 import org.openmrs.PrivilegeListener;

diff --git a/api/src/test/java/org/openmrs/api/CohortServiceTest.java b/api/src/test/java/org/openmrs/api/CohortServiceTest.java
@@ -9,12 +9,12 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.text.ParseException;

diff --git a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java
@@ -9,6 +9,7 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
@@ -20,7 +21,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.openmrs.test.OpenmrsMatchers.hasConcept;
 import static org.openmrs.test.OpenmrsMatchers.hasId;

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -9,6 +9,37 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.openmrs.test.OpenmrsMatchers.hasId;
+import static org.openmrs.test.TestUtil.containsId;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.lang.reflect.Field;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
 import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
@@ -65,37 +96,6 @@
 import org.openmrs.util.OpenmrsConstants;
 import org.openmrs.util.PrivilegeConstants;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.lang.reflect.Field;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.openmrs.test.OpenmrsMatchers.hasId;
-import static org.openmrs.test.TestUtil.containsId;
-
 /**
  * TODO clean up and test all methods in OrderService
  */

diff --git a/api/src/test/java/org/openmrs/api/PatientServiceTest.java b/api/src/test/java/org/openmrs/api/PatientServiceTest.java
@@ -9,14 +9,14 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.openmrs.test.TestUtil.assertCollectionContentsEquals;

diff --git a/api/src/test/java/org/openmrs/api/PersonServiceTest.java b/api/src/test/java/org/openmrs/api/PersonServiceTest.java
@@ -9,14 +9,14 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.openmrs.test.TestUtil.containsId;

diff --git a/api/src/test/java/org/openmrs/api/cache/CachePropertiesUtilTest.java b/api/src/test/java/org/openmrs/api/cache/CachePropertiesUtilTest.java
@@ -9,9 +9,8 @@
  */
 package org.openmrs.api.cache;
 
-
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.List;
 

diff --git a/api/src/test/java/org/openmrs/api/db/hibernate/DropMillisecondsHibernateInterceptorTest.java b/api/src/test/java/org/openmrs/api/db/hibernate/DropMillisecondsHibernateInterceptorTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.api.db.hibernate;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.sql.Time;
 import java.util.Date;

diff --git a/api/src/test/java/org/openmrs/api/db/hibernate/HibernateConceptDAOTest.java b/api/src/test/java/org/openmrs/api/db/hibernate/HibernateConceptDAOTest.java
@@ -9,8 +9,8 @@
  */
 package org.openmrs.api.db.hibernate;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.List;
 import java.util.Locale;

diff --git a/api/src/test/java/org/openmrs/hl7/HL7ServiceTest.java b/api/src/test/java/org/openmrs/hl7/HL7ServiceTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.hl7;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/api/src/test/java/org/openmrs/module/ModuleActivatorTest.java b/api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
@@ -9,8 +9,8 @@
  */
 package org.openmrs.module;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.AfterClass;

diff --git a/api/src/test/java/org/openmrs/module/ModuleClassLoaderTest.java b/api/src/test/java/org/openmrs/module/ModuleClassLoaderTest.java
@@ -9,8 +9,9 @@
  */
 package org.openmrs.module;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+
 
 import java.net.MalformedURLException;
 import java.net.URI;

diff --git a/api/src/test/java/org/openmrs/module/ModuleUtilTest.java b/api/src/test/java/org/openmrs/module/ModuleUtilTest.java
@@ -9,9 +9,10 @@
  */
 package org.openmrs.module;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
+
 
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/api/src/test/java/org/openmrs/propertyeditor/BasePropertyEditorTest.java b/api/src/test/java/org/openmrs/propertyeditor/BasePropertyEditorTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.propertyeditor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 
 import java.beans.PropertyEditor;
 

diff --git a/api/src/test/java/org/openmrs/serialization/JavaSerializationTest.java b/api/src/test/java/org/openmrs/serialization/JavaSerializationTest.java
@@ -9,8 +9,8 @@
  */
 package org.openmrs.serialization;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.Date;
 

diff --git a/api/src/test/java/org/openmrs/util/DateUtilTest.java b/api/src/test/java/org/openmrs/util/DateUtilTest.java
@@ -9,8 +9,8 @@
  */
 package org.openmrs.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.Date;
 

diff --git a/api/src/test/java/org/openmrs/util/HandlerUtilTest.java b/api/src/test/java/org/openmrs/util/HandlerUtilTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.List;
 

diff --git a/api/src/test/java/org/openmrs/util/HttpClientTest.java b/api/src/test/java/org/openmrs/util/HttpClientTest.java
@@ -9,8 +9,8 @@
  */
 package org.openmrs.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/api/src/test/java/org/openmrs/util/HttpUrlTest.java b/api/src/test/java/org/openmrs/util/HttpUrlTest.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
 
 import java.net.MalformedURLException;