This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3676 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit a1c2c44532529daa912f407649a14b867987385b Author: danhaywood <[email protected]> AuthorDate: Mon Feb 12 22:01:33 2024 +0000 CAUSEWAY-3676: speeds up integ tests by only dirtying the context once --- .../viewer/test/e2e/query/Admin_IntegTest.java | 1 - .../test/e2e/query/Calculator_IntegTest.java | 1 - .../test/e2e/query/Department_IntegTest.java | 1 - .../viewer/test/e2e/query/DeptHead_IntegTest.java | 1 - .../viewer/test/e2e/query/Staff_IntegTest.java | 1 - .../DepartmentMutating_IntegTest.java | 1 - .../DeptHeadMutating_IntegTest.java | 3 +- .../StaffMutating_IntegTest.java | 3 +- ...ing_IntegTest.java => _Mutating_IntegTest.java} | 38 +++++++--------------- .../test/e2e/scenario/Calculator_IntegTest.java | 1 - 10 files changed, 13 insertions(+), 38 deletions(-) diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Admin_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Admin_IntegTest.java index 76e63db991..776df361a9 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Admin_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Admin_IntegTest.java @@ -35,7 +35,6 @@ import lombok.val; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(20) @ActiveProfiles("test") -@DirtiesContext public class Admin_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Calculator_IntegTest.java index d23ae9c361..bdfc29a56d 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Calculator_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Calculator_IntegTest.java @@ -33,7 +33,6 @@ import org.springframework.test.context.ActiveProfiles; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(30) @ActiveProfiles("test") -@DirtiesContext public class Calculator_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Department_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Department_IntegTest.java index aa2f96bf94..34945e9656 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Department_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Department_IntegTest.java @@ -50,7 +50,6 @@ import lombok.val; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(40) @ActiveProfiles("test") -@DirtiesContext public class Department_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/DeptHead_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/DeptHead_IntegTest.java index c7bc15f875..a1f90571ec 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/DeptHead_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/DeptHead_IntegTest.java @@ -38,7 +38,6 @@ import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(50) @ActiveProfiles("test") -@DirtiesContext public class DeptHead_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Staff_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Staff_IntegTest.java index 99238c6fc8..26e247b706 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Staff_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query/Staff_IntegTest.java @@ -46,7 +46,6 @@ import lombok.val; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(60) @ActiveProfiles("test") -@DirtiesContext public class Staff_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java index e634270b27..e50aef889d 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java @@ -52,7 +52,6 @@ import lombok.val; ) @Order(110) @ActiveProfiles("test") -@DirtiesContext public class DepartmentMutating_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DeptHeadMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DeptHeadMutating_IntegTest.java index d1f196a984..877a4fc5ba 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DeptHeadMutating_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DeptHeadMutating_IntegTest.java @@ -50,9 +50,8 @@ import lombok.val; "causeway.viewer.graphql.api-variant=QUERY_AND_MUTATIONS" } ) -@Order(110) +@Order(120) @ActiveProfiles("test") -@DirtiesContext public class DeptHeadMutating_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/StaffMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/StaffMutating_IntegTest.java index d38ca0f069..a123442c76 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/StaffMutating_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/StaffMutating_IntegTest.java @@ -47,9 +47,8 @@ import lombok.val; "causeway.viewer.graphql.api-variant=QUERY_AND_MUTATIONS" } ) -@Order(60) +@Order(130) @ActiveProfiles("test") -@DirtiesContext public class StaffMutating_IntegTest extends Abstract_IntegTest { @Test diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/_Mutating_IntegTest.java similarity index 72% copy from viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java copy to viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/_Mutating_IntegTest.java index e634270b27..2b3188f2a9 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/DepartmentMutating_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/query_and_mutations/_Mutating_IntegTest.java @@ -18,8 +18,16 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.e2e.query_and_mutations; +import lombok.val; + import java.util.Optional; +import org.apache.causeway.applib.services.bookmark.Bookmark; +import org.apache.causeway.commons.internal.collections._Maps; +import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract; +import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department; +import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest; + import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; @@ -31,14 +39,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Propagation; -import org.apache.causeway.applib.services.bookmark.Bookmark; -import org.apache.causeway.commons.internal.collections._Maps; -import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract; -import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department; -import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest; - -import lombok.val; - //NOT USING @Transactional since we are running server within same transaction otherwise @SpringBootTest( @@ -50,29 +50,13 @@ import lombok.val; "causeway.viewer.graphql.api-variant=QUERY_AND_MUTATIONS" } ) -@Order(110) +@Order(100) @ActiveProfiles("test") @DirtiesContext -public class DepartmentMutating_IntegTest extends Abstract_IntegTest { +public class _Mutating_IntegTest extends Abstract_IntegTest { @Test - @UseReporter(DiffReporter.class) - void change_department_name_visibility() throws Exception { - - final Bookmark bookmark = - transactionService.callTransactional( - Propagation.REQUIRED, - () -> { - Department department = departmentRepository.findByName("Classics"); - Optional<Bookmark> bookmark1 = bookmarkService.bookmarkFor(department); - return bookmark1.orElseThrow(); - } - ).valueAsNonNullElseFail(); - - val response = submit(_Maps.unmodifiable("$departmentId", bookmark.getIdentifier())); - - // then payload - Approvals.verify(response, jsonOptions()); + void dummy() throws Exception { } } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java index 561b2e61f2..aa9a61647d 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java @@ -34,7 +34,6 @@ import org.springframework.test.context.ActiveProfiles; //NOT USING @Transactional since we are running server within same transaction otherwise @Order(30) @ActiveProfiles("test") -@DirtiesContext public class Calculator_IntegTest extends Abstract_IntegTest {
