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

Merge branch 'master' into polar-api

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
This commit is contained in:
Frederik Petersen committed 2014-11-05 12:06:54 +01:00
2 parents 0b9ec80734 cd044a2b63
commit db968e5937
558 files changed
+15713 -2957
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java
+8 -1
View File
@@ -230,14 +230,21 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
@Test
public void testStoreAndLoadRevokeEvent() {
UUID revokedEventId = UUID.randomUUID();
String revokedEventType = "type";
String revokedEventShortInfo = "short info";
String reason = "reason";
RevokeEvent expectedEvent = eventFactory.createRevokeEvent(
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, revokedEventId);
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, revokedEventId,
revokedEventType, revokedEventShortInfo, reason);
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
RevokeEvent actualEvent = loadEvent(dbObject);
assertBaseFields(expectedEvent, actualEvent);
assertEquals(revokedEventId, actualEvent.getRevokedEventId());
assertEquals(revokedEventType, actualEvent.getRevokedEventType());
assertEquals(revokedEventShortInfo, actualEvent.getRevokedEventShortInfo());
assertEquals(reason, actualEvent.getReason());
}
@Test
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java
+3 -3
View File
@@ -45,11 +45,11 @@ import com.sap.sse.common.Util;
public class StoreGPSFixTrackTest extends AbstractMongoDBTest {
public StoreGPSFixTrackTest() throws UnknownHostException, MongoException {
super();
}
super();
}
@After
public void dropCollection() {
public void dropCollection() {
DB db = getMongoService().getDB();
db.getCollection(CollectionNames.GPS_FIXES.name()).drop();
}