eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-15 16:51:07 +00:00
Code Activity

fix test failures due to previous refactoring of abstract replication test classes

Browse Source
This commit is contained in:
Fredrik Teschke committed 2015-02-14 06:51:39 +01:00
1 parent ebb47e2900
commit 6b6c657452
7 files changed
+41 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
+5
View File
@@ -14,6 +14,11 @@ import com.sap.sse.mongodb.MongoDBService;
public abstract class AbstractServerReplicationTest extends com.sap.sse.replication.testsupport.AbstractServerWithSingleServiceReplicationTest<RacingEventService, RacingEventServiceImpl> {
protected ServerReplicationTestSetUp testSetUp;
protected AbstractServerReplicationTest(ServerReplicationTestSetUp testSetUp) {
super(testSetUp);
this.testSetUp = testSetUp;
}
public AbstractServerReplicationTest() {
super(new ServerReplicationTestSetUp());
testSetUp = (ServerReplicationTestSetUp) super.testSetUp;
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java
+6 -4
View File
@@ -12,7 +12,6 @@ import java.util.List;
import java.util.UUID;
import java.util.logging.Logger;
import org.junit.Before;
import org.junit.Test;
import com.rabbitmq.client.Channel;
@@ -33,6 +32,10 @@ import com.sap.sse.replication.impl.ReplicationMasterDescriptorImpl;
public class ConnectionResetAndReconnectTest extends AbstractServerReplicationTest {
static final Logger logger = Logger.getLogger(ConnectionResetAndReconnectTest.class.getName());
public ConnectionResetAndReconnectTest() {
super(new ServerReplicationTestSetUp());
}
public static boolean forceStopDelivery = false;
static class QueuingConsumerTest extends QueueingConsumer {
@@ -81,9 +84,8 @@ public class ConnectionResetAndReconnectTest extends AbstractServerReplicationTe
}
protected static class ServerReplicationTestSetUp extends
private static class ServerReplicationTestSetUp extends
com.sap.sailing.server.replication.test.AbstractServerReplicationTest.ServerReplicationTestSetUp {
@Before
@Override
public void setUp() throws Exception {
try {
@@ -106,7 +108,7 @@ public class ConnectionResetAndReconnectTest extends AbstractServerReplicationTe
/* until here both instances should have the same in-memory state.
* now lets add an event on master and stop the messaging queue. */
stopMessagingExchange();
testSetUp.getReplicaReplicator().startToReplicateFrom(testSetUp.getMasterDescriptor());
replicaReplicator.startToReplicateFrom(masterDescriptor);
Event event = addEventOnMaster();
Thread.sleep(1000); // wait for master queue to get filled
assertNull(replica.getEvent(event.getId()));
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
+12 -11
View File
@@ -15,20 +15,21 @@ import com.sap.sailing.server.operationaltransformation.CreateFlexibleLeaderboar
import com.sap.sse.common.Util.Pair;
import com.sap.sse.replication.ReplicationMasterDescriptor;
import com.sap.sse.replication.impl.ReplicationReceiver;
import com.sap.sse.replication.testsupport.AbstractServerReplicationTestSetUp.ReplicationServiceTestImpl;
public class PrematureOperationReceiptTest extends AbstractServerReplicationTest {
private ReplicationReceiver replicator;
private static ReplicationReceiver replicator;
public PrematureOperationReceiptTest() {
super(new ServerReplicationTestSetUp());
}
/**
* Drops the test DB. Sets up master and replica, starts the JMS message broker and registers the replica with the master.
*/
@Before
@Override
public void setUp() throws Exception {
Pair<ReplicationServiceTestImpl<RacingEventService>, ReplicationMasterDescriptor> result =
basicSetUp(/* dropDB */ true, /* master=null means create a new one */ null, /* replica=null means create a new one */ null);
replicator = replicaReplicator.startToReplicateFromButDontYetFetchInitialLoad(result.getB(), /* startReplicatorSuspended */ true);
private static class ServerReplicationTestSetUp extends AbstractServerReplicationTest.ServerReplicationTestSetUp {
@Override
public void setUp() throws Exception {
Pair<ReplicationServiceTestImpl<RacingEventService>, ReplicationMasterDescriptor> result =
basicSetUp(/* dropDB */ true, /* master=null means create a new one */ null, /* replica=null means create a new one */ null);
replicator = replicaReplicator.startToReplicateFromButDontYetFetchInitialLoad(result.getB(), /* startReplicatorSuspended */ true);
}
}
/**
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
+11 -24
View File
@@ -38,36 +38,23 @@ import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.RegattaLeaderboard;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
import com.sap.sailing.server.operationaltransformation.AddColumnToSeries;
import com.sap.sailing.server.operationaltransformation.CreateRegattaLeaderboard;
import com.sap.sailing.server.operationaltransformation.RenameLeaderboard;
import com.sap.sse.common.Util;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sse.replication.ReplicationMasterDescriptor;
import com.sap.sse.replication.testsupport.AbstractServerReplicationTestSetUp.ReplicationServiceTestImpl;
public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog, RaceLogEvent, RaceLogEventVisitor> {
private Pair<ReplicationServiceTestImpl<RacingEventService>, ReplicationMasterDescriptor> replicationDescriptorPair;
private RaceLogEvent raceLogEvent;
private RaceLogEvent anotherRaceLogEvent;
private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1);
@Before
@Override
public void setUp() throws Exception {
public void createEvents() throws Exception {
raceLogEvent = RaceLogEventFactory.INSTANCE.createRaceStatusEvent(new MillisecondsTimePoint(1), author, 42, RaceLogRaceStatus.UNKNOWN);
anotherRaceLogEvent = RaceLogEventFactory.INSTANCE.createRaceStatusEvent(new MillisecondsTimePoint(2), author, 42, RaceLogRaceStatus.UNKNOWN);
try {
replicationDescriptorPair = basicSetUp(/* dropDB */ true, null, null);
} catch (Exception e) {
e.printStackTrace();
tearDown();
}
}
@Test
@@ -78,7 +65,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
final String raceColumnName = "R1";
Regatta regatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RaceLog masterLog = setupRaceColumn(regatta, seriesName, raceColumnName, fleetName);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, regatta);
addAndValidateEventIds(masterLog, replicaLog);
}
@@ -92,7 +79,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
Regatta masterRegatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RaceLog masterLog = setupRaceColumn(masterRegatta, seriesName, raceColumnName, fleetName);
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, masterRegatta);
addAndValidateEventIds(masterLog, replicaLog);
}
@@ -105,7 +92,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
final String raceColumnName = "R1";
Regatta masterRegatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RaceLog masterLog = setupRaceColumn(masterRegatta, seriesName, raceColumnName, fleetName);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, masterRegatta);
addAndValidateEventIds(masterLog, replicaLog, raceLogEvent);
}
@@ -117,7 +104,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
final String raceColumnName = "R1";
FlexibleLeaderboard masterLeaderboard = setupFlexibleLeaderboard(leaderboardName);
RaceLog masterLog = setupRaceColumn(leaderboardName, fleetName, raceColumnName);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(fleetName, raceColumnName, masterLeaderboard);
addAndValidateEventIds(masterLog, replicaLog, raceLogEvent);
}
@@ -131,7 +118,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
Regatta masterRegatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RaceLog masterLog = setupRaceColumn(masterRegatta, seriesName, raceColumnName, fleetName);
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, masterRegatta);
addAndValidateEventIds(masterLog, replicaLog, anotherRaceLogEvent);
}
@@ -146,7 +133,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
RaceLog masterLog = setupRaceColumn(masterRegatta, seriesName, raceColumnName, fleetName);
raceLogEvent = RaceLogEventFactory.INSTANCE.createCourseDesignChangedEvent(MillisecondsTimePoint.now(), author, 43, createCourseData());
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, masterRegatta);
anotherRaceLogEvent = RaceLogEventFactory.INSTANCE.createCourseDesignChangedEvent(MillisecondsTimePoint.now(), author, 43, createCourseData());
addAndValidateEventIds(masterLog, replicaLog, anotherRaceLogEvent);
@@ -161,7 +148,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
FlexibleLeaderboard masterLeaderboard = setupFlexibleLeaderboard(leaderboardName);
RaceLog masterLog = setupRaceColumn(leaderboardName, fleetName, raceColumnName);
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(fleetName, raceColumnName, masterLeaderboard);
addAndValidateEventIds(masterLog, replicaLog, anotherRaceLogEvent);
}
@@ -175,7 +162,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
RaceLog masterLog = setupRaceColumn(leaderboardName, fleetName, raceColumnName);
raceLogEvent = RaceLogEventFactory.INSTANCE.createCourseDesignChangedEvent(MillisecondsTimePoint.now(), author, 43, createCourseData());
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(fleetName, raceColumnName, masterLeaderboard);
anotherRaceLogEvent = RaceLogEventFactory.INSTANCE.createCourseDesignChangedEvent(MillisecondsTimePoint.now(), author, 43, createCourseData());
addAndValidateEventIds(masterLog, replicaLog, anotherRaceLogEvent);
@@ -204,7 +191,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
final String raceColumnName = "R1";
FlexibleLeaderboard masterLeaderboard = setupFlexibleLeaderboard(leaderboardName);
RaceLog masterLog = setupRaceColumn(leaderboardName, fleetName, raceColumnName);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
masterLog.add(raceLogEvent);
RenameLeaderboard renameOperation = new RenameLeaderboard(leaderboardName, leaderboardName + "new");
master.apply(renameOperation);
@@ -226,7 +213,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest<RaceLog,
Regatta masterRegatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RaceLog masterLog = setupRaceColumn(masterRegatta, seriesName, raceColumnName, fleetName);
masterLog.add(raceLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RaceLog replicaLog = getReplicaLog(seriesName, fleetName, raceColumnName, masterRegatta);
addAndValidateEventIds(masterLog, replicaLog);
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java
+5 -18
View File
@@ -17,17 +17,11 @@ import com.sap.sailing.domain.base.impl.RegattaImpl;
import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.test.TrackBasedTest;
import com.sap.sailing.server.RacingEventService;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sse.replication.ReplicationMasterDescriptor;
import com.sap.sse.replication.testsupport.AbstractServerReplicationTestSetUp.ReplicationServiceTestImpl;
public class RegattaLogReplicationTest extends
AbstractLogReplicationTest<RegattaLog, RegattaLogEvent, RegattaLogEventVisitor> {
private Pair<ReplicationServiceTestImpl<RacingEventService>, ReplicationMasterDescriptor> replicationDescriptorPair;
private RegattaLogEvent regattaLogEvent;
// private RegattaLogEvent anotherRegattaLogEvent;
@@ -38,17 +32,10 @@ public class RegattaLogReplicationTest extends
}
@Before
@Override
public void setUp() throws Exception {
public void createEvent() throws Exception {
final Competitor competitor = TrackBasedTest.createCompetitor("Test Competitor");
regattaLogEvent = new RegattaLogRegisterCompetitorEventImpl(t(0), author, t(0), 0, competitor);
// anotherRegattaLogEvent = new RegattaLogRegisterCompetitorEventImpl(t(1), author, t(1), 1, null);
try {
replicationDescriptorPair = basicSetUp(/* dropDB */ true, null, null);
} catch (Exception e) {
e.printStackTrace();
tearDown();
}
}
@Test
@@ -58,7 +45,7 @@ public class RegattaLogReplicationTest extends
final String fleetName = "Default";
Regatta regatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RegattaLog masterLog = regatta.getRegattaLog();
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RegattaLog replicaLog = getReplicaLog(regatta);
addAndValidateEventIds(masterLog, replicaLog);
}
@@ -71,7 +58,7 @@ public class RegattaLogReplicationTest extends
Regatta regatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RegattaLog masterLog = regatta.getRegattaLog();
masterLog.add(regattaLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RegattaLog replicaLog = getReplicaLog(regatta);
addAndValidateEventIds(masterLog, replicaLog);
}
@@ -84,7 +71,7 @@ public class RegattaLogReplicationTest extends
Regatta masterRegatta = setupRegatta(RegattaImpl.getDefaultName(regattaName, BOAT_CLASS_NAME_49er), seriesName, fleetName, BOAT_CLASS_NAME_49er);
RegattaLog masterLog = masterRegatta.getRegattaLog();
masterLog.add(regattaLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RegattaLog replicaLog = getReplicaLog(masterRegatta);
addAndValidateEventIds(masterLog, replicaLog, regattaLogEvent);
}
@@ -95,7 +82,7 @@ public class RegattaLogReplicationTest extends
FlexibleLeaderboard masterLeaderboard = setupFlexibleLeaderboard(leaderboardName);
RegattaLog masterLog = masterLeaderboard.getRegattaLog();
masterLog.add(regattaLogEvent);
replicationDescriptorPair.getA().startToReplicateFrom(replicationDescriptorPair.getB());
replicaReplicator.startToReplicateFrom(masterDescriptor);
RegattaLog replicaLog = getReplicaLog(masterLeaderboard);
addAndValidateEventIds(masterLog, replicaLog, regattaLogEvent);
}
java/com.sap.sse.mail.replication.test/src/com/sap/sse/mail/replication/test/SimpleMailServiceReplicationTest.java
+1 -4
View File
@@ -6,18 +6,15 @@ import static org.hamcrest.Matchers.equalTo;
import org.junit.Test;
import com.sap.sse.common.mail.MailException;
import com.sap.sse.mail.MailService;
import com.sap.sse.mail.replication.testsupport.AbstractMailServiceReplicationTest;
public class SimpleMailServiceReplicationTest extends AbstractMailServiceReplicationTest {
@Test
public void testReplicationOfSendMail() throws InterruptedException,
IllegalAccessException, MailException {
MailService master = testSetUp.getMaster();
MailService replica = testSetUp.getReplica();
master.sendMail("test@ing.me", "oh what a beatiful mail", "to be sent on this day");
testSetUp.getReplicaReplicator().waitUntilQueueIsEmpty();
replicaReplicator.waitUntilQueueIsEmpty();
Thread.sleep(3000);
assertThat("mail was not sent on replica",
java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java
+1 -1
View File
@@ -51,7 +51,7 @@ public abstract class AbstractServerReplicationTestSetUp<ReplicableInterface ext
protected ReplicationServiceTestImpl<ReplicableInterface> replicaReplicator;
private ReplicaDescriptor replicaDescriptor;
private ReplicationServiceImpl masterReplicator;
protected ReplicationMasterDescriptor masterDescriptor;
protected ReplicationMasterDescriptor masterDescriptor;
protected AbstractServerReplicationTestSetUp() {
servletPort = DEFAULT_SERVLET_PORT;