Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public void testCircleRadius() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(circle);

circle.setCircleRadius(0.3f);
assertEquals((Float) circle.getCircleRadius(), (Float) 0.3f);
circle.setCircleRadius(2.0f);
assertEquals((Float) circle.getCircleRadius(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -91,8 +91,8 @@ public void testCircleBlur() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(circle);

circle.setCircleBlur(0.3f);
assertEquals((Float) circle.getCircleBlur(), (Float) 0.3f);
circle.setCircleBlur(2.0f);
assertEquals((Float) circle.getCircleBlur(), (Float) 2.0f);
});
}

Expand All @@ -104,8 +104,8 @@ public void testCircleOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(circle);

circle.setCircleOpacity(0.3f);
assertEquals((Float) circle.getCircleOpacity(), (Float) 0.3f);
circle.setCircleOpacity(2.0f);
assertEquals((Float) circle.getCircleOpacity(), (Float) 2.0f);
});
}

Expand All @@ -117,8 +117,8 @@ public void testCircleStrokeWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(circle);

circle.setCircleStrokeWidth(0.3f);
assertEquals((Float) circle.getCircleStrokeWidth(), (Float) 0.3f);
circle.setCircleStrokeWidth(2.0f);
assertEquals((Float) circle.getCircleStrokeWidth(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -156,8 +156,8 @@ public void testCircleStrokeOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(circle);

circle.setCircleStrokeOpacity(0.3f);
assertEquals((Float) circle.getCircleStrokeOpacity(), (Float) 0.3f);
circle.setCircleStrokeOpacity(2.0f);
assertEquals((Float) circle.getCircleStrokeOpacity(), (Float) 2.0f);
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public void testFillOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(fill);

fill.setFillOpacity(0.3f);
assertEquals((Float) fill.getFillOpacity(), (Float) 0.3f);
fill.setFillOpacity(2.0f);
assertEquals((Float) fill.getFillOpacity(), (Float) 2.0f);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public void testLineMiterLimitAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(lineManager);

lineManager.setLineMiterLimit(0.3f);
assertEquals((Float) lineManager.getLineMiterLimit(), (Float) 0.3f);
lineManager.setLineMiterLimit(2.0f);
assertEquals((Float) lineManager.getLineMiterLimit(), (Float) 2.0f);
});
}

Expand All @@ -72,8 +72,8 @@ public void testLineRoundLimitAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(lineManager);

lineManager.setLineRoundLimit(0.3f);
assertEquals((Float) lineManager.getLineRoundLimit(), (Float) 0.3f);
lineManager.setLineRoundLimit(2.0f);
assertEquals((Float) lineManager.getLineRoundLimit(), (Float) 2.0f);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public void testLineOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(line);

line.setLineOpacity(0.3f);
assertEquals((Float) line.getLineOpacity(), (Float) 0.3f);
line.setLineOpacity(2.0f);
assertEquals((Float) line.getLineOpacity(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -107,8 +107,8 @@ public void testLineWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(line);

line.setLineWidth(0.3f);
assertEquals((Float) line.getLineWidth(), (Float) 0.3f);
line.setLineWidth(2.0f);
assertEquals((Float) line.getLineWidth(), (Float) 2.0f);
});
}

Expand All @@ -120,8 +120,8 @@ public void testLineGapWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(line);

line.setLineGapWidth(0.3f);
assertEquals((Float) line.getLineGapWidth(), (Float) 0.3f);
line.setLineGapWidth(2.0f);
assertEquals((Float) line.getLineGapWidth(), (Float) 2.0f);
});
}

Expand All @@ -133,8 +133,8 @@ public void testLineOffset() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(line);

line.setLineOffset(0.3f);
assertEquals((Float) line.getLineOffset(), (Float) 0.3f);
line.setLineOffset(2.0f);
assertEquals((Float) line.getLineOffset(), (Float) 2.0f);
});
}

Expand All @@ -146,8 +146,8 @@ public void testLineBlur() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(line);

line.setLineBlur(0.3f);
assertEquals((Float) line.getLineBlur(), (Float) 0.3f);
line.setLineBlur(2.0f);
assertEquals((Float) line.getLineBlur(), (Float) 2.0f);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public void testSymbolSpacingAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbolManager);

symbolManager.setSymbolSpacing(0.3f);
assertEquals((Float) symbolManager.getSymbolSpacing(), (Float) 0.3f);
symbolManager.setSymbolSpacing(2.0f);
assertEquals((Float) symbolManager.getSymbolSpacing(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -163,8 +163,8 @@ public void testIconPaddingAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbolManager);

symbolManager.setIconPadding(0.3f);
assertEquals((Float) symbolManager.getIconPadding(), (Float) 0.3f);
symbolManager.setIconPadding(2.0f);
assertEquals((Float) symbolManager.getIconPadding(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -228,8 +228,8 @@ public void testTextLineHeightAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbolManager);

symbolManager.setTextLineHeight(0.3f);
assertEquals((Float) symbolManager.getTextLineHeight(), (Float) 0.3f);
symbolManager.setTextLineHeight(2.0f);
assertEquals((Float) symbolManager.getTextLineHeight(), (Float) 2.0f);
});
}

Expand All @@ -254,8 +254,8 @@ public void testTextMaxAngleAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbolManager);

symbolManager.setTextMaxAngle(0.3f);
assertEquals((Float) symbolManager.getTextMaxAngle(), (Float) 0.3f);
symbolManager.setTextMaxAngle(2.0f);
assertEquals((Float) symbolManager.getTextMaxAngle(), (Float) 2.0f);
});
}

Expand All @@ -267,8 +267,8 @@ public void testTextPaddingAsConstant() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbolManager);

symbolManager.setTextPadding(0.3f);
assertEquals((Float) symbolManager.getTextPadding(), (Float) 0.3f);
symbolManager.setTextPadding(2.0f);
assertEquals((Float) symbolManager.getTextPadding(), (Float) 2.0f);
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public void testSymbolSortKey() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setSymbolSortKey(0.3f);
assertEquals((Float) symbol.getSymbolSortKey(), (Float) 0.3f);
symbol.setSymbolSortKey(2.0f);
assertEquals((Float) symbol.getSymbolSortKey(), (Float) 2.0f);
});
}

Expand All @@ -65,8 +65,8 @@ public void testIconSize() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setIconSize(0.3f);
assertEquals((Float) symbol.getIconSize(), (Float) 0.3f);
symbol.setIconSize(2.0f);
assertEquals((Float) symbol.getIconSize(), (Float) 2.0f);
});
}

Expand All @@ -91,8 +91,8 @@ public void testIconRotate() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setIconRotate(0.3f);
assertEquals((Float) symbol.getIconRotate(), (Float) 0.3f);
symbol.setIconRotate(2.0f);
assertEquals((Float) symbol.getIconRotate(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -156,8 +156,8 @@ public void testTextSize() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextSize(0.3f);
assertEquals((Float) symbol.getTextSize(), (Float) 0.3f);
symbol.setTextSize(2.0f);
assertEquals((Float) symbol.getTextSize(), (Float) 2.0f);
});
}

Expand All @@ -169,8 +169,8 @@ public void testTextMaxWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextMaxWidth(0.3f);
assertEquals((Float) symbol.getTextMaxWidth(), (Float) 0.3f);
symbol.setTextMaxWidth(2.0f);
assertEquals((Float) symbol.getTextMaxWidth(), (Float) 2.0f);
});
}

Expand All @@ -182,8 +182,8 @@ public void testTextLetterSpacing() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextLetterSpacing(0.3f);
assertEquals((Float) symbol.getTextLetterSpacing(), (Float) 0.3f);
symbol.setTextLetterSpacing(2.0f);
assertEquals((Float) symbol.getTextLetterSpacing(), (Float) 2.0f);
});
}

Expand All @@ -208,8 +208,8 @@ public void testTextRadialOffset() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextRadialOffset(0.3f);
assertEquals((Float) symbol.getTextRadialOffset(), (Float) 0.3f);
symbol.setTextRadialOffset(2.0f);
assertEquals((Float) symbol.getTextRadialOffset(), (Float) 2.0f);
});
}

Expand All @@ -234,8 +234,8 @@ public void testTextRotate() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextRotate(0.3f);
assertEquals((Float) symbol.getTextRotate(), (Float) 0.3f);
symbol.setTextRotate(2.0f);
assertEquals((Float) symbol.getTextRotate(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -273,8 +273,8 @@ public void testIconOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setIconOpacity(0.3f);
assertEquals((Float) symbol.getIconOpacity(), (Float) 0.3f);
symbol.setIconOpacity(2.0f);
assertEquals((Float) symbol.getIconOpacity(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -338,8 +338,8 @@ public void testIconHaloWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setIconHaloWidth(0.3f);
assertEquals((Float) symbol.getIconHaloWidth(), (Float) 0.3f);
symbol.setIconHaloWidth(2.0f);
assertEquals((Float) symbol.getIconHaloWidth(), (Float) 2.0f);
});
}

Expand All @@ -351,8 +351,8 @@ public void testIconHaloBlur() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setIconHaloBlur(0.3f);
assertEquals((Float) symbol.getIconHaloBlur(), (Float) 0.3f);
symbol.setIconHaloBlur(2.0f);
assertEquals((Float) symbol.getIconHaloBlur(), (Float) 2.0f);
});
}

Expand All @@ -364,8 +364,8 @@ public void testTextOpacity() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextOpacity(0.3f);
assertEquals((Float) symbol.getTextOpacity(), (Float) 0.3f);
symbol.setTextOpacity(2.0f);
assertEquals((Float) symbol.getTextOpacity(), (Float) 2.0f);
});
}

Expand Down Expand Up @@ -429,8 +429,8 @@ public void testTextHaloWidth() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextHaloWidth(0.3f);
assertEquals((Float) symbol.getTextHaloWidth(), (Float) 0.3f);
symbol.setTextHaloWidth(2.0f);
assertEquals((Float) symbol.getTextHaloWidth(), (Float) 2.0f);
});
}

Expand All @@ -442,8 +442,8 @@ public void testTextHaloBlur() {
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(symbol);

symbol.setTextHaloBlur(0.3f);
assertEquals((Float) symbol.getTextHaloBlur(), (Float) 0.3f);
symbol.setTextHaloBlur(2.0f);
assertEquals((Float) symbol.getTextHaloBlur(), (Float) 2.0f);
});
}
}
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]

version = [
mapboxMapSdk : '9.4.0',
mapboxMapSdk : '9.5.0',
mapboxJava : '5.5.0',
mapboxTurf : '5.5.0',
playLocation : '16.0.0',
Expand Down
2 changes: 1 addition & 1 deletion plugin-annotation/scripts/code-gen.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ global.defaultValueJava = function(property) {
case 'boolean':
return 'true';
case 'number':
return '0.3f';
return '2.0f';
case 'formatted':
case 'string':
return '"' + property['default'] + '"';
Expand Down
Loading