Move test class and fix IT

CJSCommonPlatform · Nov 11, 2019 · 5e4ad4f · 5e4ad4f
1 parent 0c4c4fe
commit 5e4ad4f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.../java/uk/gov/justice/services/eventsourcing/publishedevent/prepublish/EventPublishIT.java b/.../java/uk/gov/justice/services/eventsourcing/publishedevent/prepublish/EventPublishIT.java
@@ -40,6 +40,7 @@
 import uk.gov.justice.services.eventsourcing.util.jee.timer.TimerCanceler;
 import uk.gov.justice.services.eventsourcing.util.jee.timer.TimerConfigFactory;
 import uk.gov.justice.services.eventsourcing.util.jee.timer.TimerServiceManager;
+import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
 import uk.gov.justice.services.framework.utilities.exceptions.StackTraceProvider;
 import uk.gov.justice.services.jdbc.persistence.JdbcDataSourceProvider;
 import uk.gov.justice.services.jdbc.persistence.JdbcResultSetStreamer;
@@ -57,6 +58,7 @@
 import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider;
 import uk.gov.justice.services.test.utils.core.eventsource.EventStoreInitializer;
 import uk.gov.justice.services.test.utils.core.messaging.Poller;
+import uk.gov.justice.services.test.utils.eventlog.EventLogTriggerManipulatorFactory;
 import uk.gov.justice.services.test.utils.events.EventStoreDataAccess;
 import uk.gov.justice.services.test.utils.messaging.jms.DummyJmsEnvelopeSender;
 import uk.gov.justice.services.test.utils.persistence.OpenEjbEventStoreDataSourceProvider;
@@ -104,12 +106,16 @@ public class EventPublishIT {
     private final Clock clock = new UtcClock();
 
     private EventStoreDataAccess eventStoreDataAccess;
+    private EventLogTriggerManipulatorFactory eventLogTriggerManipulatorFactory = new EventLogTriggerManipulatorFactory();
 
     @Before
     public void initializeDatabase() throws Exception {
         final DataSource eventStoreDataSource = eventStoreDataSourceProvider.getDefaultDataSource();
         eventStoreInitializer.initializeEventStore(eventStoreDataSource);
         eventStoreDataAccess = new EventStoreDataAccess(eventStoreDataSource);
+
+        final EventLogTriggerManipulator eventLogTriggerManipulator = eventLogTriggerManipulatorFactory.create(eventStoreDataSource);
+        eventLogTriggerManipulator.addTriggerToEventLogTable();
     }
 
     @Module

diff --git a/.../test/java/uk/gov/justice/services/eventsourcing/publishedevent/jdbc/EventDeQueuerIT.java b/.../test/java/uk/gov/justice/services/eventsourcing/publishedevent/jdbc/EventDeQueuerIT.java
@@ -8,7 +8,7 @@
 
 import uk.gov.justice.services.common.util.Clock;
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventsourcing.publishedevent.publish.helpers.EventLogTriggerManipulatorFactory;
+import uk.gov.justice.services.test.utils.eventlog.EventLogTriggerManipulatorFactory;
 import uk.gov.justice.services.eventsourcing.repository.jdbc.event.Event;
 import uk.gov.justice.services.eventsourcing.source.core.EventStoreDataSourceProvider;
 import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;

diff --git a/.../java/uk/gov/justice/services/eventsourcing/publishedevent/publish/EventLogPublishIT.java b/.../java/uk/gov/justice/services/eventsourcing/publishedevent/publish/EventLogPublishIT.java
@@ -13,7 +13,7 @@
 import static uk.gov.justice.services.test.utils.events.EventBuilder.eventBuilder;
 
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.eventsourcing.publishedevent.publish.helpers.EventLogTriggerManipulatorFactory;
+import uk.gov.justice.services.test.utils.eventlog.EventLogTriggerManipulatorFactory;
 import uk.gov.justice.services.eventsourcing.repository.jdbc.event.Event;
 import uk.gov.justice.services.eventsourcing.util.sql.triggers.EventLogTriggerManipulator;
 import uk.gov.justice.services.messaging.JsonEnvelope;

diff --git a/test-utils-event-store/test-utils-event/pom.xml b/test-utils-event-store/test-utils-event/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>event-store-management-commands</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-store-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!--Test dependencies-->
         <dependency>

diff --git a/...rs/EventLogTriggerManipulatorFactory.java → ...og/EventLogTriggerManipulatorFactory.java b/...rs/EventLogTriggerManipulatorFactory.java → ...og/EventLogTriggerManipulatorFactory.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.eventsourcing.publishedevent.publish.helpers;
+package uk.gov.justice.services.test.utils.eventlog;
 
 import static org.slf4j.LoggerFactory.getLogger;
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;