Migrate to AssertJ

JodaOrg · Aug 18, 2024 · 2b0e1a7 · 2b0e1a7
1 parent b4f1813
commit 2b0e1a7
Show file tree

Hide file tree

Showing 8 changed files with 213 additions and 213 deletions.
diff --git a/src/test/java/org/joda/money/TestBigMoney.java b/src/test/java/org/joda/money/TestBigMoney.java
diff --git a/src/test/java/org/joda/money/TestCurrencyUnit.java b/src/test/java/org/joda/money/TestCurrencyUnit.java
@@ -191,9 +191,9 @@ void test_registeredCurrencies_crossCheck() {
     @Test
     void test_registeredCountries() {
         List<String> countryList = CurrencyUnit.registeredCountries();
-        assertThat(countryList.contains("GB")).isTrue();
-        assertThat(countryList.contains("EU")).isTrue();
-        assertThat(countryList.contains("US")).isTrue();
+        assertThat(countryList).contains("GB");
+        assertThat(countryList).contains("EU");
+        assertThat(countryList).contains("US");
     }
 
     @Test
@@ -513,7 +513,7 @@ void test_getNumeric3Code_AMD() {
     @Test
     void test_getNumeric3Code_XFU() {
         CurrencyUnit test = CurrencyUnit.of("XFU");
-        assertThat(test.getNumeric3Code()).isEqualTo("");
+        assertThat(test.getNumeric3Code()).isEmpty();
     }
 
     //-----------------------------------------------------------------------
@@ -531,10 +531,10 @@ void test_getNumericCode_GBP() {
     @Test
     void test_getCurrencyCodes_GBP() {
         Set<String> test = CurrencyUnit.of("GBP").getCountryCodes();
-        assertThat(test.contains("GB")).isTrue();
-        assertThat(test.contains("IM")).isTrue();
-        assertThat(test.contains("JE")).isTrue();
-        assertThat(test.contains("GG")).isTrue();
+        assertThat(test).contains("GB");
+        assertThat(test).contains("IM");
+        assertThat(test).contains("JE");
+        assertThat(test).contains("GG");
     }
 
     //-----------------------------------------------------------------------
@@ -600,7 +600,7 @@ void test_getSymbol_JPY() {
         try {
             Locale.setDefault(Locale.UK);
             CurrencyUnit test = CurrencyUnit.of("JPY");
-            assertThat(test.getSymbol().contains("JP")).isTrue();
+            assertThat(test.getSymbol()).contains("JP");
         } finally {
             Locale.setDefault(loc);
         }
@@ -651,7 +651,7 @@ void test_getSymbol_Locale_GBP_France() {
         try {
             Locale.setDefault(Locale.UK);
             CurrencyUnit test = CurrencyUnit.of("GBP");
-            assertThat(test.getSymbol(Locale.FRANCE).contains("GB")).isTrue();
+            assertThat(test.getSymbol(Locale.FRANCE)).contains("GB");
         } finally {
             Locale.setDefault(loc);
         }
@@ -675,7 +675,7 @@ void test_getSymbol_Locale_USD_France() {
         try {
             Locale.setDefault(Locale.UK);
             CurrencyUnit test = CurrencyUnit.of("USD");
-            assertThat(test.getSymbol(Locale.FRANCE).contains("US")).isTrue();
+            assertThat(test.getSymbol(Locale.FRANCE)).contains("US");
         } finally {
             Locale.setDefault(loc);
         }
@@ -789,7 +789,7 @@ void test_equals_false() {
     @Test
     void test_toString() {
         CurrencyUnit test = CurrencyUnit.of("GBP");
-        assertThat(test.toString()).isEqualTo("GBP");
+        assertThat(test).hasToString("GBP");
     }
 
 }
diff --git a/src/test/java/org/joda/money/TestCurrencyUnitExtension.java b/src/test/java/org/joda/money/TestCurrencyUnitExtension.java
@@ -89,8 +89,8 @@ void test_CurrencyMissing() {
     void test_CurrencyEURChanged() {
         CurrencyUnit currency = CurrencyUnit.ofCountry("HU");
         assertThat(currency).isEqualTo(CurrencyUnit.EUR);
-        assertThat(CurrencyUnit.EUR.getCountryCodes().contains("HU")).isTrue();
-        assertThat(CurrencyUnit.of("HUF").getCountryCodes().isEmpty()).isTrue();
+        assertThat(CurrencyUnit.EUR.getCountryCodes()).contains("HU");
+        assertThat(CurrencyUnit.of("HUF").getCountryCodes()).isEmpty();
     }
 
 }