fixed more test issues

This commit is contained in:
Axel Uhl committed 2020-01-08 18:58:03 +01:00
1 parent ef126a1fbc
commit 04740d2151
3 files changed
+15 -17

No files matched your search

@@ -10,9 +10,13 @@ public class Positioning extends JsonWrapper {
private static final String FIELD_POSITION = "position";
private static final String FIELD_TYPE = "type";
private static final String FIELD_DEVICE_UUID = "deviceUUID";
private static final String FIELD_DEVICE_IDENTIFIER = "device_identifier";
private static final String FIELD_LATITUDE_DEG = "latitude_deg";
private static final String FIELD_LONGITUDE_DEG = "longitude_deg";
private static final String FIELD_DEVICE_ID = "id";
private static final String FIELD_DEVICE_TYPE = "type";
private static final String FIELD_STRING_REPRESENTATION = "stringRepresentation";
public Positioning(final JSONObject json) {
super(json);
@@ -20,7 +24,11 @@ public class Positioning extends JsonWrapper {
public Positioning(UUID deviceId) {
super(new JSONObject());
getJson().put(FIELD_DEVICE_UUID, deviceId.toString());
final JSONObject deviceIdentifierJson = new JSONObject();
deviceIdentifierJson.put(FIELD_DEVICE_ID, deviceId.toString());
deviceIdentifierJson.put(FIELD_STRING_REPRESENTATION, deviceId.toString());
deviceIdentifierJson.put(FIELD_DEVICE_TYPE, "smartphoneUUID");
getJson().put(FIELD_DEVICE_IDENTIFIER, deviceIdentifierJson);
}
public Positioning(double latDeg, double lngDeg) {
@@ -46,7 +54,7 @@ public class Positioning extends JsonWrapper {
}
public UUID getDeviceId() {
final String deviceIdJson = get(FIELD_DEVICE_UUID);
return deviceIdJson != null ? UUID.fromString(deviceIdJson) : null;
final JSONObject deviceIdJson = get(FIELD_DEVICE_IDENTIFIER);
return deviceIdJson != null ? UUID.fromString((String) deviceIdJson.get(FIELD_DEVICE_ID)) : null;
}
}
@@ -158,7 +158,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
if (srcPositioning != null) {
if (srcPositioning.getDeviceId() != null) {
assertEquals("tracking device was not properly mapped for " + msgIdentifier,
srcPositioning.getDeviceId(), trgtMarkConfiguration.getCurrentTrackingDeviceId());
srcPositioning.getDeviceId().toString(), trgtMarkConfiguration.getCurrentTrackingDeviceId().getId());
} else if (srcPositioning.getLatitudeDeg() != null && srcPositioning.getLongitudeDeg() != null) {
assertEquals("position.lat is different for " + msgIdentifier, srcPositioning.getLatitudeDeg(),
trgtMarkConfiguration.getLastKnownPosition().getLatDeg(), 0.0);
@@ -297,22 +297,18 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
// different.
public void testDifferentCourseTemplatesWithCommonRolesInRegatta() {
final CourseTemplateDataFactory ctdf = new CourseTemplateDataFactory(sharedServerCtx);
final CourseTemplate createdCourseTemplate = courseTemplateApi.createCourseTemplate(sharedServerCtx,
ctdf.constructCourseTemplate(new Pair<>(1, 3), 2, Collections.emptyMap()));
logger.info(createdCourseTemplate.getJson().toJSONString());
final String regattaName = "test";
eventApi.createEvent(ctx, regattaName, "", CompetitorRegistrationType.CLOSED, "");
final RaceColumn race = regattaApi.addRaceColumn(ctx, regattaName, /* prefix */ null, 1)[0];
// Create a course based on one of the templates
CourseConfiguration courseConfiguration = courseConfigurationApi.createCourseConfigurationFromCourseTemplate(
ctx, createdCourseTemplate.getId(), regattaName, /* tags */ null);
logger.info(courseConfiguration.getJson().toJSONString());
final CourseConfiguration createdCourse = courseConfigurationApi.createCourse(ctx, courseConfiguration,
regattaName, race.getRaceName(), "Default");
final Map<MarkTemplate, MarkRole> templateRoleMap = new HashMap<>();
courseConfiguration.getMarkConfigurations().forEach(mc -> {
if (mc.getMarkTemplateId() != null && mc.getAssociatedRoleId() != null) {
@@ -334,9 +330,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
// This means a new spare mark will be suggested to be created.
assertEquals(Util.size(createdCourse.getMarkConfigurations()) + 1,
Util.size(courseConfigurationBasedOnOtherTemplate.getMarkConfigurations()));
// TODO check that the marks are associated to the same role/position in the sequence as in the originally saved
// course.
// TODO check that the marks are associated to the same role/position in the sequence as in the originally saved course.
}
@Test
@@ -344,7 +338,6 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
final String regattaName = "test";
eventApi.createEvent(ctx, regattaName, "", CompetitorRegistrationType.CLOSED, "");
final RaceColumn race = regattaApi.addRaceColumn(ctx, regattaName, /* prefix */ null, 1)[0];
MarkConfiguration sb = MarkConfiguration.createFreestyle(null, null,
markRoleApi.createMarkRole(sharedServerCtx, "role_sb").getId(), "startboat", "sb", null, null, null, null);
sb.setFixedPosition(5.5, 7.1);
@@ -358,14 +351,11 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
PassingInstruction.Line, Arrays.asList(sb.getId(), pe.getId()));
WaypointWithMarkConfiguration wp2 = new WaypointWithMarkConfiguration(null, null, PassingInstruction.Port,
Arrays.asList(bl.getId()));
CourseConfiguration courseConfiguration = new CourseConfiguration("my-freestyle-course",
Arrays.asList(sb, pe, bl), Arrays.asList(wp1, wp2, wp1));
courseConfigurationApi.createCourse(ctx, courseConfiguration, regattaName, race.getRaceName(), "Default");
CourseConfiguration createdCourseAsConfiguration = courseConfigurationApi
.createCourseConfigurationFromCourse(ctx, regattaName, race.getRaceName(), "Default", null);
assertConsistentCourseConfiguration(createdCourseAsConfiguration);
assertCourseConfigurationCompared(sharedServerCtx, courseConfiguration, createdCourseAsConfiguration);
}
@@ -33,7 +33,7 @@ public class PositioningJsonDeserializer implements JsonDeserializer<Positioning
.deserialize((JSONObject) object.get(PositioningJsonSerializer.FIELD_POSITION)));
} else if (object.containsKey(PositioningJsonSerializer.FIELD_DEVICE_IDENTIFIER)) {
final DeviceIdentifier deviceIdentifier = deviceIdentifierDeserializer
.deserialize((JSONObject) object.get(PositioningJsonSerializer.FIELD_POSITION));
.deserialize((JSONObject) object.get(PositioningJsonSerializer.FIELD_DEVICE_IDENTIFIER));
if (object.containsKey(PositioningJsonSerializer.FIELD_DEVICE_LAST_KNOWN_POSITION)) {
final Position lastKnownPosition = positionDeserializer
.deserialize((JSONObject) object.get(PositioningJsonSerializer.FIELD_DEVICE_LAST_KNOWN_POSITION));