From ce1d8561b49a913ff7a15f67747886f1cfc64440 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 12 Feb 2016 15:07:45 -0800 Subject: [PATCH] [tests] Add test for Map::updatePointAnnotation --- test/api/annotations.cpp | 24 +++++++++++++++--- .../annotations/update_icon/expected.png | Bin 0 -> 2949 bytes .../annotations/update_point/expected.png | Bin 2949 -> 2504 bytes 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/annotations/update_icon/expected.png diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 3e74d79d0..8e21b615a 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -130,7 +130,7 @@ TEST(Annotations, NonImmediateAdd) { checkRendering(map, "non_immediate_add"); } -TEST(Annotations, UpdatePoint) { +TEST(Annotations, UpdateIcon) { auto display = std::make_shared(); HeadlessView view(display, 1); OnlineFileSource fileSource; @@ -146,6 +146,24 @@ TEST(Annotations, UpdatePoint) { map.addAnnotationIcon("flipped_marker", namedMarker("flipped_marker.png")); map.update(Update::Annotations); + checkRendering(map, "update_icon"); +} + +TEST(Annotations, UpdatePoint) { + auto display = std::make_shared(); + HeadlessView view(display, 1); + OnlineFileSource fileSource; + + Map map(view, fileSource, MapMode::Still); + map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), ""); + map.addAnnotationIcon("default_marker", namedMarker("default_marker.png")); + map.addAnnotationIcon("flipped_marker", namedMarker("flipped_marker.png")); + AnnotationID point = map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker")); + + test::render(map); + + map.updatePointAnnotation(point, PointAnnotation({ 0, -10 }, "flipped_marker")); + checkRendering(map, "update_point"); } @@ -157,7 +175,7 @@ TEST(Annotations, RemovePoint) { Map map(view, fileSource, MapMode::Still); map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), ""); map.addAnnotationIcon("default_marker", namedMarker("default_marker.png")); - uint32_t point = map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker")); + AnnotationID point = map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker")); test::render(map); @@ -179,7 +197,7 @@ TEST(Annotations, RemoveShape) { Map map(view, fileSource, MapMode::Still); map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), ""); - uint32_t shape = map.addShapeAnnotation(ShapeAnnotation(segments, properties)); + AnnotationID shape = map.addShapeAnnotation(ShapeAnnotation(segments, properties)); test::render(map); diff --git a/test/fixtures/annotations/update_icon/expected.png b/test/fixtures/annotations/update_icon/expected.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6ca22747cf1cf05a0579410785f1604e61dd42 GIT binary patch literal 2949 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 IM6N<$f-ip=Q2+n{ literal 2949 zcmeH}c{H1Q8pmI5jHNa7Fw?7P$>p|G4^gx#_Mw*AO^(==)YeKugjj>?YHy8YhT7Vz zo597!jVcC_wrcI-G*`4l;!Z4;h%LcQ$Sd>GPG{zy`Tw5N_n+VMd*1K!d6x4#@B6#y z37f)Li`~bT3|5_o(=#&Ejc8OP=NLbtgD|V0HmJ+ zfShjuU|df0|2TD0FEYn-{Wfyfdb>u0i*y=4-}SwGmf}Ih>S8$#U(%y z0AQVpf=pZ#DFTs-i^nISQf+h(6e!5vcO!KX2NKdX8{Gg;AA}=;7=<`zY;J6#Ypa4l zAgqa3qEUWM&L6{}osDiRiIjjsBFSX3G1<(RK#W12wY0QEnwTO@O^qOhQBoS76p?C# zPtyAU`8UTYDhW%BOCZG&@Q8hGL?j`ZWTUIQpXk%`p-xg<^nWtplRmZuHHh4QgFI_& zg8amWLaq0`C~sn16qI?NZ+q7IK>0tuk9n+-`^o>Sm=B#Ec%fEpRjiSp#%8PH@k~Du z0F;~EoE*@paw}}l_~V!p!1`1&SFBfb)XJ0Uw&7pED%C`zmB0FW8m)QL(U-`b^KY!A z92b`wCUV1agT7T6o`06FVUu7WuZ(w9I{nS5OAFrx`IMTk;=2<4dh6~ifSAr+?X_c8 zV-I#W;c*>iYiC3hZ_#YE#hj;afRZ}GJ_nGKhkZ6a58?lug!R#*KV%Bk-W=g5=W6JC z6}GmtFi|yLEq;wN%(hpzx=MvXSS+?h^nN`1U0Y#C9}Je$H}oi+;LP9Jq3P-AnSrK? zb&pvqLktFk{%1;tj}~tLi2x4EzWlx5>CDW`^QEOFkTZ%8qh_o@d{4%PzfFKieFhjKN@*t)v?5*F)@qFNJb5ymdwPGGQXElerW3BYYRM zm4(AWzAIc?PVRE*5WiTP_wyR<*V@{$GJR~(iq&-Y&~;}h^7e!2-Q1xcDfFP(ut3S; z-!5(SdRwpCAGsFq5=3v$n_j~BPp>O00RtA%y|&zqjg7jhk>!?kF`o}6>11sV=oe?V zUbt|6GE^rtz(ChXnEt|jn@mW_yc*f(DpA~H#Z&f#dmx=2)JvHWB}81lW~lS}$tzHKSIlk&TQO+aZD=pGoo#QzjwS}r5wud-1m2`4uIkWILz&BM;IG3M z@XHr_gKTIC<2G4zP?oY1w6Sc#G1x;{PK9Ev7-Q}s3Qq7h{+8nuZTVf{()F-g3QaYy z8+RJ&UyQOfKs%RW%~@1NXBB1rDV`$Y4suJ7eLk9}m8?sJ>6Ni_3}$nK-}DO_uT!L+ zpztBx?WftP>BLC)^bo!btRWY)(Zt-vQ5^+cb*G^Da)RQ+qS$Nhjw$U&)PZ)bG2Ds9 z!MQ$89ktW{<#D_Ih56Z$5`=o1Z#_AXFc6$eGtj~v0<=`?Th-q+=Kw!psQ)~jy~^KO z4lYhP6?(+nIK+T^m)-}FFIID+Xhli1xK0s77HYj9dcQu$!1i-aMsLv*#0lhQZ5B%L z9`ep%lA7Et=!}Jp6n5GujKrE`^p;XyikNSa;glw+qCGos&zvQ@qkm7p5xLZe7fZ_M zQW!$$2fx_y2Udj?CZz+CB3^V!SoK|sh?<|jLuJ&`4AdWia1Bc0RQTRviD{+ZeX)qk zWr$uaW>E>F-q5L}V0)%&H(!BybgAeS*EufQPUX3>-JLL4!Q}X%6-eFZHw88-t^=8=EP=6sb*yQCg>@l3}CiF;9D7 z1n1-qx;gyvc-Y06U)gG87XrU$z*V#-2kkLq|JYV%nOm+l`MTa+7DF~XLl7&xl!HD- zt4)gZ@2f3qD08y9>O93|wK}`48n4Pd>JY=j`%q*SI9C2Jac;;jWZUj-tTY9qdd7T0 zUjB)X+AK$Hue`dtp&+=+tM1NjSz`*0mhb@k)bZu ZIs8R2x