cleaning up the conversion to gradle-project changes.

mattmoss · May 11, 2015 · 74e0f66 · 74e0f66
1 parent aef0f49
commit 74e0f66
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 170 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ target-eclipse/
 .DS_Store
 .link_to_grails_plugins
 /build/
+/bin/
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
@@ -56,6 +56,8 @@ grails:
     hibernate:
         cache:
             queries: false
+            second_level_cache: true
+            provider_class: 'net.sf.ehcache.hibernate.EhCacheProvider'
     views:
         default:
             codec: html
@@ -76,11 +78,6 @@ dataSource:
     username: sa
     password:
 
-hibernate
-    cache.use_second_level_cache = true
-    cache.use_query_cache = true
-    cache.provider_class = 'net.sf.ehcache.hibernate.EhCacheProvider'
-
 environments:
     development:
         dataSource:

diff --git a/grails-app/controllers/UrlMappings.groovy b/grails-app/controllers/UrlMappings.groovy
@@ -16,7 +16,7 @@
 
 class UrlMappings {
 
-	static mappings = {
+	/*static mappings = {
 		"/$controller/$action?/$id?"{
 			constraints {
 				// apply constraints here
@@ -25,5 +25,5 @@ class UrlMappings {
 
 		"/"(view:"/index")
 		"500"(view:'/error')
-	}
+	}*/
 }
diff --git a/src/main/groovy/EnversGrailsPlugin.groovy b/src/main/groovy/EnversGrailsPlugin.groovy
diff --git a/src/test/groovy/net/lucasward/grails/plugin/EnversPluginSupportTests.groovy b/src/test/groovy/net/lucasward/grails/plugin/EnversPluginSupportTests.groovy
@@ -16,33 +16,45 @@
 
 package net.lucasward.grails.plugin
 
-import grails.test.GrailsMock
+import junit.framework.TestCase;
+import grails.test.mixin.Mock
 import grails.test.mixin.TestFor
-import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass
-import org.codehaus.groovy.grails.commons.GrailsDomainClass
+import grails.test.mixin.TestMixin
+import grails.test.mixin.support.GrailsUnitTestMixin
+import org.grails.core.DefaultGrailsDomainClass
+
+import grails.core.GrailsDomainClass
+
 import org.hibernate.SessionFactory
 import org.hibernate.envers.DefaultRevisionEntity
 import org.hibernate.envers.RevisionType
 
+/**
+ * TODO figure out how to use spock-mocking api without the unit-test syntax overhead.
+ * Create a spock helper
+ * @author Labi Oyapero
+ *
+ */
 @TestFor(Customer)
-class EnversPluginSupportTests {
+@TestMixin(GrailsUnitTestMixin)
+class EnversPluginSupportTests extends TestCase{
 
-    void testIsAudited() {
+    public void testIsAudited() {
         def gc = new DefaultGrailsDomainClass(Address)
         assert EnversPluginSupport.isAudited(gc) == true
     }
 
-    void testIsNotAudited() {
+    public void testIsNotAudited() {
         def gc = new DefaultGrailsDomainClass(State)
         assert EnversPluginSupport.isAudited(gc) == false
     }
 
-    void testIsAuditedAtFieldLevelOnly() {
+    public void testIsAuditedAtFieldLevelOnly() {
         def gc = new DefaultGrailsDomainClass(User)
         assert EnversPluginSupport.isAudited(gc) == true
     }
 
-    void testCollapseRevisions() {
+    public void testCollapseRevisions() {
         Customer user = new Customer(name: 'collapseTest');
         DefaultRevisionEntity revisionEntity = new DefaultRevisionEntity(id: 1)
         RevisionType revType = RevisionType.ADD
@@ -55,41 +67,37 @@ class EnversPluginSupportTests {
         assert collapsed.revisionType == RevisionType.ADD
     }
 
-    void testCollapseRevisionsWithTooSmallArray() {
+    public void testCollapseRevisionsWithTooSmallArray() {
         shouldFail {
             EnversPluginSupport.collapseRevision([])
         }
     }
 
-    void testCollapseRevisionsWithTooLargeArray() {
+    public void testCollapseRevisionsWithTooLargeArray() {
         shouldFail {
             EnversPluginSupport.collapseRevision([1, 2, 3, 4])
         }
     }
 
-    void testGenerateFindAllMethods() {
-        GrailsMock sessionFactory = mockFor(SessionFactory)
+    public void testGenerateFindAllMethods() {
+        SessionFactory sessionFactory = [] as SessionFactory;
         GrailsDomainClass gdc = new DefaultGrailsDomainClass(Customer.class)
-        EnversPluginSupport.generateFindAllMethods(gdc, sessionFactory.createMock())
+        EnversPluginSupport.generateFindAllMethods(gdc, sessionFactory)//.createMock()
 
         assert Customer.metaClass.getStaticMetaMethod("findAllRevisionsByEmail", ["Email"]) != null
         assert Customer.metaClass.getStaticMetaMethod("findAllRevisionsByName", ["Email"]) != null
         assert Customer.metaClass.getStaticMetaMethod("findAllRevisionsByAddress", ["Email"]) != null
         assert Customer.metaClass.getStaticMetaMethod("findAllRevisionsById", ["Email"]) != null
-
-        sessionFactory.verify()
     }
 
-    void testGenerateAuditReaderMethods() {
-        GrailsMock sessionFactory = mockFor(SessionFactory)
+    public void testGenerateAuditReaderMethods() {
+        SessionFactory sessionFactory = [] as SessionFactory;
         GrailsDomainClass gdc = new DefaultGrailsDomainClass(Customer.class)
-        EnversPluginSupport.generateAuditReaderMethods(gdc, sessionFactory.createMock())
+        EnversPluginSupport.generateAuditReaderMethods(gdc, sessionFactory)//sessionFactory.createMock()
 
         assert Customer.metaClass.getStaticMetaMethod("getCurrentRevision", []) != null
         assert Customer.metaClass.getMetaMethod("retrieveRevisions", []) != null
         assert Customer.metaClass.getMetaMethod("findAtRevision", [3]) != null
-
-        sessionFactory.verify()
     }
 
 }
diff --git a/src/test/groovy/net/lucasward/grails/plugin/PaginationHandlerTests.groovy b/src/test/groovy/net/lucasward/grails/plugin/PaginationHandlerTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+   * Copyright 2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,52 +16,55 @@
 
 package net.lucasward.grails.plugin
 
+import junit.framework.TestCase;
+
 import org.hibernate.envers.query.AuditQuery
-import grails.test.GrailsMock
+
 import grails.test.mixin.TestFor
+import grails.test.mixin.TestMixin;
+import grails.test.mixin.support.GrailsUnitTestMixin;
+
 import org.junit.Before
 
+import spock.lang.Specification;
+
 @TestFor(Customer)
-class PaginationHandlerTests {
+@TestMixin(GrailsUnitTestMixin)
+class PaginationHandlerTests extends TestCase{
 
     PaginationHandler handler
 
-    @Before
-    void before() {
+    void setUp() {
         handler = new PaginationHandler()
     }
 
     void testAddMax() {
-        GrailsMock mockQuery = mockFor(AuditQuery)
-        mockQuery.demand.setMaxResults(1) {int i -> assert i == 10}
-
-        handler.addPagination(mockQuery.createMock(), [max: 10])
-
-        mockQuery.verify()
+        AuditQuery mockQuery = [setMaxResults: {int i -> assert i == 10}] as AuditQuery;
+        /*AuditQuery mockQuery = Mock(AuditQuery)
+        mockQuery.demand.setMaxResults(1) */
+        handler.addPagination(mockQuery, [max: 10])
     }
 
     void testCallWithoutMax() {
-        GrailsMock mockQuery = mockFor(AuditQuery)
-
-        handler.addPagination(mockQuery.createMock(), [:])
-
-        mockQuery.verify()
+      AuditQuery mockQuery = [] as AuditQuery;
+        //AuditQuery mockQuery = Mock(AuditQuery)
+      handler.addPagination(mockQuery, [:])
     }
 
     void testAddOffset() {
-        GrailsMock mockQuery = mockFor(AuditQuery)
-        mockQuery.demand.setFirstResult(1) {int i -> assert i == 10}
-
-        handler.addPagination(mockQuery.createMock(), [offset: 10])
+      AuditQuery mockQuery = [setFirstResult: {int i -> assert i == 10}] as AuditQuery;
+        //AuditQuery mockQuery = Mock(AuditQuery)
+        //mockQuery.demand.setFirstResult(1) {int i -> assert i == 10}
 
-        mockQuery.verify()
+        handler.addPagination(mockQuery, [offset: 10])
     }
 
     void testCallWithoutOffset() {
-        GrailsMock mockQuery = mockFor(AuditQuery)
+      AuditQuery mockQuery = [] as AuditQuery;
+        //AuditQuery mockQuery = Mock(AuditQuery)
 
-        handler.addPagination(mockQuery.createMock(), [:])
+        handler.addPagination(mockQuery, [:])
 
-        mockQuery.verify()
+        //mockQuery.verify()
     }
 }
diff --git a/src/test/groovy/net/lucasward/grails/plugin/PropertyNameAuditOrderTests.groovy b/src/test/groovy/net/lucasward/grails/plugin/PropertyNameAuditOrderTests.groovy
@@ -16,16 +16,18 @@
 
 package net.lucasward.grails.plugin
 
-import grails.test.GrailsMock
 import grails.test.mixin.TestFor
+
 import org.hibernate.envers.query.AuditEntity
 import org.hibernate.envers.query.AuditQuery
 import org.hibernate.envers.query.criteria.AuditProperty
 import org.hibernate.envers.query.order.AuditOrder
 import org.junit.Before
 
+import spock.lang.Specification;
+
 @TestFor(Customer)
-class PropertyNameAuditOrderTests {
+class PropertyNameAuditOrderTests extends Specification {
 
     PropertyNameAuditOrder auditOrder
     String propertyName = "name"
@@ -84,10 +86,10 @@ class PropertyNameAuditOrderTests {
     }
 
     private void withMock(Map options, Closure doIt) {
-        GrailsMock queryMock = mockFor(AuditQuery, true)
-        GrailsMock propertyMock = mockFor(AuditProperty, true)
-        GrailsMock orderMock = mockFor(AuditOrder, true)
-        GrailsMock auditEntityMock = mockFor(AuditEntity, true)
+        AuditQuery queryMock = Mock(AuditQuery)
+        AuditProperty propertyMock = Mock(AuditProperty)
+        AuditOrder orderMock = Mock(AuditOrder)
+        AuditEntity auditEntityMock = Mock(AuditEntity)
 
         propertyMock.demand.desc(0..100) {->
             return orderMock.createMock()