#1265 Fixed test

Author: puneetbehl

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DirtyCheckingAfterListenerSpec.groovy

@@ -1,7 +1,6 @@
 package grails.gorm.tests
 
-import grails.gorm.services.Service
-import grails.gorm.tests.GormDatastoreSpec
+import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.GormEntity
 import org.grails.datastore.gorm.events.ConfigurableApplicationEventPublisher
 import org.grails.datastore.mapping.core.Datastore
@@ -12,19 +11,22 @@ import org.grails.datastore.mapping.engine.event.PreUpdateEvent
 import org.springframework.context.ApplicationEvent
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.context.ConfigurableApplicationContext
+import spock.util.concurrent.PollingConditions
 
 class DirtyCheckingAfterListenerSpec extends GormDatastoreSpec {
 
     TestSaveOrUpdateEventListener listener
+    def datastore
 
     @Override
     List getDomainClasses() {
         return [Player]
     }
 
     def setup() {
-        listener = new TestSaveOrUpdateEventListener(session.datastore)
-        ApplicationEventPublisher publisher = session.datastore.applicationEventPublisher
+        datastore = session.datastore
+        listener = new TestSaveOrUpdateEventListener(datastore)
+        ApplicationEventPublisher publisher = datastore.applicationEventPublisher
         if (publisher instanceof ConfigurableApplicationEventPublisher) {
             ((ConfigurableApplicationEventPublisher) publisher).addApplicationListener(listener)
         } else if (publisher instanceof ConfigurableApplicationContext) {
@@ -34,49 +36,48 @@ class DirtyCheckingAfterListenerSpec extends GormDatastoreSpec {
 
     void "test state change from listener update the object"() {
 
-        setup:
-        PlayerService playerService = session.datastore.getService(PlayerService)
-        Player john = playerService.save("John")
+        when:
+        new Player(name: "John").save()
+
+        then:
+        new PollingConditions().eventually { listener.isExecuted && Player.count()}
 
         when:
         session.flush()
-        john = playerService.find("John")
+        session.clear()
+        Player john = Player.get(john.id)
 
         then:
         john.attributes
         john.attributes.size() == 3
-    }
-
-    static class TestSaveOrUpdateEventListener extends AbstractPersistenceEventListener {
-
-        TestSaveOrUpdateEventListener(Datastore datastore) {
-            super(datastore)
-        }
-
-        @Override
-        protected void onPersistenceEvent(AbstractPersistenceEvent event) {
-            Player player = (Player) event.entityObject
-            player.attributes = ["test0", "test1", "test2"]
-        }
 
-        @Override
-        boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
-            return eventType == PreUpdateEvent || eventType == PreInsertEvent
-        }
     }
 }
 
+@Entity
 class Player implements GormEntity<Player> {
     String name
     List<String> attributes
 
 }
 
-@Service(Player)
-interface PlayerService {
+class TestSaveOrUpdateEventListener extends AbstractPersistenceEventListener {
 
-    Player save(String name)
+    boolean isExecuted = false
 
-    Player find(String name)
-}
+    TestSaveOrUpdateEventListener(Datastore datastore) {
+        super(datastore)
+    }
+
+    @Override
+    protected void onPersistenceEvent(AbstractPersistenceEvent event) {
+        Player player = (Player) event.entityObject
+        player.attributes = ["test0", "test1", "test2"]
+        isExecuted = true
+    }
 
+    @Override
+    boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+        return eventType == PreUpdateEvent || eventType == PreInsertEvent
+    }
+}