Merge pull request #1835 from grails/test-cleanup

test cleanup - fix hibernate6 tests
grails · Oct 25, 2024 · 678b4b9 · 678b4b9
2 parents 8f1a819 + ea7c95e
commit 678b4b9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -61,6 +61,13 @@ jobs:
           repo: grails/gorm-hibernate5
           ref: ${{ steps.extract_branch.outputs.value }}
           token: ${{ secrets.GH_TOKEN }}
+      - name: Invoke the Java CI workflow in GORM Hibernate6
+        uses: benc-uk/[email protected]
+        with:
+          workflow: Java CI
+          repo: grails/gorm-hibernate6
+          ref: ${{ steps.extract_branch.outputs.value }}
+          token: ${{ secrets.GH_TOKEN }}
       - name: Invoke the Java CI workflow in GORM MongoDB
         uses: benc-uk/[email protected]
         with:

diff --git a/...est/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy b/...est/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy
@@ -384,19 +384,19 @@ return Book.classLoader
     }
 }
 
-//@Entity
-//class Book {
-//  String title
-//}
-//
-//
-//@Service(Book)
-//abstract class BookService {
-//    abstract Observable<Book> find(String title)
-//
-//    Observable<Book> findOne(title) {
-//        RxServiceSupport.create {
-//            Book.findWhere(title:title)
-//        }
-//    }
-//}
+@Entity
+class Book {
+  String title
+}
+
+
+@Service(Book)
+abstract class BookService {
+    abstract Observable<Book> find(String title)
+
+    Observable<Book> findOne(title) {
+        RxServiceSupport.create {
+            Book.findWhere(title:title)
+        }
+    }
+}
diff --git a/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DirtyCheckingSpec.groovy b/grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DirtyCheckingSpec.groovy
@@ -151,7 +151,7 @@ class DirtyCheckingSpec extends GormDatastoreSpec {
         TestAuthor.deleteAll()
     }
 
-    @IgnoreIf({ Boolean.getBoolean("hibernate5.gorm.suite")}) // because one-to-one association loads eagerly in the Hibernate
+    @IgnoreIf({ Boolean.getBoolean("hibernate5.gorm.suite") || Boolean.getBoolean("hibernate6.gorm.suite")}) // because one-to-one association loads eagerly in the Hibernate
     void "test initialized proxy is not marked as dirty"() {
 
         given:

diff --git a/...-datastore-gorm/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy b/...-datastore-gorm/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy
@@ -1,5 +1,7 @@
 package grails.gorm.services
 
+import grails.gorm.annotation.Entity
+import jakarta.validation.constraints.NotNull
 import org.grails.datastore.gorm.validation.jakarta.services.ValidatedService
 import org.grails.datastore.mapping.validation.ValidationException
 import spock.lang.Specification
@@ -79,12 +81,12 @@ class Foo {
     }
 }
 
-//@Service(Foo)
-//interface MyService {
-//
-//    Foo find(@NotNull String title)
-//}
-//@Entity
-//class Foo {
-//    String title
-//}
+@Service(Foo)
+interface MyService {
+
+    Foo find(@NotNull String title)
+}
+@Entity
+class Foo {
+    String title
+}