Merge branch '2.1.x' into 2.2.x

Author: graemerocher

grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy

@@ -122,17 +122,18 @@ class DomainClassUnitTestMixin extends GrailsUnitTestMixin {
 
     def mockDomains(Class... domainsClassToMock) {
         initialMockDomainSetup()
-        for(Class c in domainsClassToMock) {
-            PersistentEntity entity = simpleDatastore.mappingContext.addPersistentEntity(c)
+        Collection<PersistentEntity> entities = simpleDatastore.mappingContext.addPersistentEntities(domainsClassToMock)
+        for(PersistentEntity entity in entities) {
+            final c = entity.javaClass
             GrailsDomainClass domain = registerGrailsDomainClass(c)
 
             Validator validator = registerDomainClassValidator(domain)
             simpleDatastore.mappingContext.addEntityValidator(entity, validator)
 
         }
         def enhancer = new GormEnhancer(simpleDatastore, transactionManager)
-        enhancer.enhance()
         simpleDatastore.mappingContext.initialize()
+        enhancer.enhance()
     }
     /**
      * Mocks a domain class providing the equivalent GORM behavior but against an in-memory concurrent hash map instead