Fix #587: Make all iOS tests work on OSX as well

Daniil Manin · Daniil Manin · commit 501e9c558dd9 · 2019-06-04T11:30:48.000+07:00
diff --git a/MacawTests/Animation/AnimationUtilsTests.swift b/MacawTests/Animation/AnimationUtilsTests.swift
@@ -7,11 +7,10 @@
 //
 
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/Animation/CombineAnimationTests.swift b/MacawTests/Animation/CombineAnimationTests.swift
@@ -7,11 +7,10 @@
 //
 
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/Animation/ControlStatesTests.swift b/MacawTests/Animation/ControlStatesTests.swift
@@ -10,9 +10,7 @@ import XCTest
 
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/Animation/DelayedAnimationTests.swift b/MacawTests/Animation/DelayedAnimationTests.swift
@@ -7,11 +7,10 @@
 //
 
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/Animation/SequenceAnimationTests.swift b/MacawTests/Animation/SequenceAnimationTests.swift
@@ -6,14 +6,11 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
-
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
@@ -84,5 +81,3 @@ class SequenceAnimationTests: XCTestCase {
     }
     
 }
-
-#endif
diff --git a/MacawTests/Bounds/ImageBoundsTests.swift b/MacawTests/Bounds/ImageBoundsTests.swift
@@ -10,9 +10,7 @@ import XCTest
 
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/Bounds/NodeBoundsTests.swift b/MacawTests/Bounds/NodeBoundsTests.swift
@@ -7,11 +7,10 @@
 //
 
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/MacawSVGTests.swift b/MacawTests/MacawSVGTests.swift
@@ -2,9 +2,7 @@ import XCTest
 
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/MacawTests.swift b/MacawTests/MacawTests.swift
@@ -1,9 +1,8 @@
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
diff --git a/MacawTests/SVGParserTest.swift b/MacawTests/SVGParserTest.swift
@@ -7,11 +7,10 @@
 //
 
 import XCTest
+
 #if os(OSX)
 @testable import MacawOSX
-#endif
-
-#if os(iOS)
+#elseif os(iOS)
 @testable import Macaw
 #endif
 
