Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split marker protocol #250

Merged
merged 6 commits into from
Apr 4, 2017
Merged

Split marker protocol #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
816b40b
Update GenericMarker into smaller, more specific protocols
Mar 30, 2017
c05cf6f
Fix polylines & polygons
Mar 31, 2017
38b460c
Add line & polygon order to protocol def
Mar 31, 2017
c632aa8
Fix protocol camel casing & update PointMarker
Mar 31, 2017
e09b847
Differentiate between selectable and non-selectable sys markers
Mar 31, 2017
c17b78c
Fix nits
Apr 4, 2017
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
292 changes: 248 additions & 44 deletions ios-sdkTests/MarkerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import XCTest
@testable import ios_sdk
import TangramMap

class MarkerTests: XCTestCase {
class PointMarkerTests: XCTestCase {

let marker = Marker()
let marker = PointMarker()

func testPoint() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
Expand All @@ -21,26 +21,10 @@ class MarkerTests: XCTestCase {
XCTAssertEqual(marker.point.longitude, point.longitude)
XCTAssertEqual(marker.tgMarker.point.latitude, point.latitude)
XCTAssertEqual(marker.tgMarker.point.longitude, point.longitude)
XCTAssertTrue(marker.tgMarker.stylingString.isEmpty)
marker.size = .zero
XCTAssertTrue(marker.tgMarker.stylingString.contains("style: 'points'"))
XCTAssertFalse(marker.tgMarker.stylingString.contains("size:"))
}

func testPolyline() {
let polyline = TGGeoPolyline()
marker.polyline = polyline
XCTAssertEqual(marker.polyline, polyline)
XCTAssertEqual(marker.tgMarker.polyline, polyline)
XCTAssertTrue(marker.tgMarker.stylingString.contains("style: 'lines'"))
XCTAssertFalse(marker.tgMarker.stylingString.contains("size:"))
}

func testPolygon() {
let polygon = TGGeoPolygon()
marker.polygon = polygon
XCTAssertEqual(marker.polygon, polygon)
XCTAssertEqual(marker.tgMarker.polygon, polygon)
XCTAssertTrue(marker.tgMarker.stylingString.contains("style: 'polygons'"))
XCTAssertFalse(marker.tgMarker.stylingString.contains("size:"))
XCTAssertTrue(marker.tgMarker.stylingString.contains("size:"))
}

//TODO: failing, fix
Expand Down Expand Up @@ -100,15 +84,15 @@ class MarkerTests: XCTestCase {

func testInitWithSize() {
let size = CGSize(width: 30, height: 30)
let m = Marker.init(size: size)
let m = PointMarker.init(size: size)
XCTAssertEqual(m.size, size)
XCTAssertEqual(m.backgroundColor, UIColor.white)
XCTAssertTrue(m.interactive)
XCTAssertTrue(m.tgMarker.stylingString.contains("size: [\(size.width)px, \(size.height)px]"))
}

func testInit() {
let m = Marker.init()
let m = PointMarker.init()
XCTAssertEqual(m.backgroundColor, UIColor.white)
XCTAssertTrue(m.interactive)
XCTAssertFalse(m.tgMarker.stylingString.contains("size:"))
Expand All @@ -126,54 +110,274 @@ class MarkerTests: XCTestCase {
func testSetPointEased() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
let tgMarker = TestTGMarker()
let m = Marker(tgMarker: tgMarker)
let m = PointMarker(tgMarker: tgMarker)
_ = m.setPointEased(point, seconds: 4, easeType: .linear)
XCTAssertEqual(tgMarker.coordinates.latitude, 40.0)
XCTAssertEqual(tgMarker.coordinates.longitude, 70.0)
XCTAssertEqual(tgMarker.seconds, 4)
XCTAssertEqual(tgMarker.ease, .linear)
}
}

class PolylineMarkerTests: XCTestCase {

let marker = PolylineMarker()

func testPolyline() {
let polyline = TGGeoPolyline()
marker.polyline = polyline
XCTAssertEqual(marker.polyline, polyline)
XCTAssertEqual(marker.tgMarker.polyline, polyline)
XCTAssertTrue(marker.tgMarker.stylingString.contains("style: 'lines'"))
XCTAssertFalse(marker.tgMarker.stylingString.contains("size:"))
}

func testVisible() {
XCTAssertTrue(marker.visible)
XCTAssertTrue(marker.tgMarker.visible)
marker.visible = false
XCTAssertFalse(marker.visible)
XCTAssertFalse(marker.tgMarker.visible)
}

func testDrawOrder() {
XCTAssertEqual(marker.drawOrder, 0)
XCTAssertEqual(marker.tgMarker.drawOrder, 0)
marker.drawOrder = 8
XCTAssertEqual(marker.drawOrder, 8)
XCTAssertEqual(marker.tgMarker.drawOrder, 8)
}

func testInteractive() {
XCTAssertTrue(marker.interactive)
marker.interactive = false
XCTAssertFalse(marker.interactive)
XCTAssertTrue(marker.tgMarker.stylingString.contains("interactive: false"))
}

func testOrder() {
XCTAssertEqual(marker.order, 1000)
marker.order = 8
XCTAssertEqual(marker.order, 8)
XCTAssertTrue(marker.tgMarker.stylingString.contains("order: 8"))
}

func testStrokeWidth() {
XCTAssertEqual(marker.strokeWidth, 10)
marker.strokeWidth = 8
XCTAssertEqual(marker.strokeWidth, 8)
XCTAssertTrue(marker.tgMarker.stylingString.contains("width: 8"))
}
}

class PolygonMarkerTests: XCTestCase {

let marker = PolygonMarker()

func testPolygon() {
let polygon = TGGeoPolygon()
marker.polygon = polygon
XCTAssertEqual(marker.polygon, polygon)
XCTAssertEqual(marker.tgMarker.polygon, polygon)
XCTAssertTrue(marker.tgMarker.stylingString.contains("style: 'polygons'"))
XCTAssertFalse(marker.tgMarker.stylingString.contains("size:"))
}

func testVisible() {
XCTAssertTrue(marker.visible)
XCTAssertTrue(marker.tgMarker.visible)
marker.visible = false
XCTAssertFalse(marker.visible)
XCTAssertFalse(marker.tgMarker.visible)
}

func testDrawOrder() {
XCTAssertEqual(marker.drawOrder, 0)
XCTAssertEqual(marker.tgMarker.drawOrder, 0)
marker.drawOrder = 8
XCTAssertEqual(marker.drawOrder, 8)
XCTAssertEqual(marker.tgMarker.drawOrder, 8)
}

func testInteractive() {
XCTAssertTrue(marker.interactive)
marker.interactive = false
XCTAssertFalse(marker.interactive)
XCTAssertTrue(marker.tgMarker.stylingString.contains("interactive: false"))
}

func testOrder() {
XCTAssertEqual(marker.order, 1000)
marker.order = 8
XCTAssertEqual(marker.order, 8)
XCTAssertTrue(marker.tgMarker.stylingString.contains("order: 8"))
}
}

class SystemPointMarkerTests: XCTestCase {

let marker = SystemPointMarker(markerType: .currentLocation)

func testTypeCurrentLocation() {
let m = Marker.initWithMarkerType(.currentLocation)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_current_location_gem.draw.ux-location-gem-overlay")
XCTAssertEqual(marker.tgMarker.stylingPath, "layers.mz_current_location_gem.draw.ux-location-gem-overlay")
XCTAssertTrue(marker.tgMarker.stylingString.isEmpty)
}

func testTypeRouteLocation() {
let m = SystemPointMarker.initWithMarkerType(.routeLocation)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_route_location.draw.ux-location-gem-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}

func testTypeSearchPin() {
let m = Marker.initWithMarkerType(.searchPin)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_search_result.draw.ux-icons-overlay")
func testTypeDroppedPin() {
let m = SystemPointMarker.initWithMarkerType(.droppedPin)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_dropped_pin.draw.ux-icons-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}

func testVisible() {
XCTAssertTrue(marker.visible)
XCTAssertTrue(marker.tgMarker.visible)
marker.visible = false
XCTAssertFalse(marker.visible)
XCTAssertFalse(marker.tgMarker.visible)
}

func testTypeRouteLine() {
let m = Marker.initWithMarkerType(.routeLine)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_route_line.draw.ux-route-line-overlay")
func testDrawOrder() {
XCTAssertEqual(marker.drawOrder, 0)
XCTAssertEqual(marker.tgMarker.drawOrder, 0)
marker.drawOrder = 8
XCTAssertEqual(marker.drawOrder, 8)
XCTAssertEqual(marker.tgMarker.drawOrder, 8)
}

func testPoint() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
marker.point = point
XCTAssertEqual(marker.point.latitude, point.latitude)
XCTAssertEqual(marker.point.longitude, point.longitude)
XCTAssertEqual(marker.tgMarker.point.latitude, point.latitude)
XCTAssertEqual(marker.tgMarker.point.longitude, point.longitude)
}

func testSetPointEased() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
let tgMarker = TestTGMarker()
let m = PointMarker(tgMarker: tgMarker)
_ = m.setPointEased(point, seconds: 4, easeType: .linear)
XCTAssertEqual(tgMarker.coordinates.latitude, 40.0)
XCTAssertEqual(tgMarker.coordinates.longitude, 70.0)
XCTAssertEqual(tgMarker.seconds, 4)
XCTAssertEqual(tgMarker.ease, .linear)
}

}

class SelectableSystemPointMarkerTests: XCTestCase {

let marker = SelectableSystemPointMarker(markerType: .routeStart)

func testTypeRouteStart() {
XCTAssertEqual(marker.tgMarker.stylingPath, "layers.mz_route_start.draw.ux-icons-overlay")
XCTAssertTrue(marker.tgMarker.stylingString.isEmpty)
}

func testTypeRouteDestination() {
let m = SelectableSystemPointMarker.initWithMarkerType(.routeDestination)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_route_destination.draw.ux-icons-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}

func testTypeCurrentLocationInactive() {
let m = Marker.initWithMarkerType(.currentLocation)
m.active = false
// there is no inactive draw rule for curr location so its same as active state
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_current_location_gem.draw.ux-location-gem-overlay")
func testTypeSearchPin() {
let m = SelectableSystemPointMarker.initWithMarkerType(.searchPin)
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_search_result.draw.ux-icons-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}

func testTypeRouteStartInactive() {
marker.active = false
// there is no inactive draw rule for route start so its same as active state
XCTAssertEqual(marker.tgMarker.stylingPath, "layers.mz_route_start.draw.ux-icons-overlay")
XCTAssertTrue(marker.tgMarker.stylingString.isEmpty)
}

func testTypeRouteDestinationInactive() {
let m = SelectableSystemPointMarker.initWithMarkerType(.routeDestination)
marker.active = false
// there is no inactive draw rule for route start so its same as active state
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_route_destination.draw.ux-icons-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}
func testTypeSearchPinInactive() {
let m = Marker.initWithMarkerType(.searchPin)
let m = SelectableSystemPointMarker.initWithMarkerType(.searchPin)
m.active = false
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_search_result.inactive.draw.ux-icons-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
}

func testTypeRouteLineInactive() {
let m = Marker.initWithMarkerType(.routeLine)
m.active = false
// there is no inactive draw rule for route line so its same as active state
XCTAssertEqual(m.tgMarker.stylingPath, "layers.mz_route_line.draw.ux-route-line-overlay")
XCTAssertTrue(m.tgMarker.stylingString.isEmpty)
func testVisible() {
XCTAssertTrue(marker.visible)
XCTAssertTrue(marker.tgMarker.visible)
marker.visible = false
XCTAssertFalse(marker.visible)
XCTAssertFalse(marker.tgMarker.visible)
}

func testDrawOrder() {
XCTAssertEqual(marker.drawOrder, 0)
XCTAssertEqual(marker.tgMarker.drawOrder, 0)
marker.drawOrder = 8
XCTAssertEqual(marker.drawOrder, 8)
XCTAssertEqual(marker.tgMarker.drawOrder, 8)
}

func testPoint() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
marker.point = point
XCTAssertEqual(marker.point.latitude, point.latitude)
XCTAssertEqual(marker.point.longitude, point.longitude)
XCTAssertEqual(marker.tgMarker.point.latitude, point.latitude)
XCTAssertEqual(marker.tgMarker.point.longitude, point.longitude)
}

func testSetPointEased() {
let point = TGGeoPoint(longitude: 70.0, latitude: 40.0)
let tgMarker = TestTGMarker()
let m = PointMarker(tgMarker: tgMarker)
_ = m.setPointEased(point, seconds: 4, easeType: .linear)
XCTAssertEqual(tgMarker.coordinates.latitude, 40.0)
XCTAssertEqual(tgMarker.coordinates.longitude, 70.0)
XCTAssertEqual(tgMarker.seconds, 4)
XCTAssertEqual(tgMarker.ease, .linear)
}

}

class SystemPolylineMarkerTests: XCTestCase {

let marker = SystemPolylineMarker()

func testTypeRouteLine() {
XCTAssertEqual(marker.tgMarker.stylingPath, "layers.mz_route_line.draw.ux-route-line-overlay")
XCTAssertTrue(marker.tgMarker.stylingString.isEmpty)
}

func testVisible() {
XCTAssertTrue(marker.visible)
XCTAssertTrue(marker.tgMarker.visible)
marker.visible = false
XCTAssertFalse(marker.visible)
XCTAssertFalse(marker.tgMarker.visible)
}

func testDrawOrder() {
XCTAssertEqual(marker.drawOrder, 0)
XCTAssertEqual(marker.tgMarker.drawOrder, 0)
marker.drawOrder = 8
XCTAssertEqual(marker.drawOrder, 8)
XCTAssertEqual(marker.tgMarker.drawOrder, 8)
}

}

class TestTGMarker : TGMarker {
Expand Down
Loading