Skip to content

Commit be56264

Browse files
burtbeckwithburtbeckwith
committed
fixing failing tests
1 parent 3d62606 commit be56264

File tree

2 files changed

+55
-53
lines changed

2 files changed

+55
-53
lines changed

‎src/test/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGeneratorTests.groovy‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
package org.codehaus.groovy.grails.scaffolding
22

3-
import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass
4-
import org.codehaus.groovy.grails.commons.GrailsDomainConfigurationUtil;
5-
63
import grails.util.BuildSettings
74
import grails.util.BuildSettingsHolder
85

6+
import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass
7+
import org.codehaus.groovy.grails.commons.GrailsDomainConfigurationUtil
8+
9+
import org.codehaus.groovy.grails.plugins.GrailsPlugin
10+
import org.codehaus.groovy.grails.plugins.MockGrailsPluginManager
11+
import org.codehaus.groovy.grails.plugins.PluginManagerHolder
12+
913
/**
1014
* @author Graeme Rocher
1115
* @since 1.1
12-
*
13-
* Created: Dec 8, 2008
1416
*/
17+
class DefaultGrailsTemplateGeneratorTests extends GroovyTestCase {
1518

16-
public class DefaultGrailsTemplateGeneratorTests extends GroovyTestCase{
17-
19+
public static GrailsPlugin fakeHibernatePlugin = [getName: { -> 'hibernate' }] as GrailsPlugin
20+
1821
protected void setUp() {
1922
def buildSettings = new BuildSettings(new File("."))
2023
BuildSettingsHolder.settings = buildSettings
24+
PluginManagerHolder.pluginManager = new MockGrailsPluginManager()
25+
PluginManagerHolder.pluginManager.registerMockPlugin fakeHibernatePlugin
2126
}
2227

2328
protected void tearDown() {
2429
BuildSettingsHolder.settings = null
30+
PluginManagerHolder.pluginManager = null
2531
}
2632

27-
28-
29-
30-
3133
GroovyClassLoader gcl = new GroovyClassLoader()
32-
String testDomain = '''
34+
String testDomain = '''
3335
class ScaffoldingTest {
3436
Long id
3537
Long version
@@ -44,13 +46,11 @@ class ScaffoldingTest {
4446
}
4547
'''
4648

47-
4849
void testGenerateDateSelect() {
4950
def templateGenerator = new DefaultGrailsTemplateGenerator()
5051
gcl.parseClass(testDomain)
5152
def testClass = gcl.loadClass("ScaffoldingTest")
5253

53-
5454
def constrainedProperties = GrailsDomainConfigurationUtil.evaluateConstraints(testClass)
5555
testClass.metaClass.getConstraints = {-> constrainedProperties }
5656

@@ -59,18 +59,17 @@ class ScaffoldingTest {
5959
StringWriter sw = new StringWriter()
6060
templateGenerator.generateView domainClass, "create", sw
6161

62-
63-
println "sw: ${sw.toString()}"
64-
assertTrue "Should have rendered a datePicker for regularDate",sw.toString().contains('g:datePicker name="regularDate" precision="day" value="${scaffoldingTestInstance?.regularDate}"')
65-
assertTrue "Should have rendered a datePicker for sqlDate",sw.toString().contains('datePicker name="sqlDate" precision="day" value="${scaffoldingTestInstance?.sqlDate}"')
62+
assertTrue "Should have rendered a datePicker for regularDate",
63+
sw.toString().contains('g:datePicker name="regularDate" precision="day" value="${scaffoldingTestInstance?.regularDate}"')
64+
assertTrue "Should have rendered a datePicker for sqlDate",
65+
sw.toString().contains('datePicker name="sqlDate" precision="day" value="${scaffoldingTestInstance?.sqlDate}"')
6666
}
6767

6868
void testGenerateNumberSelect() {
6969
def templateGenerator = new DefaultGrailsTemplateGenerator()
7070
gcl.parseClass(testDomain)
7171
def testClass = gcl.loadClass("ScaffoldingTest")
7272

73-
7473
def constrainedProperties = GrailsDomainConfigurationUtil.evaluateConstraints(testClass)
7574
testClass.metaClass.getConstraints = {-> constrainedProperties }
7675

@@ -79,7 +78,7 @@ class ScaffoldingTest {
7978
StringWriter sw = new StringWriter()
8079
templateGenerator.generateView domainClass, "create", sw
8180

82-
83-
assertTrue "Should have rendered a select box for the number editor",sw.toString().contains('g:select name="status" from="${scaffoldingTestInstance.constraints.status.inList}" value="${fieldValue(bean: scaffoldingTestInstance, field: \'status\')}" valueMessagePrefix="scaffoldingTest.status"')
81+
assertTrue "Should have rendered a select box for the number editor",
82+
sw.toString().contains('g:select name="status" from="${scaffoldingTestInstance.constraints.status.inList}" value="${fieldValue(bean: scaffoldingTestInstance, field: \'status\')}" valueMessagePrefix="scaffoldingTest.status"')
8483
}
8584
}

‎src/test/org/codehaus/groovy/grails/scaffolding/GrailsTemplateGeneratorsTests.java‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,42 @@
1717
import grails.util.BuildSettings;
1818
import grails.util.BuildSettingsHolder;
1919
import groovy.lang.GroovyClassLoader;
20+
21+
import java.io.File;
22+
import java.io.StringWriter;
23+
import java.util.Map;
24+
2025
import junit.framework.TestCase;
26+
2127
import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass;
2228
import org.codehaus.groovy.grails.commons.GrailsClassUtils;
2329
import org.codehaus.groovy.grails.commons.GrailsDomainClass;
30+
import org.codehaus.groovy.grails.plugins.MockGrailsPluginManager;
31+
import org.codehaus.groovy.grails.plugins.PluginManagerHolder;
2432
import org.springframework.beans.BeanWrapper;
2533
import org.springframework.beans.BeanWrapperImpl;
2634

27-
import java.io.File;
28-
import java.io.StringWriter;
29-
import java.util.Map;
30-
3135
/**
3236
* @author Graeme Rocher
33-
* @since 09-Feb-2006
3437
*/
38+
@SuppressWarnings("unchecked")
3539
public class GrailsTemplateGeneratorsTests extends TestCase {
3640

41+
@Override
3742
protected void setUp() {
3843
BuildSettings buildSettings = new BuildSettings(new File("."));
3944
BuildSettingsHolder.setSettings(buildSettings);
45+
MockGrailsPluginManager pluginManager = new MockGrailsPluginManager();
46+
PluginManagerHolder.setPluginManager(pluginManager);
47+
pluginManager.registerMockPlugin(DefaultGrailsTemplateGeneratorTests.fakeHibernatePlugin);
4048
}
4149

50+
@Override
4251
protected void tearDown() {
4352
BuildSettingsHolder.setSettings(null);
53+
PluginManagerHolder.setPluginManager(null);
4454
}
4555

46-
4756
public void testGenerateController() throws Exception {
4857
GrailsTemplateGenerator generator;
4958

@@ -55,37 +64,35 @@ public void testGenerateController() throws Exception {
5564
GrailsDomainClass domainClass = new DefaultGrailsDomainClass(dc);
5665

5766
File generatedFile = new File("test/grails-app/controllers/TestController.groovy");
58-
if(generatedFile.exists()) {
59-
generatedFile.delete();
67+
if (generatedFile.exists()) {
68+
generatedFile.delete();
6069
}
6170

62-
6371
StringWriter sw = new StringWriter();
6472
generator.generateController(domainClass,sw);
6573

66-
6774
String text = sw.toString();
6875

6976
Class controllerClass = gcl.parseClass(text);
7077
BeanWrapper bean = new BeanWrapperImpl(controllerClass.newInstance());
71-
78+
7279
assertEquals("TestController", controllerClass.getName());
73-
80+
7481
assertTrue(bean.isReadableProperty("list"));
7582
assertTrue(bean.isReadableProperty("update"));
7683
assertTrue(bean.isReadableProperty("create"));
7784
assertTrue(bean.isReadableProperty("list"));
7885
assertTrue(bean.isReadableProperty("show"));
7986
assertTrue(bean.isReadableProperty("edit"));
8087
assertTrue(bean.isReadableProperty("delete"));
81-
88+
8289
Object propertyValue = GrailsClassUtils.getStaticPropertyValue(controllerClass, "allowedMethods");
8390
assertTrue("allowedMethods property was the wrong type", propertyValue instanceof Map);
8491
Map map = (Map) propertyValue;
8592
assertTrue("allowedMethods did not contain the delete action", map.containsKey("delete"));
8693
assertTrue("allowedMethods did not contain the save action", map.containsKey("save"));
8794
assertTrue("allowedMethods did not contain the update action", map.containsKey("update"));
88-
95+
8996
assertEquals("allowedMethods had incorrect value for delete action", "POST", map.get("delete"));
9097
assertEquals("allowedMethods had incorrect value for save action", "POST", map.get("save"));
9198
assertEquals("allowedMethods had incorrect value for update action", "POST", map.get("update"));
@@ -98,27 +105,23 @@ public void testGenerateViews() throws Exception {
98105

99106
generator = new DefaultGrailsTemplateGenerator();
100107

101-
Class dc = gcl.parseClass("class Test { " +
102-
"\n Long id;" +
103-
"\n Long version;" +
104-
"\n String name;" +
105-
"\n TimeZone tz;" +
106-
"\n Locale locale;" +
107-
"\n Currency currency;" +
108-
"\n Boolean active;" +
109-
"\n Date age }");
108+
Class dc = gcl.parseClass(
109+
"class Test { " +
110+
"\n Long id;" +
111+
"\n Long version;" +
112+
"\n String name;" +
113+
"\n TimeZone tz;" +
114+
"\n Locale locale;" +
115+
"\n Currency currency;" +
116+
"\n Boolean active;" +
117+
"\n Date age }");
110118
GrailsDomainClass domainClass = new DefaultGrailsDomainClass(dc);
111119

112120
generator.generateViews(domainClass,"test");
113121

114-
File showFile = new File("test/grails-app/views/test/show.gsp");
115-
assertTrue(showFile.exists());
116-
File listFile = new File("test/grails-app/views/test/list.gsp");
117-
assertTrue(listFile.exists());
118-
File editFile = new File("test/grails-app/views/test/edit.gsp");
119-
assertTrue(editFile.exists());
120-
File createFile = new File("test/grails-app/views/test/create.gsp");
121-
assertTrue(createFile.exists());
122+
assertTrue(new File("test/grails-app/views/test/show.gsp").exists());
123+
assertTrue(new File("test/grails-app/views/test/list.gsp").exists());
124+
assertTrue(new File("test/grails-app/views/test/edit.gsp").exists());
125+
assertTrue(new File("test/grails-app/views/test/create.gsp").exists());
122126
}
123-
124127
}

0 commit comments

Comments
 (0)