depend on fake-servlet5

mvysny · Mar 14, 2024 · 010dfb0 · 010dfb0
1 parent 87597e6
commit 010dfb0
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 1,487 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,3 +33,4 @@ hibernate-validator = "org.hibernate.validator:hibernate-validator:8.0.1.Final"
 jakarta-el-api = "jakarta.el:jakarta.el-api:5.0.1"
 spring-boot-starter-test = "org.springframework.boot:spring-boot-starter-test:3.0.4"
 spring-boot-starter-web = "org.springframework.boot:spring-boot-starter-web:3.0.4"
+fake-servlet5 = "com.github.mvysny.fake-servlet:fake-servlet5:1.0"
diff --git a/.../main/groovy/com/github/mvysny/kaributesting/v10/groovy/MockVaadinExtensionMethods.groovy b/.../main/groovy/com/github/mvysny/kaributesting/v10/groovy/MockVaadinExtensionMethods.groovy
@@ -1,8 +1,8 @@
 package com.github.mvysny.kaributesting.v10.groovy
 
-import com.github.mvysny.kaributesting.mockhttp.MockHttpSession
-import com.github.mvysny.kaributesting.mockhttp.MockRequest
-import com.github.mvysny.kaributesting.mockhttp.MockResponse
+import com.github.mvysny.fakeservlet.FakeHttpSession
+import com.github.mvysny.fakeservlet.FakeRequest
+import com.github.mvysny.fakeservlet.FakeResponse
 import com.github.mvysny.kaributesting.v10.UtilsKt
 import com.vaadin.flow.server.VaadinRequest
 import com.vaadin.flow.server.VaadinResponse
@@ -19,7 +19,7 @@ class MockVaadinExtensionMethods {
      * </pre>
      */
     @NotNull
-    static MockRequest getMock(@NotNull VaadinRequest self) {
+    static FakeRequest getMock(@NotNull VaadinRequest self) {
         UtilsKt.getMock(self)
     }
 
@@ -30,7 +30,7 @@ class MockVaadinExtensionMethods {
      * </pre>
      */
     @NotNull
-    static MockResponse getMock(@NotNull VaadinResponse self) {
+    static FakeResponse getMock(@NotNull VaadinResponse self) {
         UtilsKt.getMock(self)
     }
 
@@ -41,7 +41,7 @@ class MockVaadinExtensionMethods {
      * </pre>
      */
     @NotNull
-    static MockHttpSession getMock(@NotNull VaadinSession self) {
+    static FakeHttpSession getMock(@NotNull VaadinSession self) {
         UtilsKt.getMock(self)
     }
 }
diff --git a/karibu-testing-v10/build.gradle.kts b/karibu-testing-v10/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     compileOnly(libs.vaadin.v24.all)
     testImplementation(libs.vaadin.v24.all)
 
-    api(project(":mock-servlet-environment5"))
+    api(libs.fake.servlet5)
     api(libs.kaributools)
 
     testImplementation(libs.dynatest)

diff --git a/mock-servlet-environment5/README.md b/mock-servlet-environment5/README.md
diff --git a/mock-servlet-environment5/build.gradle.kts b/mock-servlet-environment5/build.gradle.kts