Fix OS and device agnostic tests

frederoni · frederoni · commit c3f89b0544f3 · 2018-10-18T15:03:55.000+02:00
diff --git a/MapboxNavigationTests/InstructionsBannerViewSnapshotTests.swift b/MapboxNavigationTests/InstructionsBannerViewSnapshotTests.swift
@@ -257,7 +257,7 @@ class InstructionsBannerViewSnapshotTests: FBSnapshotTestCase {
     }
     
     func testExitShields() {
-        let window = UIApplication.shared.delegate!.window!!
+        let window = UIWindow(frame: CGRect(origin: .zero, size: .iPhone6Plus))
         let view = instructionsView()
         styleInstructionsView(view)
         view.maneuverView.isStart = true
@@ -279,7 +279,7 @@ class InstructionsBannerViewSnapshotTests: FBSnapshotTestCase {
     }
     
     func testGenericShields() {
-        let window = UIApplication.shared.delegate!.window!!
+        let window = UIWindow(frame: CGRect(origin: .zero, size: .iPhone6Plus))
         let view = instructionsView()
         styleInstructionsView(view)
         view.maneuverView.isStart = true
diff --git a/MapboxNavigationTests/ManeuverViewTests.swift b/MapboxNavigationTests/ManeuverViewTests.swift
@@ -27,22 +27,22 @@ class ManeuverViewTests: FBSnapshotTestCase {
     
     func testStraightRoundabout() {
         maneuverView.visualInstruction = maneuverInstruction(.takeRoundabout, .straightAhead, .right)
-        FBSnapshotVerifyLayer(maneuverView.layer)
+        verify(maneuverView.layer)
     }
     
     func testTurnRight() {
         maneuverView.visualInstruction = maneuverInstruction(.turn, .right, .right)
-        FBSnapshotVerifyLayer(maneuverView.layer)
+        verify(maneuverView.layer)
     }
     
     func testTurnSlightRight() {
         maneuverView.visualInstruction = maneuverInstruction(.turn, .slightRight, .right)
-        FBSnapshotVerifyLayer(maneuverView.layer)
+        verify(maneuverView.layer)
     }
     
     func testMergeRight() {
         maneuverView.visualInstruction = maneuverInstruction(.merge, .right, .right)
-        FBSnapshotVerifyLayer(maneuverView.layer)
+        verify(maneuverView.layer)
     }
     
     func testRoundabout() {
@@ -58,7 +58,7 @@ class ManeuverViewTests: FBSnapshotTestCase {
             views.addSubview(view)
         }
         
-        FBSnapshotVerifyLayer(views.layer, suffixes: ["_64"])
+        verify(views.layer)
     }
     
     // TODO: Figure out why the flip transformation do not render in a snapshot so we can test left turns and left side rule of the road.

Original file line number	Diff line number	Diff line change
`@@ -27,22 +27,22 @@ class ManeuverViewTests: FBSnapshotTestCase {`
`27`	`27`
`28`	`28`	`func testStraightRoundabout() {`
`29`	`29`	`maneuverView.visualInstruction = maneuverInstruction(.takeRoundabout, .straightAhead, .right)`
`30`		`- FBSnapshotVerifyLayer(maneuverView.layer)`
	`30`	`+ verify(maneuverView.layer)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func testTurnRight() {`
`34`	`34`	`maneuverView.visualInstruction = maneuverInstruction(.turn, .right, .right)`
`35`		`- FBSnapshotVerifyLayer(maneuverView.layer)`
	`35`	`+ verify(maneuverView.layer)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func testTurnSlightRight() {`
`39`	`39`	`maneuverView.visualInstruction = maneuverInstruction(.turn, .slightRight, .right)`
`40`		`- FBSnapshotVerifyLayer(maneuverView.layer)`
	`40`	`+ verify(maneuverView.layer)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func testMergeRight() {`
`44`	`44`	`maneuverView.visualInstruction = maneuverInstruction(.merge, .right, .right)`
`45`		`- FBSnapshotVerifyLayer(maneuverView.layer)`
	`45`	`+ verify(maneuverView.layer)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func testRoundabout() {`
`@@ -58,7 +58,7 @@ class ManeuverViewTests: FBSnapshotTestCase {`
`58`	`58`	`views.addSubview(view)`
`59`	`59`	`}`
`60`	`60`
`61`		`- FBSnapshotVerifyLayer(views.layer, suffixes: ["_64"])`
	`61`	`+ verify(views.layer)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// TODO: Figure out why the flip transformation do not render in a snapshot so we can test left turns and left side rule of the road.`