Skip to content

Commit e05d6b8

Browse files
matreimatrei
committed
test: use @PendingFeatureIf for selective test execution
Previously, some tests in the TCK were marked with `@Ignored`. This commit replaces `@Ignored` with `@PendingFeatureIf`, using system property conditions to enable selective execution. This approach ensures tests are only skipped when necessary, improving test coverage and flexibility.
1 parent 2c3a056 commit e05d6b8

File tree

6 files changed

+92
-18
lines changed

6 files changed

+92
-18
lines changed

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CriteriaBuilderSpec.groovy‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package grails.gorm.tests
22

3-
import spock.lang.PendingFeature
3+
import spock.lang.PendingFeatureIf
44

55
/**
66
* Abstract base test for criteria queries. Subclasses should do the necessary setup to configure GORM
@@ -31,7 +31,13 @@ class CriteriaBuilderSpec extends GormDatastoreSpec {
3131
result == 4
3232
}
3333

34-
@PendingFeature(reason = 'ignored this test because the id() projection does not actually exist in GORM for Hibernate')
34+
@PendingFeatureIf(
35+
value = { !(
36+
System.getProperty('hibernate5.gorm.suite') ||
37+
System.getProperty('mongodb.gorm.suite')
38+
)},
39+
reason = 'ignored this test because the id() projection does not actually exist in GORM for Hibernate'
40+
)
3541
void "Test id projection"() {
3642
given:
3743
def entity = new TestEntity(name:"Bob", age: 44, child:new ChildEntity(name:"Child")).save(flush:true)

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/FirstAndLastMethodSpec.groovy‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ package grails.gorm.tests
33
import grails.persistence.Entity
44

55
import spock.lang.PendingFeature
6+
import spock.lang.PendingFeatureIf
67

78
class FirstAndLastMethodSpec extends GormDatastoreSpec {
89

9-
@PendingFeature(reason = 'Was previously @Ignore')
10+
@PendingFeatureIf(
11+
value = { !(
12+
System.getProperty('hibernate5.gorm.suite') ||
13+
System.getProperty('mongodb.gorm.suite')
14+
)},
15+
reason = 'Was previously @Ignore'
16+
)
1017
void "Test first and last method with empty datastore"() {
1118
given:
1219
assert SimpleWidget.count() == 0
@@ -24,7 +31,13 @@ class FirstAndLastMethodSpec extends GormDatastoreSpec {
2431
result == null
2532
}
2633

27-
@PendingFeature(reason = 'Was previously @Ignore')
34+
@PendingFeatureIf(
35+
value = { !(
36+
System.getProperty('hibernate5.gorm.suite') ||
37+
System.getProperty('mongodb.gorm.suite')
38+
)},
39+
reason = 'Was previously @Ignore'
40+
)
2841
void "Test first and last method with multiple entities in the datastore"() {
2942
given:
3043
assert new SimpleWidget(name: 'one', spanishName: 'uno').save()
@@ -45,7 +58,13 @@ class FirstAndLastMethodSpec extends GormDatastoreSpec {
4558
result?.name == 'three'
4659
}
4760

48-
@PendingFeature(reason = 'Was previously @Ignore')
61+
@PendingFeatureIf(
62+
value = { !(
63+
System.getProperty('hibernate5.gorm.suite') ||
64+
System.getProperty('mongodb.gorm.suite')
65+
)},
66+
reason = 'Was previously @Ignore'
67+
)
4968
void "Test first and last method with one entity"() {
5069
given:
5170
assert new SimpleWidget(name: 'one', spanishName: 'uno').save()
@@ -64,7 +83,13 @@ class FirstAndLastMethodSpec extends GormDatastoreSpec {
6483
result?.name == 'one'
6584
}
6685

67-
@PendingFeature(reason = 'Was previously @Ignore')
86+
@PendingFeatureIf(
87+
value = { !(
88+
System.getProperty('hibernate5.gorm.suite') ||
89+
System.getProperty('mongodb.gorm.suite')
90+
)},
91+
reason = 'Was previously @Ignore'
92+
)
6893
void "Test first and last method with sort parameter"() {
6994
given:
7095
assert new SimpleWidget(name: 'one', spanishName: 'uno').save()
@@ -121,7 +146,13 @@ class FirstAndLastMethodSpec extends GormDatastoreSpec {
121146
result?.spanishName == 'uno'
122147
}
123148

124-
@PendingFeature(reason = 'Was previously @Ignore')
149+
@PendingFeatureIf(
150+
value = { !(
151+
System.getProperty('hibernate5.gorm.suite') ||
152+
System.getProperty('mongodb.gorm.suite')
153+
)},
154+
reason = 'Was previously @Ignore'
155+
)
125156
void "Test first and last method with non standard identifier"() {
126157
given:
127158
['one', 'two', 'three'].each { name ->
@@ -142,7 +173,12 @@ class FirstAndLastMethodSpec extends GormDatastoreSpec {
142173
result?.name == 'three'
143174
}
144175

145-
@PendingFeature(reason = 'Was previously @Ignore')
176+
@PendingFeatureIf(
177+
value = { !(
178+
System.getProperty('mongodb.gorm.suite')
179+
)},
180+
reason = 'Was previously @Ignore'
181+
)
146182
void "Test first and last method with composite key"() {
147183
given:
148184
assert new PersonWithCompositeKey(firstName: 'Steve', lastName: 'Harris', age: 56).save()

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/GormEnhancerSpec.groovy‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package grails.gorm.tests
22

3-
import spock.lang.PendingFeature
3+
import spock.lang.PendingFeatureIf
44

55
/**
66
* @author graemerocher
@@ -160,7 +160,13 @@ class GormEnhancerSpec extends GormDatastoreSpec {
160160
results.find { it.name == "Frank" } != null
161161
}
162162
163-
@PendingFeature(reason = 'Was previously @Ignore')
163+
@PendingFeatureIf(
164+
value = { !(
165+
System.getProperty('hibernate5.gorm.suite') ||
166+
System.getProperty('mongodb.gorm.suite')
167+
)},
168+
reason = 'Was previously @Ignore'
169+
)
164170
void "Test ilike query"() {
165171
given:
166172
def age = 40

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/NamedQuerySpec.groovy‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package grails.gorm.tests
33
import grails.persistence.Entity
44

55
import spock.lang.PendingFeature
6+
import spock.lang.PendingFeatureIf
67

78
/**
89
* @author graemerocher
@@ -701,7 +702,13 @@ class NamedQuerySpec extends GormDatastoreSpec {
701702
publications[1].title == 'Some Book'
702703
}
703704
704-
@PendingFeature(reason = 'findby boolean queries not yet supported')
705+
@PendingFeatureIf(
706+
value = { !(
707+
System.getProperty('hibernate5.gorm.suite') ||
708+
System.getProperty('mongodb.gorm.suite')
709+
)},
710+
reason = 'findby boolean queries not yet supported'
711+
)
705712
void "Test named query with find by boolean property"() {
706713
707714
given:
@@ -739,7 +746,13 @@ class NamedQuerySpec extends GormDatastoreSpec {
739746
3 == numberOfNewBooksNamedSomeBook
740747
}
741748
742-
@PendingFeature(reason = 'list order by not yet supported')
749+
@PendingFeatureIf(
750+
value = { !(
751+
System.getProperty('hibernate5.gorm.suite') ||
752+
System.getProperty('mongodb.gorm.suite')
753+
)},
754+
reason = 'list order by not yet supported'
755+
)
743756
void "Test named query with listOrderBy*() dynamic finder"() {
744757
745758
given:
@@ -823,7 +836,13 @@ class NamedQuerySpec extends GormDatastoreSpec {
823836
publication == null
824837
}
825838
826-
@PendingFeature(reason = 'Was previously @Ignore')
839+
@PendingFeatureIf(
840+
value = { !(
841+
System.getProperty('hibernate5.gorm.suite') ||
842+
System.getProperty('mongodb.gorm.suite')
843+
)},
844+
reason = 'Was previously @Ignore'
845+
)
827846
void "Test count method following named criteria"() {
828847
829848
given:

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/QueryEventsSpec.groovy‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ import org.grails.datastore.mapping.query.event.PostQueryEvent
66
import org.grails.datastore.mapping.query.event.PreQueryEvent
77
import org.springframework.context.ApplicationEvent
88
import org.springframework.context.event.SmartApplicationListener
9-
import spock.lang.PendingFeature
9+
import spock.lang.Ignore
1010

1111
/**
1212
* Tests for query events.
1313
*/
14+
@Ignore('''
15+
Cannot invoke method addApplicationListener() on null object
16+
java.lang.NullPointerException: Cannot invoke method addApplicationListener() on null object
17+
at grails.gorm.tests.QueryEventsSpec.setup(QueryEventsSpec.groovy)
18+
''')
1419
class QueryEventsSpec extends GormDatastoreSpec {
1520
SpecQueryEventListener listener
1621

@@ -24,7 +29,6 @@ class QueryEventsSpec extends GormDatastoreSpec {
2429
session.datastore.applicationContext.addApplicationListener(listener)
2530
}
2631

27-
@PendingFeature(reason = 'Was previously @Ignore')
2832
void "pre-events are fired before queries are run"() {
2933
when:
3034
TestEntity.findByName 'bob'
@@ -45,7 +49,6 @@ class QueryEventsSpec extends GormDatastoreSpec {
4549
listener.PreExecution == 3
4650
}
4751

48-
@PendingFeature(reason = 'Was previously @Ignore')
4952
void "post-events are fired after queries are run"() {
5053
given:
5154
def entity = new TestEntity(name: 'bob').save(flush: true)

‎grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/SessionCreationEventSpec.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import org.springframework.context.event.SmartApplicationListener
44
import org.springframework.context.ApplicationEvent
55
import org.grails.datastore.mapping.core.SessionCreationEvent
66
import org.grails.datastore.mapping.core.Session
7-
import spock.lang.PendingFeature
7+
import spock.lang.Ignore
88

99
/**
1010
* Test case that session creation events are fired.
1111
*/
12+
@Ignore('''
13+
Cannot invoke method addApplicationListener() on null object
14+
java.lang.NullPointerException: Cannot invoke method addApplicationListener() on null object
15+
at grails.gorm.tests.SessionCreationEventSpec.setup(SessionCreationEventSpec.groovy)
16+
''')
1217
class SessionCreationEventSpec extends GormDatastoreSpec {
1318

1419
Listener listener
@@ -18,7 +23,6 @@ class SessionCreationEventSpec extends GormDatastoreSpec {
1823
session.datastore.applicationContext.addApplicationListener(listener)
1924
}
2025

21-
@PendingFeature(reason = 'Was previously @Ignore')
2226
void "test event for new session"() {
2327
when:"Using existing session"
2428
TestEntity.withSession { s ->

0 commit comments

Comments
 (0)