Update tests starting with letters (R-Z) to use assertj (#2513)

* Update tests to use assertj for classes starting with letter R-Z

* Revert deprecated exercise changes

* Updates tests to use assertThat instead of assertEquals (#2511)

* Updates tests to use assertThat instead of assertEquals

* Fix style check

* Revert deprecated exercise changes

* Fix style check

* Revert imports change

* Use assertj pattern matching in test

Author: pavanbaloju

exercises/practice/rail-fence-cipher/src/test/java/RailFenceCipherTest.java

@@ -1,55 +1,56 @@
-import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class RailFenceCipherTest {
 
     private RailFenceCipher railFenceCipher;
 
     @Test
     public void encodeWithTwoRails() {
         railFenceCipher = new RailFenceCipher(2);
-        Assert.assertEquals("XXXXXXXXXOOOOOOOOO",
-            railFenceCipher.getEncryptedData("XOXOXOXOXOXOXOXOXO"));
+        assertThat(railFenceCipher.getEncryptedData("XOXOXOXOXOXOXOXOXO"))
+            .isEqualTo("XXXXXXXXXOOOOOOOOO");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void encodeWithThreeRails() {
         railFenceCipher = new RailFenceCipher(3);
-        Assert.assertEquals("WECRLTEERDSOEEFEAOCAIVDEN",
-            railFenceCipher.getEncryptedData("WEAREDISCOVEREDFLEEATONCE"));
+        assertThat(railFenceCipher.getEncryptedData("WEAREDISCOVEREDFLEEATONCE"))
+            .isEqualTo("WECRLTEERDSOEEFEAOCAIVDEN");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void encodeWithEndingInTheMiddle() {
         railFenceCipher = new RailFenceCipher(4);
-        Assert.assertEquals("ESXIEECSR",
-            railFenceCipher.getEncryptedData("EXERCISES"));
+        assertThat(railFenceCipher.getEncryptedData("EXERCISES"))
+            .isEqualTo("ESXIEECSR");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void decodeWithThreeRails() {
         railFenceCipher = new RailFenceCipher(3);
-        Assert.assertEquals("THEDEVILISINTHEDETAILS",
-            railFenceCipher.getDecryptedData("TEITELHDVLSNHDTISEIIEA"));
+        assertThat(railFenceCipher.getDecryptedData("TEITELHDVLSNHDTISEIIEA"))
+            .isEqualTo("THEDEVILISINTHEDETAILS");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void decodeWithFiveRails() {
         railFenceCipher = new RailFenceCipher(5);
-        Assert.assertEquals("EXERCISMISAWESOME",
-            railFenceCipher.getDecryptedData("EIEXMSMESAORIWSCE"));
+        assertThat(railFenceCipher.getDecryptedData("EIEXMSMESAORIWSCE"))
+            .isEqualTo("EXERCISMISAWESOME");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void decodeWithSixRails() {
         railFenceCipher = new RailFenceCipher(6);
-        Assert.assertEquals("112358132134558914423337761098715972584418167651094617711286",
-            railFenceCipher.getDecryptedData("133714114238148966225439541018335470986172518171757571896261"));
+        assertThat(railFenceCipher.getDecryptedData("133714114238148966225439541018335470986172518171757571896261"))
+            .isEqualTo("112358132134558914423337761098715972584418167651094617711286");
     }
 }

exercises/practice/raindrops/src/test/java/RaindropConverterTest.java

@@ -1,117 +1,117 @@
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class RaindropConverterTest {
 
     private RaindropConverter raindropConverter = new RaindropConverter();
 
     @Test
     public void soundFor1Is1() {
-        assertEquals("1", raindropConverter.convert(1));
+        assertThat(raindropConverter.convert(1)).isEqualTo("1");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor3IsPling() {
-        assertEquals("Pling", raindropConverter.convert(3));
+        assertThat(raindropConverter.convert(3)).isEqualTo("Pling");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor5IsPlang() {
-        assertEquals("Plang", raindropConverter.convert(5));
+        assertThat(raindropConverter.convert(5)).isEqualTo("Plang");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor7IsPlong() {
-        assertEquals("Plong", raindropConverter.convert(7));
+        assertThat(raindropConverter.convert(7)).isEqualTo("Plong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor6IsPlingAsItHasFactor3() {
-        assertEquals("Pling", raindropConverter.convert(6));
+        assertThat(raindropConverter.convert(6)).isEqualTo("Pling");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void noSoundFor2Cubed() {
-        assertEquals("8", raindropConverter.convert(8));
+        assertThat(raindropConverter.convert(8)).isEqualTo("8");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor9IsPlingAsItHasFactor3() {
-        assertEquals("Pling", raindropConverter.convert(9));
+        assertThat(raindropConverter.convert(9)).isEqualTo("Pling");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor10IsPlangAsItHasFactor5() {
-        assertEquals("Plang", raindropConverter.convert(10));
+        assertThat(raindropConverter.convert(10)).isEqualTo("Plang");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor14IsPlongAsItHasFactor7() {
-        assertEquals("Plong", raindropConverter.convert(14));
+        assertThat(raindropConverter.convert(14)).isEqualTo("Plong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor15IsPlingPlangAsItHasFactors3And5() {
-        assertEquals("PlingPlang", raindropConverter.convert(15));
+        assertThat(raindropConverter.convert(15)).isEqualTo("PlingPlang");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor21IsPlingPlongAsItHasFactors3And7() {
-        assertEquals("PlingPlong", raindropConverter.convert(21));
+        assertThat(raindropConverter.convert(21)).isEqualTo("PlingPlong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor25IsPlangAsItHasFactor5() {
-        assertEquals("Plang", raindropConverter.convert(25));
+        assertThat(raindropConverter.convert(25)).isEqualTo("Plang");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor27IsPlingAsItHasFactor3() {
-        assertEquals("Pling", raindropConverter.convert(27));
+        assertThat(raindropConverter.convert(27)).isEqualTo("Pling");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor35IsPlangPlongAsItHasFactors5And7() {
-        assertEquals("PlangPlong", raindropConverter.convert(35));
+        assertThat(raindropConverter.convert(35)).isEqualTo("PlangPlong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor49IsPlongAsItHasFactor7() {
-        assertEquals("Plong", raindropConverter.convert(49));
+        assertThat(raindropConverter.convert(49)).isEqualTo("Plong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void noSoundFor52() {
-        assertEquals("52", raindropConverter.convert(52));
+        assertThat(raindropConverter.convert(52)).isEqualTo("52");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor105IsPlingPlangPlongAsItHasFactors3And5And7() {
-        assertEquals("PlingPlangPlong", raindropConverter.convert(105));
+        assertThat(raindropConverter.convert(105)).isEqualTo("PlingPlangPlong");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void soundFor3125IsPlangAsItHasFactor5() {
-        assertEquals("Plang", raindropConverter.convert(3125));
+        assertThat(raindropConverter.convert(3125)).isEqualTo("Plang");
     }
 
 }