Bump rest-assured version

statisticsnorway · Dec 18, 2023 · 3644cf6 · 3644cf6
1 parent 1e7abd6
commit 3644cf6
Show file tree

Hide file tree

Showing 27 changed files with 84 additions and 69 deletions.
diff --git a/klass-api/pom.xml b/klass-api/pom.xml
@@ -142,7 +142,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiChangesIntegrationTest.java b/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiChangesIntegrationTest.java
@@ -1,13 +1,13 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 /**
  * @author Mads Lundemo, SSB.

diff --git a/...est/java/no/ssb/klass/api/applicationtest/RestApiClassificationFamilyIntegrationTest.java b/...est/java/no/ssb/klass/api/applicationtest/RestApiClassificationFamilyIntegrationTest.java
@@ -1,12 +1,12 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 import no.ssb.klass.core.model.ClassificationType;
 

diff --git a/.../src/test/java/no/ssb/klass/api/applicationtest/RestApiClassificationIntegrationTest.java b/.../src/test/java/no/ssb/klass/api/applicationtest/RestApiClassificationIntegrationTest.java
@@ -1,13 +1,13 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 
 /**

diff --git a/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCodeAtIntegrationTest.java b/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCodeAtIntegrationTest.java
@@ -1,11 +1,11 @@
 package no.ssb.klass.api.applicationtest;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -205,7 +205,7 @@ public void restServiceCodesAt2015CSV() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"0101\",,\"1\",\"Halden\",\"\",\"\",,,\"\"\n"
                                 + "\"0104\",,\"1\",\"Moss\",\"\",\"\",,,\"\"\n"
@@ -225,7 +225,7 @@ public void restServiceCodesAtFutureDateIncludedFutureVersionCSV() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"0101\",,\"1\",\"Halden\",\"\",\"\",,,\"\"\n"
                                 + "\"0104\",,\"1\",\"Moss\",\"\",\"\",,,\"\"\n"
@@ -250,7 +250,7 @@ public void restServiceCodesAt2012CSV() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"                                + "\"0101\",,\"1\",\"Halden\",\"\",\"\",,,\"\"\n"
                                 + "\"0104\",,\"1\",\"Moss\",\"\",\"\",,,\"\"\n"
                                 + "\"0301\",,\"1\",\"Oslo\",\"\",\"\",,,\"\"\n"
@@ -274,7 +274,7 @@ public void restServiceCodesAtAlternativeCSVSeparator() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\";\"parentCode\";\"level\";\"name\";\"shortName\";\"presentationName\";\"validFrom\";\"validTo\";\"notes\"\n"
                                 + "\"0101\";;\"1\";\"Halden\";\"\";\"\";;;\"\"\n"
                                 + "\"0104\";;\"1\";\"Moss\";\"\";\"\";;;\"\"\n"

diff --git a/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCodeIntegrationTest.java b/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCodeIntegrationTest.java
@@ -1,11 +1,11 @@
 package no.ssb.klass.api.applicationtest;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -172,7 +172,7 @@ public void restServiceCodesCSV() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\","
                                 + "\"validFrom\",\"validTo\",\"validFromInRequestedRange\",\"validToInRequestedRange\",\"notes\"\n"
                                 + "\"0101\",,\"1\",\"Halden\",\"\",\"\",,,\"2014-01-01\",\"2015-01-01\",\"\"\n"
@@ -193,7 +193,7 @@ public void restServiceCodesIncludeFutureVersionCSV() {
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
 
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\","
                                 + "\"validFrom\",\"validTo\",\"validFromInRequestedRange\",\"validToInRequestedRange\",\"notes\"\n"
                                 + "\"0101\",,\"1\",\"Halden\",\"\",\"\",,,\""+TestDataProvider.TEN_YEARS_LATER_DATE+"\",\""+TestDataProvider.FIFTEEN_YEARS_LATER_DATE+"\",\"\"\n"

diff --git a/...est/java/no/ssb/klass/api/applicationtest/RestApiCorrespondenceTablesIntegrationTest.java b/...est/java/no/ssb/klass/api/applicationtest/RestApiCorrespondenceTablesIntegrationTest.java
@@ -1,10 +1,10 @@
 package no.ssb.klass.api.applicationtest;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 
 public class RestApiCorrespondenceTablesIntegrationTest extends AbstractRestApiApplicationTest {
@@ -79,7 +79,7 @@ public void restServiceCorrespondenceTablesCSV() {
                 .then()
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
-                .content(containsString(
+                .body(containsString(
                         "\"sourceCode\";\"sourceName\";\"targetCode\";\"targetName\"\n" +
                                 "\"0301\";\"Oslo\";\"030101\";\"Gamle Oslo\"\n" +
                                 "\"0301\";\"Oslo\";\"030102\";\"Grünerløkka\"\n" +

diff --git a/...i/src/test/java/no/ssb/klass/api/applicationtest/RestApiCorrespondsAtIntegrationTest.java b/...i/src/test/java/no/ssb/klass/api/applicationtest/RestApiCorrespondsAtIntegrationTest.java
@@ -1,11 +1,11 @@
 package no.ssb.klass.api.applicationtest;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -169,7 +169,7 @@ public void restServiceCorrespondsCSV() {
 //                .prettyPeek()
                 .then()
                 .statusCode(HttpStatus.OK.value())
-                .content(containsString(
+                .body(containsString(
                         "\"sourceCode\",\"sourceName\",\"sourceShortName\",\"targetCode\",\"targetName\",\"targetShortName\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030101\",\"Gamle Oslo\",\"\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030102\",\"Grünerløkka\",\"\"\n"
@@ -187,7 +187,7 @@ public void restServiceCorrespondsIncludeFutureVersionCSV() {
 //                .prettyPeek()
                 .then()
                 .statusCode(HttpStatus.OK.value())
-                .content(containsString(
+                .body(containsString(
                         "\"sourceCode\",\"sourceName\",\"sourceShortName\",\"targetCode\",\"targetName\",\"targetShortName\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030101\",\"Gamle Oslo\",\"\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030102\",\"Grünerløkka\",\"\"\n"

diff --git a/...api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCorrespondsIntegrationTest.java b/...api/src/test/java/no/ssb/klass/api/applicationtest/RestApiCorrespondsIntegrationTest.java
@@ -1,14 +1,14 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 /**
  * @author Mads Lundemo, SSB.
@@ -174,7 +174,7 @@ public void restServiceCorrespondsCSV() {
 //                .prettyPeek()
                 .then()
                 .statusCode(HttpStatus.OK.value())
-                .content(containsString(
+                .body(containsString(
                         "\"sourceCode\",\"sourceName\",\"sourceShortName\",\"targetCode\",\"targetName\","
                                 + "\"targetShortName\",\"validFrom\",\"validTo\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030101\",\"Gamle Oslo\",\"\",\"2015-01-01\",\n"
@@ -193,7 +193,7 @@ public void restServiceCorrespondsIncludeFutureVersionCSV() {
 //                .prettyPeek()
                 .then()
                 .statusCode(HttpStatus.OK.value())
-                .content(containsString(
+                .body(containsString(
                         "\"sourceCode\",\"sourceName\",\"sourceShortName\",\"targetCode\",\"targetName\","
                                 + "\"targetShortName\",\"validFrom\",\"validTo\"\n"
                                 + "\"0301\",\"Oslo\",\"\",\"030101\",\"Gamle Oslo\",\"\",\"2015-01-01\",\n"

diff --git a/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiDraftIntegrationTest.java b/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiDraftIntegrationTest.java
@@ -1,14 +1,14 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 import no.ssb.klass.core.model.ClassificationFamily;
 import no.ssb.klass.core.model.ClassificationVariant;

diff --git a/...i/src/test/java/no/ssb/klass/api/applicationtest/RestApiErrorHandlingIntegrationTest.java b/...i/src/test/java/no/ssb/klass/api/applicationtest/RestApiErrorHandlingIntegrationTest.java
@@ -1,11 +1,11 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 /**
  * @author Mads Lundemo, SSB.

diff --git a/...java/no/ssb/klass/api/applicationtest/RestApiListClassificationFamilyIntegrationTest.java b/...java/no/ssb/klass/api/applicationtest/RestApiListClassificationFamilyIntegrationTest.java
@@ -1,12 +1,12 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 import no.ssb.klass.core.model.ClassificationType;
 

diff --git a/.../test/java/no/ssb/klass/api/applicationtest/RestApiListClassificationIntegrationTest.java b/.../test/java/no/ssb/klass/api/applicationtest/RestApiListClassificationIntegrationTest.java
@@ -1,13 +1,13 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 
 /**

diff --git a/.../src/test/java/no/ssb/klass/api/applicationtest/RestApiListSsbSectionIntegrationTest.java b/.../src/test/java/no/ssb/klass/api/applicationtest/RestApiListSsbSectionIntegrationTest.java
@@ -1,12 +1,12 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 /**
  * Testsuite that test the list (all) ssb sections

diff --git a/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiSearchIntegrationTest.java b/klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiSearchIntegrationTest.java
@@ -1,14 +1,14 @@
 package no.ssb.klass.api.applicationtest;
 
-import static com.jayway.restassured.RestAssured.*;
+import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 
 import no.ssb.klass.core.config.ConfigurationProfiles;
 

diff --git a/...s-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiVariantAtIntegrationTest.java b/...s-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiVariantAtIntegrationTest.java
@@ -1,11 +1,11 @@
 package no.ssb.klass.api.applicationtest;
 
-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -154,7 +154,7 @@ public void restServiceVariantAtCSV() {
                 .then()
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"A\",,\"1\",\"Enpersonfamilie\",\"\",\"\",,,\"\"\n"
                                 + "\"A_\",\"A\",\"2\",\"Enpersonfamilie\",\"\",\"\",,,\"\"\n"
@@ -174,7 +174,7 @@ public void restServiceVariantAtIncludedFutureVersionsCSV() {
                 .then()
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"C\",,\"1\",\"Enslig person med barn\",\"\",\"\",,,\"\"\n"
                                 + "\"CA\",\"C\",\"2\",\"Enslig person med barn 0-5 år\",\"\",\"\",,,\"\"\n"
@@ -194,7 +194,7 @@ public void restServiceVariantAtCSVFullVariantName() {
                 .then()
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"A\",,\"1\",\"Enpersonfamilie\",\"\",\"\",,,\"\"\n"
                                 + "\"A_\",\"A\",\"2\",\"Enpersonfamilie\",\"\",\"\",,,\"\"\n"
@@ -217,7 +217,7 @@ public void restServiceVariantAtCSVFullVariantNameFutureVersion() {
                 .then()
                 .statusCode(HttpStatus.OK.value())
                 .contentType(CONTENT_TYPE_CSV)
-                .content(containsString(
+                .body(containsString(
                         "\"code\",\"parentCode\",\"level\",\"name\",\"shortName\",\"presentationName\",\"validFrom\",\"validTo\",\"notes\"\n"
                                 + "\"C\",,\"1\",\"Enslig person med barn\",\"\",\"\",,,\"\"\n"
                                 + "\"CA\",\"C\",\"2\",\"Enslig person med barn 0-5 år\",\"\",\"\",,,\"\"\n"