Add Artefact annotation for Grails artefacts defined in test classes

- @ArteFact("Controller") for controllers - @ArteFact("TagLib") for taglibs
grails · Jan 28, 2014 · 895dab2 · 895dab2
1 parent 6548b2d
commit 895dab2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndMockForTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndMockForTests.groovy
@@ -1,5 +1,7 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact
+
 /**
  *
  */
@@ -31,6 +33,8 @@ class ControllerAndMockForTests {
     }
 
 }
+
+@Artefact("Controller")
 class MyController {
 
     def index() {

diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy
@@ -1,5 +1,6 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact;
 import grails.converters.JSON
 import grails.converters.XML
 import grails.test.mixin.web.ControllerUnitTestMixin
@@ -400,6 +401,7 @@ class ControllerUnitTestMixinTests extends GroovyTestCase {
     }
 }
 
+@Artefact("Controller")
 class TestController {
 
     static allowedMethods = [action2: 'POST', action3: ['POST', 'PUT'], method2: 'POST', method3: ['POST', 'PUT']]
@@ -546,6 +548,7 @@ class TestCommand {
     }
 }
 
+@Artefact("Controller")
 class SubController extends TestController {
     def method1() {
         super.method1()

diff --git a/...ls-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy b/...ls-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy
@@ -1,5 +1,7 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact;
+
 import org.junit.Test
 
 /**
@@ -36,6 +38,7 @@ class ControllerWithMockCollabTests {
     }
 }
 
+@Artefact("Controller")
 class ControllerWithCollabController {
 
     def myCallable

diff --git a/...ite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy b/...ite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy
@@ -1,5 +1,6 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact;
 import grails.converters.XML
 import grails.persistence.Entity
 
@@ -238,6 +239,7 @@ class Author {
     static hasMany = [books: Book]
 }
 
+@Artefact("Controller")
 class BookController {
 
     static allowedMethods = [save: "POST", update: "POST", delete: "POST"]

diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/FiltersUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/FiltersUnitTestMixinTests.groovy
@@ -1,5 +1,6 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact;
 import grails.test.GrailsMock
 import grails.test.mixin.web.FiltersUnitTestMixin
 import org.junit.Before
@@ -117,6 +118,7 @@ class FiltersUnitTestMixinTests {
     }
 }
 
+@Artefact("Controller")
 class AuthorController {
     def list = { [authors:['bob', 'fred']]}
 }

diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy
@@ -1,5 +1,6 @@
 package grails.test.mixin
 
+import grails.artefact.Artefact
 import grails.test.mixin.web.UrlMappingsUnitTestMixin
 import grails.web.Action
 import junit.framework.AssertionFailedError
@@ -162,15 +163,17 @@ class AnotherUrlMappings {
     }
 }
 
+@Artefact("Controller")
 class GrailsUrlMappingsTestCaseFakeController {
    static defaultAction = 'action1'
-   @Action def action1(){}
-   @Action def action2(){}
-   @Action def action3(){}
+   def action1(){}
+   def action2(){}
+   def action3(){}
 }
 
+@Artefact("Controller")
 class UserController {
-    @Action def publicProfile() {}
+    def publicProfile() {}
 }
 
 class MyUrlMappings {

diff --git a/.../groovy/org/codehaus/groovy/grails/web/converters/ControllerWithXmlConvertersTests.groovy b/.../groovy/org/codehaus/groovy/grails/web/converters/ControllerWithXmlConvertersTests.groovy
@@ -1,5 +1,6 @@
 package org.codehaus.groovy.grails.web.converters
 
+import grails.artefact.Artefact;
 import grails.converters.XML
 import grails.test.mixin.TestFor
 
@@ -22,6 +23,7 @@ class ControllerWithXmlConvertersTests {
     }
 }
 
+@Artefact("Controller")
 class XmlController {
 
      def convertArray() {

diff --git a/...e-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/TagLibMethodMissingSpec.groovy b/...e-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/TagLibMethodMissingSpec.groovy
@@ -1,13 +1,8 @@
 package org.codehaus.groovy.grails.web.pages
 
-import org.junit.BeforeClass;
-
+import grails.artefact.Artefact
 import grails.test.AbstractGrailsEnvChangingSpec
-
-import spock.lang.Specification
 import grails.test.mixin.TestFor
-import grails.util.Environment;
-import grails.artefact.Artefact
 
 @TestFor(TagLibMethodMissingTagLib)
 class TagLibMethodMissingSpec extends AbstractGrailsEnvChangingSpec {
@@ -73,6 +68,7 @@ class TagLibMethodMissingTagLib {
     }
 }
 
+@Artefact("TagLib")
 class TagLibMethodMissingBTagLib {
     static namespace = "other"