Solve sonar issues related to string blocks (#7711)

Signed-off-by: vlo-rte <[email protected]>
opfab · Dec 24, 2024 · e536b22 · e536b22
1 parent 4b75c74
commit e536b22
Show file tree

Hide file tree

Showing 5 changed files with 217 additions and 204 deletions.
diff --git a/...va/org/opfab/businessconfig/controllers/GivenAdminUserBusinessconfigControllerShould.java b/...va/org/opfab/businessconfig/controllers/GivenAdminUserBusinessconfigControllerShould.java
@@ -120,18 +120,20 @@ void fetchCssResource() throws Exception {
                 result
                                 .andExpect(status().isOk())
                                 .andExpect(content().contentType("text/css"))
-                                .andExpect(content().string(is(".bold {\n" +
-                                                "    font-weight: bold;\n" +
-                                                "}")));
+                                .andExpect(content().string(is("""
+                                                            .bold {
+                                                                font-weight: bold;
+                                                            }""")));
                 result = mockMvc.perform(
                                 get("/processes/first/css/style1?version=0.1")
                                                 .accept("text/css"));
                 result
                                 .andExpect(status().isOk())
                                 .andExpect(content().contentType("text/css"))
-                                .andExpect(content().string(is(".bold {\n" +
-                                                "    font-weight: bolder;\n" +
-                                                "}")));
+                                .andExpect(content().string(is("""
+                                                            .bold {
+                                                                font-weight: bolder;
+                                                            }""")));
         }
 
         @Test

diff --git a/...org/opfab/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java b/...org/opfab/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java
@@ -136,19 +136,21 @@ void fetchCssResource() throws Exception {
         result
                 .andExpect(status().isOk())
                 .andExpect(content().contentType("text/css"))
-                .andExpect(content().string(is(".bold {\n" +
-                        "    font-weight: bold;\n" +
-                        "}")))
+                .andExpect(content().string(is("""
+                        .bold {
+                            font-weight: bold;
+                        }""")))
         ;
         result = mockMvc.perform(
                 get("/processes/first/css/style1?version=0.1")
                         .accept("text/css"));
         result
                 .andExpect(status().isOk())
                 .andExpect(content().contentType("text/css"))
-                .andExpect(content().string(is(".bold {\n" +
-                        "    font-weight: bolder;\n" +
-                        "}")))
+                .andExpect(content().string(is("""
+                        .bold {
+                            font-weight: bolder;
+                        }""")))
         ;
     }
 

diff --git a/...usinessconfig/src/test/java/org/opfab/businessconfig/services/ProcessesServiceShould.java b/...usinessconfig/src/test/java/org/opfab/businessconfig/services/ProcessesServiceShould.java
@@ -107,25 +107,28 @@ void fetchCss() throws IOException {
                 .exists()
                 .isFile()
                 .hasName("style1.css")
-                .hasContent(".bold {\n" +
-                        "    font-weight: bold;\n" +
-                        "}");
+                .hasContent("""
+                        .bold {
+                            font-weight: bold;
+                        }""");
         styleFile = service.fetchResource("first", CSS, "0.1", "style1").getFile();
         assertThat(styleFile)
                 .exists()
                 .isFile()
                 .hasName("style1.css")
-                .hasContent(".bold {\n" +
-                        "    font-weight: bolder;\n" +
-                        "}");
+                .hasContent("""
+                        .bold {
+                            font-weight: bolder;
+                        }""");
         styleFile = service.fetchResource("first", CSS, "0.1", "style1").getFile();
         assertThat(styleFile)
                 .exists()
                 .isFile()
                 .hasName("style1.css")
-                .hasContent(".bold {\n" +
-                        "    font-weight: bolder;\n" +
-                        "}");
+                .hasContent("""
+                        .bold {
+                            font-weight: bolder;
+                        }""");
     }
 
     @Test