Skip to content

Step 1 (PR-D): DetachedCriteriaSpec command-chain syntax cleanup #15684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jamesfredley wants to merge 2 commits into from
+18 −18
Closed

Step 1 (PR-D): DetachedCriteriaSpec command-chain syntax cleanup #15684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6d9f1
Convert eq/like parens to command-chain syntax in DetachedCriteriaSpec
jamesfredley May 27, 2026
bc43187
Merge branch '8.0.x' into chore/tck-detached-criteria-style
jamesfredley May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ...-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DetachedCriteriaSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created and the list method used with the max parameter'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
def results = criteria.list(max: 2)

Expand All @@ -45,7 +45,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created and the list method used with the max parameter'
criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
results = criteria.list(offset: 2, max: 4)

Expand All @@ -63,7 +63,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created that uses a property projection'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
criteria = criteria.property('firstName')

Expand All @@ -75,7 +75,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created that uses a property projection using property missing'
criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
criteria = criteria.firstName

Expand All @@ -93,7 +93,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

then: 'The count method returns the right results'
Expand All @@ -106,7 +106,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {

when: 'A detached criteria is created that deletes all matching records'
def criteria = new DetachedCriteria(Person).build {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
int total = criteria.updateAll(lastName: 'Bloggs')
then: 'The number of deletions is correct'
Expand All @@ -122,7 +122,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {

when: 'A detached criteria is created that deletes all matching records'
def criteria = new DetachedCriteria(Person).build {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
int total = criteria.deleteAll()

Expand All @@ -137,7 +137,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {

when: 'A detached criteria is created that matches the last name and then iterated over'
def criteria = new DetachedCriteria(Person).build {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}
int total = 0
criteria.each {
Expand All @@ -155,7 +155,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def result = criteria.findByFirstNameLike('B%')
Expand All @@ -172,11 +172,11 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def result = criteria.get {
like('firstName', 'B%')
like 'firstName', 'B%'
}
then: 'The list method returns the right results'
result != null
Expand All @@ -190,11 +190,11 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def results = criteria.list {
like('firstName', 'B%')
like 'firstName', 'B%'
}
then: 'The list method returns the right results'
results.size() == 1
Expand All @@ -215,11 +215,11 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name and count is called with additional criteria'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def result = criteria.count {
like('firstName', 'B%')
like 'firstName', 'B%'
}
then: 'The count method returns the right results'
result == 1
Expand All @@ -233,7 +233,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def result = criteria.count()
Expand All @@ -249,7 +249,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria.with {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def results = criteria.list()
Expand All @@ -265,7 +265,7 @@ class DetachedCriteriaSpec extends GrailsDataTckSpec {
when: 'A detached criteria instance is created matching the last name'
def criteria = new DetachedCriteria(Person)
criteria = criteria.build {
eq('lastName', 'Simpson')
eq 'lastName', 'Simpson'
}

def results = criteria.list(max: 2)
Expand Down
Loading