Updating tests to work with Groovy 4

bdemers · bdemers · commit 3c4a0ca985e9 · 2022-03-30T16:16:48.000-04:00
diff --git a/http/http-api/src/test/groovy/com/okta/commons/http/HttpHeadersTest.groovy b/http/http-api/src/test/groovy/com/okta/commons/http/HttpHeadersTest.groovy
@@ -62,7 +62,7 @@ class HttpHeadersTest {
         httpHeaders.setAccept(mediaTypes)
 
         def acceptMediaTypes = httpHeaders.getAccept()
-        assertEquals acceptMediaTypes.size(), 2
+        assertThat acceptMediaTypes, hasSize(2)
         assertTrue acceptMediaTypes.contains(MediaType.APPLICATION_JSON)
         assertTrue acceptMediaTypes.contains(MediaType.APPLICATION_FORM_URLENCODED)
     }
@@ -71,7 +71,7 @@ class HttpHeadersTest {
     void testAcceptCharsetEmpty() {
 
         def acceptCharSets = httpHeaders.getAcceptCharset()
-        assertEquals acceptCharSets.size(), 0
+        assertThat acceptCharSets, empty()
     }
 
     @Test
@@ -81,7 +81,7 @@ class HttpHeadersTest {
         httpHeaders.setAcceptCharset(charSets)
 
         def acceptCharSets = httpHeaders.getAcceptCharset()
-        assertEquals acceptCharSets.size(), 2
+        assertThat acceptCharSets, hasSize(2)
         assertTrue acceptCharSets.contains(Charset.forName("UTF-8"))
         assertTrue acceptCharSets.contains(Charset.forName("UTF-16"))
     }
@@ -90,7 +90,7 @@ class HttpHeadersTest {
     void testAllowMethodEmpty() {
 
         def allowedMethods = httpHeaders.getAllow()
-        assertEquals allowedMethods.size(), 0
+        assertThat allowedMethods, empty()
     }
 
     @Test
@@ -100,7 +100,7 @@ class HttpHeadersTest {
         httpHeaders.setAllow(methods)
 
         def allowedMethods = httpHeaders.getAllow()
-        assertEquals allowedMethods.size(), 2
+        assertThat allowedMethods, hasSize(2)
         assertTrue allowedMethods.contains(HttpMethod.GET)
         assertTrue allowedMethods.contains(HttpMethod.POST)
     }
@@ -166,7 +166,7 @@ class HttpHeadersTest {
         assertEquals httpHeaders.get("Date"), [dateFormat.format(new Date(now))]
 
         long droppedMillis = 1000 * (now/1000).longValue()
-        assertEquals httpHeaders.getDate(), droppedMillis
+        assertThat httpHeaders.getDate(), is(droppedMillis)
     }
 
     @Test
@@ -197,7 +197,7 @@ class HttpHeadersTest {
         assertEquals httpHeaders.get("Expires"), [dateFormat.format(new Date(now))]
 
         long droppedMillis = 1000 * (now/1000).longValue()
-        assertEquals httpHeaders.getExpires(), droppedMillis
+        assertThat httpHeaders.getExpires(), is(droppedMillis)
     }
 
     @Test
@@ -212,7 +212,7 @@ class HttpHeadersTest {
         assertEquals httpHeaders.get("If-Modified-Since"), [dateFormat.format(new Date(now))]
 
         long droppedMillis = 1000 * (now/1000).longValue()
-        assertEquals httpHeaders.getIfNotModifiedSince(), droppedMillis
+        assertThat httpHeaders.getIfNotModifiedSince(), is(droppedMillis)
     }
 
     @Test
@@ -242,7 +242,7 @@ class HttpHeadersTest {
         assertEquals httpHeaders.get("Last-Modified"), [dateFormat.format(new Date(now))]
 
         long droppedMillis = 1000 * (now/1000).longValue()
-        assertEquals httpHeaders.getLastModified(), droppedMillis
+        assertThat httpHeaders.getLastModified(), is(droppedMillis)
     }
 
     @Test
@@ -289,7 +289,7 @@ class HttpHeadersTest {
         httpHeaders.setAll(headerMap)
 
         headerMap = httpHeaders.toSingleValueMap()
-        assertEquals headerMap.size(), 2
+        assertThat headerMap, aMapWithSize(2)
         assertEquals headerMap.get("Pragma"), "no-cache"
         assertEquals headerMap.get("Content-Type"), MediaType.APPLICATION_FORM_URLENCODED_VALUE
     }
@@ -349,7 +349,7 @@ class HttpHeadersTest {
         ])
 
         def keySet = httpHeaders.keySet()
-        assertEquals keySet.size(), 2
+        assertThat keySet, hasSize(2)
         assertTrue keySet.contains("Pragma")
         assertTrue keySet.contains("ETag")
     }
@@ -363,7 +363,7 @@ class HttpHeadersTest {
         ])
 
         def values = httpHeaders.values()
-        assertEquals values.size(), 2
+        assertThat values, hasSize(2)
         assertTrue values.contains(["no-cache"])
         assertTrue values.contains(["123456789"])
     }
@@ -404,7 +404,7 @@ class HttpHeadersTest {
         httpHeaders.setExpires(3600)
         httpHeaders.setLocation(new URI(location))
 
-        assertEquals httpHeaders.hashCode(), other.hashCode()
+        assertThat httpHeaders.hashCode(), is(other.hashCode())
     }
 
     @Test
diff --git a/lang/src/test/groovy/com/okta/commons/lang/ApplicationInfoTest.groovy b/lang/src/test/groovy/com/okta/commons/lang/ApplicationInfoTest.groovy
@@ -42,7 +42,7 @@ class ApplicationInfoTest {
 
         def info = appInfo.getFullEntryStringUsingManifest(Test.class.getName(), "testng")
         assertThat info.name, is("testng")
-        assertThat info.version, is("7.4.0") // tied to version in pom.xml
+        assertThat info.version, is("7.5") // tied to version in pom.xml
 
         info = appInfo.getFullEntryStringUsingManifest(Mockito.class.getName(), "mockito")
         assertThat info.name, is("mockito")
diff --git a/lang/src/test/groovy/com/okta/commons/lang/InstantsTest.groovy b/lang/src/test/groovy/com/okta/commons/lang/InstantsTest.groovy
@@ -31,11 +31,13 @@
 */
 package com.okta.commons.lang
 
-
+import org.hamcrest.Matchers
 import org.testng.annotations.Test
 
+import static org.hamcrest.Matchers.is
 import static org.testng.Assert.assertEquals
 import static org.testng.Assert.fail
+import static org.hamcrest.MatcherAssert.assertThat
 
 /**
  * @since 0.5.0
@@ -91,22 +93,22 @@ class InstantsTest {
         Calendar toConvert = Calendar.getInstance(tz)
         Long expected = toConvert.getTimeInMillis() - oneHourOffset // substract the offset corresponding to 1 hour
         long utcTimeStamp = Instants.convertDateToUTC(toConvert.getTimeInMillis(), tz)
-        assertEquals(expected, utcTimeStamp)
+        assertThat(expected, is(utcTimeStamp))
 
         toConvert = Calendar.getInstance(tg)
         expected = toConvert.getTimeInMillis() + (oneHourOffset * 6) // add the offset corresponding to 6 hours
         utcTimeStamp = Instants.convertDateToUTC(toConvert.getTimeInMillis(), tg)
-        assertEquals(expected, utcTimeStamp)
+        assertThat(expected, is(utcTimeStamp))
 
         // convertTimeFromUTC
         toConvert = Calendar.getInstance(utc)
         expected = toConvert.getTimeInMillis() - (oneHourOffset * 6) // substract the offset corresponding to 6 hours
         utcTimeStamp = Instants.convertDateToLocalTime(toConvert.getTimeInMillis(), tg)
-        assertEquals(expected, utcTimeStamp)
+        assertThat(expected, is(utcTimeStamp))
 
         expected = toConvert.getTimeInMillis() + oneHourOffset // add the offset corresponding to 1 hour
         utcTimeStamp = Instants.convertDateToLocalTime(toConvert.getTimeInMillis(), tz)
-        assertEquals(expected, utcTimeStamp)
+        assertThat(expected, is(utcTimeStamp))
 
         // of(year)
         GregorianCalendar beforeTestCal =  new GregorianCalendar()
