Skip to content

Commit f683211

Browse files
kiryldzkiryldz
authored
Bump Maps SDK to 9.5.0 (#1158)
* Bump Maps SDK to 9.5.0 * Fix test generator
1 parent 67ae7a4 commit f683211

File tree

12 files changed

+141
-141
lines changed

12 files changed

+141
-141
lines changed

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public void testCircleRadius() {
5252
invoke(mapboxMap, (uiController, mapboxMap) -> {
5353
assertNotNull(circle);
5454

55-
circle.setCircleRadius(0.3f);
56-
assertEquals((Float) circle.getCircleRadius(), (Float) 0.3f);
55+
circle.setCircleRadius(2.0f);
56+
assertEquals((Float) circle.getCircleRadius(), (Float) 2.0f);
5757
});
5858
}
5959

@@ -91,8 +91,8 @@ public void testCircleBlur() {
9191
invoke(mapboxMap, (uiController, mapboxMap) -> {
9292
assertNotNull(circle);
9393

94-
circle.setCircleBlur(0.3f);
95-
assertEquals((Float) circle.getCircleBlur(), (Float) 0.3f);
94+
circle.setCircleBlur(2.0f);
95+
assertEquals((Float) circle.getCircleBlur(), (Float) 2.0f);
9696
});
9797
}
9898

@@ -104,8 +104,8 @@ public void testCircleOpacity() {
104104
invoke(mapboxMap, (uiController, mapboxMap) -> {
105105
assertNotNull(circle);
106106

107-
circle.setCircleOpacity(0.3f);
108-
assertEquals((Float) circle.getCircleOpacity(), (Float) 0.3f);
107+
circle.setCircleOpacity(2.0f);
108+
assertEquals((Float) circle.getCircleOpacity(), (Float) 2.0f);
109109
});
110110
}
111111

@@ -117,8 +117,8 @@ public void testCircleStrokeWidth() {
117117
invoke(mapboxMap, (uiController, mapboxMap) -> {
118118
assertNotNull(circle);
119119

120-
circle.setCircleStrokeWidth(0.3f);
121-
assertEquals((Float) circle.getCircleStrokeWidth(), (Float) 0.3f);
120+
circle.setCircleStrokeWidth(2.0f);
121+
assertEquals((Float) circle.getCircleStrokeWidth(), (Float) 2.0f);
122122
});
123123
}
124124

@@ -156,8 +156,8 @@ public void testCircleStrokeOpacity() {
156156
invoke(mapboxMap, (uiController, mapboxMap) -> {
157157
assertNotNull(circle);
158158

159-
circle.setCircleStrokeOpacity(0.3f);
160-
assertEquals((Float) circle.getCircleStrokeOpacity(), (Float) 0.3f);
159+
circle.setCircleStrokeOpacity(2.0f);
160+
assertEquals((Float) circle.getCircleStrokeOpacity(), (Float) 2.0f);
161161
});
162162
}
163163
}

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public void testFillOpacity() {
5858
invoke(mapboxMap, (uiController, mapboxMap) -> {
5959
assertNotNull(fill);
6060

61-
fill.setFillOpacity(0.3f);
62-
assertEquals((Float) fill.getFillOpacity(), (Float) 0.3f);
61+
fill.setFillOpacity(2.0f);
62+
assertEquals((Float) fill.getFillOpacity(), (Float) 2.0f);
6363
});
6464
}
6565

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void testLineMiterLimitAsConstant() {
5959
invoke(mapboxMap, (uiController, mapboxMap) -> {
6060
assertNotNull(lineManager);
6161

62-
lineManager.setLineMiterLimit(0.3f);
63-
assertEquals((Float) lineManager.getLineMiterLimit(), (Float) 0.3f);
62+
lineManager.setLineMiterLimit(2.0f);
63+
assertEquals((Float) lineManager.getLineMiterLimit(), (Float) 2.0f);
6464
});
6565
}
6666

@@ -72,8 +72,8 @@ public void testLineRoundLimitAsConstant() {
7272
invoke(mapboxMap, (uiController, mapboxMap) -> {
7373
assertNotNull(lineManager);
7474

75-
lineManager.setLineRoundLimit(0.3f);
76-
assertEquals((Float) lineManager.getLineRoundLimit(), (Float) 0.3f);
75+
lineManager.setLineRoundLimit(2.0f);
76+
assertEquals((Float) lineManager.getLineRoundLimit(), (Float) 2.0f);
7777
});
7878
}
7979

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public void testLineOpacity() {
6868
invoke(mapboxMap, (uiController, mapboxMap) -> {
6969
assertNotNull(line);
7070

71-
line.setLineOpacity(0.3f);
72-
assertEquals((Float) line.getLineOpacity(), (Float) 0.3f);
71+
line.setLineOpacity(2.0f);
72+
assertEquals((Float) line.getLineOpacity(), (Float) 2.0f);
7373
});
7474
}
7575

@@ -107,8 +107,8 @@ public void testLineWidth() {
107107
invoke(mapboxMap, (uiController, mapboxMap) -> {
108108
assertNotNull(line);
109109

110-
line.setLineWidth(0.3f);
111-
assertEquals((Float) line.getLineWidth(), (Float) 0.3f);
110+
line.setLineWidth(2.0f);
111+
assertEquals((Float) line.getLineWidth(), (Float) 2.0f);
112112
});
113113
}
114114

@@ -120,8 +120,8 @@ public void testLineGapWidth() {
120120
invoke(mapboxMap, (uiController, mapboxMap) -> {
121121
assertNotNull(line);
122122

123-
line.setLineGapWidth(0.3f);
124-
assertEquals((Float) line.getLineGapWidth(), (Float) 0.3f);
123+
line.setLineGapWidth(2.0f);
124+
assertEquals((Float) line.getLineGapWidth(), (Float) 2.0f);
125125
});
126126
}
127127

@@ -133,8 +133,8 @@ public void testLineOffset() {
133133
invoke(mapboxMap, (uiController, mapboxMap) -> {
134134
assertNotNull(line);
135135

136-
line.setLineOffset(0.3f);
137-
assertEquals((Float) line.getLineOffset(), (Float) 0.3f);
136+
line.setLineOffset(2.0f);
137+
assertEquals((Float) line.getLineOffset(), (Float) 2.0f);
138138
});
139139
}
140140

@@ -146,8 +146,8 @@ public void testLineBlur() {
146146
invoke(mapboxMap, (uiController, mapboxMap) -> {
147147
assertNotNull(line);
148148

149-
line.setLineBlur(0.3f);
150-
assertEquals((Float) line.getLineBlur(), (Float) 0.3f);
149+
line.setLineBlur(2.0f);
150+
assertEquals((Float) line.getLineBlur(), (Float) 2.0f);
151151
});
152152
}
153153

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void testSymbolSpacingAsConstant() {
5959
invoke(mapboxMap, (uiController, mapboxMap) -> {
6060
assertNotNull(symbolManager);
6161

62-
symbolManager.setSymbolSpacing(0.3f);
63-
assertEquals((Float) symbolManager.getSymbolSpacing(), (Float) 0.3f);
62+
symbolManager.setSymbolSpacing(2.0f);
63+
assertEquals((Float) symbolManager.getSymbolSpacing(), (Float) 2.0f);
6464
});
6565
}
6666

@@ -163,8 +163,8 @@ public void testIconPaddingAsConstant() {
163163
invoke(mapboxMap, (uiController, mapboxMap) -> {
164164
assertNotNull(symbolManager);
165165

166-
symbolManager.setIconPadding(0.3f);
167-
assertEquals((Float) symbolManager.getIconPadding(), (Float) 0.3f);
166+
symbolManager.setIconPadding(2.0f);
167+
assertEquals((Float) symbolManager.getIconPadding(), (Float) 2.0f);
168168
});
169169
}
170170

@@ -228,8 +228,8 @@ public void testTextLineHeightAsConstant() {
228228
invoke(mapboxMap, (uiController, mapboxMap) -> {
229229
assertNotNull(symbolManager);
230230

231-
symbolManager.setTextLineHeight(0.3f);
232-
assertEquals((Float) symbolManager.getTextLineHeight(), (Float) 0.3f);
231+
symbolManager.setTextLineHeight(2.0f);
232+
assertEquals((Float) symbolManager.getTextLineHeight(), (Float) 2.0f);
233233
});
234234
}
235235

@@ -254,8 +254,8 @@ public void testTextMaxAngleAsConstant() {
254254
invoke(mapboxMap, (uiController, mapboxMap) -> {
255255
assertNotNull(symbolManager);
256256

257-
symbolManager.setTextMaxAngle(0.3f);
258-
assertEquals((Float) symbolManager.getTextMaxAngle(), (Float) 0.3f);
257+
symbolManager.setTextMaxAngle(2.0f);
258+
assertEquals((Float) symbolManager.getTextMaxAngle(), (Float) 2.0f);
259259
});
260260
}
261261

@@ -267,8 +267,8 @@ public void testTextPaddingAsConstant() {
267267
invoke(mapboxMap, (uiController, mapboxMap) -> {
268268
assertNotNull(symbolManager);
269269

270-
symbolManager.setTextPadding(0.3f);
271-
assertEquals((Float) symbolManager.getTextPadding(), (Float) 0.3f);
270+
symbolManager.setTextPadding(2.0f);
271+
assertEquals((Float) symbolManager.getTextPadding(), (Float) 2.0f);
272272
});
273273
}
274274

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public void testSymbolSortKey() {
5252
invoke(mapboxMap, (uiController, mapboxMap) -> {
5353
assertNotNull(symbol);
5454

55-
symbol.setSymbolSortKey(0.3f);
56-
assertEquals((Float) symbol.getSymbolSortKey(), (Float) 0.3f);
55+
symbol.setSymbolSortKey(2.0f);
56+
assertEquals((Float) symbol.getSymbolSortKey(), (Float) 2.0f);
5757
});
5858
}
5959

@@ -65,8 +65,8 @@ public void testIconSize() {
6565
invoke(mapboxMap, (uiController, mapboxMap) -> {
6666
assertNotNull(symbol);
6767

68-
symbol.setIconSize(0.3f);
69-
assertEquals((Float) symbol.getIconSize(), (Float) 0.3f);
68+
symbol.setIconSize(2.0f);
69+
assertEquals((Float) symbol.getIconSize(), (Float) 2.0f);
7070
});
7171
}
7272

@@ -91,8 +91,8 @@ public void testIconRotate() {
9191
invoke(mapboxMap, (uiController, mapboxMap) -> {
9292
assertNotNull(symbol);
9393

94-
symbol.setIconRotate(0.3f);
95-
assertEquals((Float) symbol.getIconRotate(), (Float) 0.3f);
94+
symbol.setIconRotate(2.0f);
95+
assertEquals((Float) symbol.getIconRotate(), (Float) 2.0f);
9696
});
9797
}
9898

@@ -156,8 +156,8 @@ public void testTextSize() {
156156
invoke(mapboxMap, (uiController, mapboxMap) -> {
157157
assertNotNull(symbol);
158158

159-
symbol.setTextSize(0.3f);
160-
assertEquals((Float) symbol.getTextSize(), (Float) 0.3f);
159+
symbol.setTextSize(2.0f);
160+
assertEquals((Float) symbol.getTextSize(), (Float) 2.0f);
161161
});
162162
}
163163

@@ -169,8 +169,8 @@ public void testTextMaxWidth() {
169169
invoke(mapboxMap, (uiController, mapboxMap) -> {
170170
assertNotNull(symbol);
171171

172-
symbol.setTextMaxWidth(0.3f);
173-
assertEquals((Float) symbol.getTextMaxWidth(), (Float) 0.3f);
172+
symbol.setTextMaxWidth(2.0f);
173+
assertEquals((Float) symbol.getTextMaxWidth(), (Float) 2.0f);
174174
});
175175
}
176176

@@ -182,8 +182,8 @@ public void testTextLetterSpacing() {
182182
invoke(mapboxMap, (uiController, mapboxMap) -> {
183183
assertNotNull(symbol);
184184

185-
symbol.setTextLetterSpacing(0.3f);
186-
assertEquals((Float) symbol.getTextLetterSpacing(), (Float) 0.3f);
185+
symbol.setTextLetterSpacing(2.0f);
186+
assertEquals((Float) symbol.getTextLetterSpacing(), (Float) 2.0f);
187187
});
188188
}
189189

@@ -208,8 +208,8 @@ public void testTextRadialOffset() {
208208
invoke(mapboxMap, (uiController, mapboxMap) -> {
209209
assertNotNull(symbol);
210210

211-
symbol.setTextRadialOffset(0.3f);
212-
assertEquals((Float) symbol.getTextRadialOffset(), (Float) 0.3f);
211+
symbol.setTextRadialOffset(2.0f);
212+
assertEquals((Float) symbol.getTextRadialOffset(), (Float) 2.0f);
213213
});
214214
}
215215

@@ -234,8 +234,8 @@ public void testTextRotate() {
234234
invoke(mapboxMap, (uiController, mapboxMap) -> {
235235
assertNotNull(symbol);
236236

237-
symbol.setTextRotate(0.3f);
238-
assertEquals((Float) symbol.getTextRotate(), (Float) 0.3f);
237+
symbol.setTextRotate(2.0f);
238+
assertEquals((Float) symbol.getTextRotate(), (Float) 2.0f);
239239
});
240240
}
241241

@@ -273,8 +273,8 @@ public void testIconOpacity() {
273273
invoke(mapboxMap, (uiController, mapboxMap) -> {
274274
assertNotNull(symbol);
275275

276-
symbol.setIconOpacity(0.3f);
277-
assertEquals((Float) symbol.getIconOpacity(), (Float) 0.3f);
276+
symbol.setIconOpacity(2.0f);
277+
assertEquals((Float) symbol.getIconOpacity(), (Float) 2.0f);
278278
});
279279
}
280280

@@ -338,8 +338,8 @@ public void testIconHaloWidth() {
338338
invoke(mapboxMap, (uiController, mapboxMap) -> {
339339
assertNotNull(symbol);
340340

341-
symbol.setIconHaloWidth(0.3f);
342-
assertEquals((Float) symbol.getIconHaloWidth(), (Float) 0.3f);
341+
symbol.setIconHaloWidth(2.0f);
342+
assertEquals((Float) symbol.getIconHaloWidth(), (Float) 2.0f);
343343
});
344344
}
345345

@@ -351,8 +351,8 @@ public void testIconHaloBlur() {
351351
invoke(mapboxMap, (uiController, mapboxMap) -> {
352352
assertNotNull(symbol);
353353

354-
symbol.setIconHaloBlur(0.3f);
355-
assertEquals((Float) symbol.getIconHaloBlur(), (Float) 0.3f);
354+
symbol.setIconHaloBlur(2.0f);
355+
assertEquals((Float) symbol.getIconHaloBlur(), (Float) 2.0f);
356356
});
357357
}
358358

@@ -364,8 +364,8 @@ public void testTextOpacity() {
364364
invoke(mapboxMap, (uiController, mapboxMap) -> {
365365
assertNotNull(symbol);
366366

367-
symbol.setTextOpacity(0.3f);
368-
assertEquals((Float) symbol.getTextOpacity(), (Float) 0.3f);
367+
symbol.setTextOpacity(2.0f);
368+
assertEquals((Float) symbol.getTextOpacity(), (Float) 2.0f);
369369
});
370370
}
371371

@@ -429,8 +429,8 @@ public void testTextHaloWidth() {
429429
invoke(mapboxMap, (uiController, mapboxMap) -> {
430430
assertNotNull(symbol);
431431

432-
symbol.setTextHaloWidth(0.3f);
433-
assertEquals((Float) symbol.getTextHaloWidth(), (Float) 0.3f);
432+
symbol.setTextHaloWidth(2.0f);
433+
assertEquals((Float) symbol.getTextHaloWidth(), (Float) 2.0f);
434434
});
435435
}
436436

@@ -442,8 +442,8 @@ public void testTextHaloBlur() {
442442
invoke(mapboxMap, (uiController, mapboxMap) -> {
443443
assertNotNull(symbol);
444444

445-
symbol.setTextHaloBlur(0.3f);
446-
assertEquals((Float) symbol.getTextHaloBlur(), (Float) 0.3f);
445+
symbol.setTextHaloBlur(2.0f);
446+
assertEquals((Float) symbol.getTextHaloBlur(), (Float) 2.0f);
447447
});
448448
}
449449
}

‎gradle/dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
]
88

99
version = [
10-
mapboxMapSdk : '9.4.0',
10+
mapboxMapSdk : '9.5.0',
1111
mapboxJava : '5.5.0',
1212
mapboxTurf : '5.5.0',
1313
playLocation : '16.0.0',

‎plugin-annotation/scripts/code-gen.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ global.defaultValueJava = function(property) {
235235
case 'boolean':
236236
return 'true';
237237
case 'number':
238-
return '0.3f';
238+
return '2.0f';
239239
case 'formatted':
240240
case 'string':
241241
return '"' + property['default'] + '"';

0 commit comments

Comments
 (0)