From 3f61fa10a9166915667129175912f74c8d0ce272 Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Fri, 10 Jan 2020 17:43:48 +0530
Subject: [PATCH 1/3] BAEL-3602 : Java 13 New Features

---
 .../SwitchExpressionsWithYieldUnitTest.java   | 27 +++++++++++++++++++
 .../newfeatures/TextBlocksUnitTest.java       | 25 +++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
 create mode 100644 core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java

diff --git a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
new file mode 100644
index 0000000000..33dea53985
--- /dev/null
+++ b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.newfeatures;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class SwitchExpressionsWithYieldUnitTest {
+
+    @Test
+    @SuppressWarnings("preview")
+    public void whenSwitchingOnOperationSquareMe_thenWillReturnSquare() {
+        var me = 4;
+        var operation = "squareMe";
+        var result = switch (operation) {
+        case "doubleMe" -> {
+            yield me * 2;
+        }
+        case "squareMe" -> {
+            yield me * me;
+        }
+        default -> me;
+        };
+
+        assertEquals(result, 16);
+    }
+
+}
diff --git a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java
new file mode 100644
index 0000000000..02ae8b7d9c
--- /dev/null
+++ b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.newfeatures;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+public class TextBlocksUnitTest {
+
+    @SuppressWarnings("preview")
+    private static final String TEXT_BLOCK_JSON = """
+            {
+            "name" : "Baeldung",
+            "website" : "https://www.baeldung.com/"
+            }
+        """;
+
+    @Test
+    public void whenTextBlocks_thenStringOperationsWork() {
+
+        assertThat(TEXT_BLOCK_JSON.contains("Baeldung")).isTrue();
+        assertThat(TEXT_BLOCK_JSON.indexOf("www")).isGreaterThan(0);
+        assertThat(TEXT_BLOCK_JSON.length()).isGreaterThan(0);
+
+    }
+}

From d1db78f5c1b1ad18c880b533c7c55ff74e8ebf28 Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Mon, 13 Jan 2020 12:04:35 +0530
Subject: [PATCH 2/3] BAEL-3602 : Added test for formatted()

---
 .../baeldung/newfeatures/TextBlocksUnitTest.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java
index 02ae8b7d9c..1f8ddcbfb4 100644
--- a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java
+++ b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/TextBlocksUnitTest.java
@@ -6,11 +6,13 @@ import org.junit.Test;
 
 public class TextBlocksUnitTest {
 
+    private static final String JSON_STRING = "{\r\n" + "\"name\" : \"Baeldung\",\r\n" + "\"website\" : \"https://www.%s.com/\"\r\n" + "}";
+
     @SuppressWarnings("preview")
     private static final String TEXT_BLOCK_JSON = """
             {
             "name" : "Baeldung",
-            "website" : "https://www.baeldung.com/"
+            "website" : "https://www.%s.com/"
             }
         """;
 
@@ -22,4 +24,16 @@ public class TextBlocksUnitTest {
         assertThat(TEXT_BLOCK_JSON.length()).isGreaterThan(0);
 
     }
+
+    @SuppressWarnings("removal")
+    @Test
+    public void whenTextBlocks_thenFormattedWorksAsFormat() {
+        assertThat(TEXT_BLOCK_JSON.formatted("baeldung")
+            .contains("www.baeldung.com")).isTrue();
+
+        assertThat(String.format(JSON_STRING, "baeldung")
+            .contains("www.baeldung.com")).isTrue();
+
+    }
+   
 }

From b2cdd4db7ec749ab962d3773869d6e086960dd2f Mon Sep 17 00:00:00 2001
From: sampada <sampada.wagde@gmail.com>
Date: Sat, 18 Jan 2020 20:19:34 +0530
Subject: [PATCH 3/3] BAEL-3602 : swapped order of args in assertEquals call

---
 .../newfeatures/SwitchExpressionsWithYieldUnitTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
index 33dea53985..be1fcfd167 100644
--- a/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
+++ b/core-java-modules/core-java-13/src/test/java/com/baeldung/newfeatures/SwitchExpressionsWithYieldUnitTest.java
@@ -21,7 +21,7 @@ public class SwitchExpressionsWithYieldUnitTest {
         default -> me;
         };
 
-        assertEquals(result, 16);
+        assertEquals(16, result);
     }
 
 }