eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-07 19:42:17 +00:00
Code Activity

fixed test cases

Browse Source 
Change-Id: I60ef73c89e63ac0b05d70f148cc9ff837f3f2a4d
This commit is contained in:
Axel Uhl committed 2017-04-11 16:13:11 +02:00
1 parent d776c0c777
commit 9ccd61ef67
4 files changed
+12 -7
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/TestParseAndMigratePassingSideAndControlPointTwoMarks.java
+3 -3
View File
@@ -38,10 +38,10 @@ public class TestParseAndMigratePassingSideAndControlPointTwoMarks {
DBObject cpValue = new BasicDBObject();
cpValue.put(FieldNames.GATE_NAME.name(), "Name");
cpValue.put(FieldNames.GATE_ID.name(), (Serializable) 0);
Mark mark1 = new MarkImpl(0, "Left", MarkType.BUOY, AbstractColor.getCssColor("blue"), "square", "checkers");
Mark mark1 = new MarkImpl(0, "Left", MarkType.BUOY, AbstractColor.getCssColor("blue"), "square", "checkers");
DBObject dbMark1 = new BasicDBObject();
dbMark1.put(FieldNames.MARK_ID.name(), mark1.getId());
dbMark1.put(FieldNames.MARK_COLOR.name(), mark1.getColor());
dbMark1.put(FieldNames.MARK_COLOR.name(), mark1.getColor().getAsHtml());
dbMark1.put(FieldNames.MARK_NAME.name(), mark1.getName());
dbMark1.put(FieldNames.MARK_PATTERN.name(), mark1.getPattern());
dbMark1.put(FieldNames.MARK_SHAPE.name(), mark1.getShape());
@@ -49,7 +49,7 @@ public class TestParseAndMigratePassingSideAndControlPointTwoMarks {
Mark mark2 = new MarkImpl(0, "Right", MarkType.BUOY, AbstractColor.getCssColor("blue"), "square", "checkers");
DBObject dbMark2 = new BasicDBObject();
dbMark2.put(FieldNames.MARK_ID.name(), mark2.getId());
dbMark2.put(FieldNames.MARK_COLOR.name(), mark2.getColor());
dbMark2.put(FieldNames.MARK_COLOR.name(), mark2.getColor().getAsHtml());
dbMark2.put(FieldNames.MARK_NAME.name(), mark2.getName());
dbMark2.put(FieldNames.MARK_PATTERN.name(), mark2.getPattern());
dbMark2.put(FieldNames.MARK_SHAPE.name(), mark2.getShape());
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MarksJsonSerializerTest.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class MarksJsonSerializerTest {
JSONObject result = serializer.serialize(mark);
assertEquals("NAME", result.get(MarkJsonSerializer.FIELD_NAME));
assertEquals("RED", result.get(MarkJsonSerializer.FIELD_COLOR));
assertEquals(AbstractColor.getCssColor("RED").getAsHtml(), result.get(MarkJsonSerializer.FIELD_COLOR));
assertEquals("IIIIDDDD", result.get(MarkJsonSerializer.FIELD_ID));
assertEquals("SHINY", result.get(MarkJsonSerializer.FIELD_PATTERN));
assertEquals("ROUND", result.get(MarkJsonSerializer.FIELD_SHAPE));
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/utils/MarkImageDescriptor.java
+7 -2
View File
@@ -30,8 +30,13 @@ public class MarkImageDescriptor {
return drawableId;
}
public LayerDrawable getDrawable() {
return BuoyHelper.getBuoy(context, type, color, shape, pattern);
/**
* @param instanceColor when this descriptor has {@code null{} as its {@link #color} then
* {@code instanceColor} can be used to provide a specific color; if {@code instanceColor}
* is {@code null}, whatever the value of {@link #color} is will be used.
*/
public LayerDrawable getDrawable(Color instanceColor) {
return BuoyHelper.getBuoy(context, type, instanceColor == null ? color : instanceColor, shape, pattern);
}
public String getShape() {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/utils/MarkImageHelper.java
+1 -1
View File
@@ -33,7 +33,7 @@ public abstract class MarkImageHelper {
if (result.getDrawableId() != 0) {
drawable = new LayerDrawable(new Drawable[] { ContextCompat.getDrawable(context, result.getDrawableId()) });
} else {
drawable = result.getDrawable();
drawable = result.getDrawable(mark.getColor());
}
return drawable;
}