refactored test cases

mr-serjey · Feb 16, 2016 · 213b695 · 213b695
1 parent a4137bb
commit 213b695
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 44 deletions.
diff --git a/...events-jpa/src/test/java/org/jasig/cas/support/events/jpa/JpaCasEventRepositoryTests.java b/...events-jpa/src/test/java/org/jasig/cas/support/events/jpa/JpaCasEventRepositoryTests.java
@@ -1,20 +1,12 @@
 package org.jasig.cas.support.events.jpa;
 
-import org.jasig.cas.mock.MockTicketGrantingTicket;
-import org.jasig.cas.support.events.CasTicketGrantingTicketCreatedEvent;
-import org.jasig.cas.support.events.dao.CasEvent;
+import org.jasig.cas.support.events.AbstractCasEventRepositoryTests;
 import org.jasig.cas.support.events.dao.CasEventRepository;
-import org.jasig.cas.ticket.TicketGrantingTicket;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.Collection;
-
-import static org.junit.Assert.*;
-
 /**
  * Test cases for {@link JpaCasEventRepository}.
  *
@@ -23,26 +15,13 @@
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/jpa-eventscontext-test.xml")
-public class JpaCasEventRepositoryTests {
+public class JpaCasEventRepositoryTests extends AbstractCasEventRepositoryTests {
 
     @Autowired
     private CasEventRepository repository;
 
-    @Test
-    public void verifySave() {
-        final TicketGrantingTicket ticket = new MockTicketGrantingTicket("casuser");
-        final CasTicketGrantingTicketCreatedEvent event = new CasTicketGrantingTicketCreatedEvent(this, ticket);
-
-        final CasEvent dto = new CasEvent();
-        dto.setType(event.getClass().getCanonicalName());
-        dto.putTimestamp(event.getTimestamp());
-        dto.putCreationTime(event.getTicketGrantingTicket().getCreationTime());
-        dto.putId(event.getTicketGrantingTicket().getId());
-
-        this.repository.save(dto);
-
-        final Collection<CasEvent> col = this.repository.load();
-        assertEquals(col.size(), 1);
-        assertFalse(col.stream().findFirst().get().getProperties().isEmpty());
+    @Override
+    public CasEventRepository getRepositoryInstance() {
+        return this.repository;
     }
 }
diff --git a/...ongo/src/test/java/org/jasig/cas/support/events/mongo/MongoDbCasEventRepositoryTests.java b/...ongo/src/test/java/org/jasig/cas/support/events/mongo/MongoDbCasEventRepositoryTests.java
@@ -1,11 +1,7 @@
 package org.jasig.cas.support.events.mongo;
 
-import org.jasig.cas.mock.MockTicketGrantingTicket;
-import org.jasig.cas.support.events.CasTicketGrantingTicketCreatedEvent;
-import org.jasig.cas.support.events.dao.CasEvent;
+import org.jasig.cas.support.events.AbstractCasEventRepositoryTests;
 import org.jasig.cas.support.events.dao.CasEventRepository;
-import org.jasig.cas.ticket.TicketGrantingTicket;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -19,22 +15,13 @@
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/mongo-cloudtest-eventscontext.xml")
-public class MongoDbCasEventRepositoryTests {
+public class MongoDbCasEventRepositoryTests extends AbstractCasEventRepositoryTests {
 
     @Autowired
     private CasEventRepository repository;
 
-    @Test
-    public void verifySave() {
-        final TicketGrantingTicket ticket = new MockTicketGrantingTicket("casuser");
-        final CasTicketGrantingTicketCreatedEvent event = new CasTicketGrantingTicketCreatedEvent(this, ticket);
-
-        final CasEvent dto = new CasEvent();
-        dto.setType(event.getClass().getCanonicalName());
-        dto.putTimestamp(event.getTimestamp());
-        dto.putCreationTime(event.getTicketGrantingTicket().getCreationTime());
-        dto.putId(event.getTicketGrantingTicket().getId());
-
-        this.repository.save(dto);
+    @Override
+    public CasEventRepository getRepositoryInstance() {
+        return this.repository;
     }
 }
diff --git a/cas-server-core-events/build.gradle b/cas-server-core-events/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     compile project(':cas-server-core-web')
     compile libraries.spring
     compile libraries.hibernate
+    testCompile project(path: ":cas-server-core-tickets", configuration: "tests")
 }
 
 
diff --git a/...re-events/src/test/java/org/jasig/cas/support/events/AbstractCasEventRepositoryTests.java b/...re-events/src/test/java/org/jasig/cas/support/events/AbstractCasEventRepositoryTests.java
@@ -0,0 +1,41 @@
+package org.jasig.cas.support.events;
+
+import org.jasig.cas.mock.MockTicketGrantingTicket;
+import org.jasig.cas.support.events.dao.CasEvent;
+import org.jasig.cas.support.events.dao.CasEventRepository;
+import org.jasig.cas.ticket.TicketGrantingTicket;
+import org.junit.Test;
+
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+/**
+ * This is {@link AbstractCasEventRepositoryTests}.
+ *
+ * @author Misagh Moayyed
+ * @since 4.3.0
+ */
+public abstract class AbstractCasEventRepositoryTests {
+
+    @Test
+    public void verifySave() {
+        final TicketGrantingTicket ticket = new MockTicketGrantingTicket("casuser");
+        final CasTicketGrantingTicketCreatedEvent event = new CasTicketGrantingTicketCreatedEvent(this, ticket);
+
+        final CasEvent dto = new CasEvent();
+        dto.setType(event.getClass().getCanonicalName());
+        dto.putTimestamp(event.getTimestamp());
+        dto.putCreationTime(event.getTicketGrantingTicket().getCreationTime());
+        dto.putId(event.getTicketGrantingTicket().getId());
+        dto.setPrincipalId(event.getTicketGrantingTicket().getAuthentication().getPrincipal().getId());
+
+        getRepositoryInstance().save(dto);
+
+        final Collection<CasEvent> col = getRepositoryInstance().load();
+        assertEquals(col.size(), 1);
+        assertFalse(col.stream().findFirst().get().getProperties().isEmpty());
+    }
+
+    public abstract CasEventRepository getRepositoryInstance();
+}