Skip to content

Commit fbffcdc

Browse files
author
graeme
committed
fix for failing test on windows
git-svn-id: https://svn.codehaus.org/grails/trunk@6659 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
1 parent cfd75a2 commit fbffcdc

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

test/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
241241
return text.indexOf(expected) > -1
242242
}
243243

244-
def assertOutputContains(expected, template, params = [:]) {
244+
void assertOutputContains(expected, template, params = [:]) {
245245
def result = applyTemplate(template, params)
246-
return result.indexOf(expected) > -1
246+
assert result.indexOf(expected) > -1
247247
}
248248

249249
void assertOutputEquals(expected, template, params = [:], Closure transform = { it.toString() }) {

test/groovy/org/codehaus/groovy/grails/web/taglib/SelectTagTests.groovy

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,23 @@ class SelectTagTests extends AbstractGrailsTagTests {
99

1010
void testSelectWithBigDecimal() {
1111
def template = '<g:set var="value" value="${2.4}"/><g:select name="foo" from="[1,2,3]" value="${value}" />'
12-
assertOutputEquals('''<select name="foo" id="foo" >
13-
<option value="1" >1</option>
14-
<option value="2" selected="selected" >2</option>
15-
<option value="3" >3</option>
16-
</select>''', template)
12+
assertOutputContains('<option value="2" selected="selected" >2</option>', template)
1713
}
1814

1915
void testSimpleSelect() {
2016
def template = '<g:select name="foo" from="[1,2,3]" value="1" />'
21-
22-
assertOutputEquals('''<select name="foo" id="foo" >
23-
<option value="1" selected="selected" >1</option>
24-
<option value="2" >2</option>
25-
<option value="3" >3</option>
26-
</select>''', template)
27-
17+
assertOutputContains('<option value="1" selected="selected" >1</option>', template)
18+
assertOutputContains('<option value="2" >2</option>', template)
19+
assertOutputContains('<option value="3" >3</option>', template)
2820
}
2921

3022

3123
void testMultiSelect() {
3224
def template = '<g:select name="foo" from="[1,2,3]" value="[2,3]" />'
3325

34-
assertOutputEquals('''<select name="foo" id="foo" multiple="true" >
35-
<option value="1" >1</option>
36-
<option value="2" selected="selected" >2</option>
37-
<option value="3" selected="selected" >3</option>
38-
</select>''', template)
39-
26+
assertOutputContains('<select name="foo" id="foo" multiple="true" >', template)
27+
assertOutputContains('<option value="1" >1</option>', template)
28+
assertOutputContains('<option value="2" selected="selected" >2</option>', template)
29+
assertOutputContains('<option value="3" selected="selected" >3</option>', template)
4030
}
4131
}

0 commit comments

Comments
 (0)