From 48f852973bb15f1ebc31fcb109343894ea6aad12 Mon Sep 17 00:00:00 2001
From: Dmitri Gribenko <gribozavr@gmail.com>
Date: Thu, 4 Aug 2016 00:18:14 -0700
Subject: [PATCH] Remove redundant tests for SpriteKit

These exact tests already exist in
validation-test/stdlib/SpriteKit.swift.
---
 test/1_stdlib/SpriteKit.swift          | 71 --------------------------
 validation-test/stdlib/SpriteKit.swift | 17 +++++-
 2 files changed, 15 insertions(+), 73 deletions(-)
 delete mode 100644 test/1_stdlib/SpriteKit.swift

diff --git a/test/1_stdlib/SpriteKit.swift b/test/1_stdlib/SpriteKit.swift
deleted file mode 100644
index e41ae035b8a12..0000000000000
--- a/test/1_stdlib/SpriteKit.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-// RUN: %target-run-simple-swift | FileCheck %s
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-
-// watchOS does not have SpriteKit.
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-import Foundation
-import SpriteKit
-
-// Check that the subscript is there.
-@available(OSX,introduced: 10.10)
-@available(iOS,introduced: 8.0)
-@available(tvOS,introduced: 8.0)
-@available(watchOS,introduced: 2.0)
-func testSubscript(_ node: SKNode) {
-  var _: [SKNode] = node["me"]
-}
-
-// SKColor is NSColor on OS X and UIColor on iOS.
-
-var r = CGFloat(0)
-var g = CGFloat(0)
-var b = CGFloat(0)
-var a = CGFloat(0)
-var color = SKColor.red
-color.getRed(&r, green:&g, blue:&b, alpha:&a)
-print("color \(r) \(g) \(b) \(a)")
-// CHECK: color 1.0 0.0 0.0 1.0
-
-#if os(OSX)
-func f(_ c: NSColor) {
-  print("colortastic")
-}
-#endif
-#if os(iOS) || os(tvOS)
-func f(_ c: UIColor) {
-  print("colortastic")
-}
-#endif
-f(color)
-// CHECK: colortastic
-
-var SpriteKitTests = TestSuite("SpriteKit")
-
-if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
-  SpriteKitTests.test("SKNode.setValue(_:forAttribute:)") {
-    let node = SKNode()
-    let attrVal = SKAttributeValue(float: 2.0)
-    node.setValue(attrVal, forAttribute: "test")
-    expectEqual(node.attributeValues["test"], attrVal)
-  }
-
-  SpriteKitTests.test("SKWarpGeometryGrid") {
-    var warpGrid = SKWarpGeometryGrid(columns: 3, rows: 4)
-    expectEqual(warpGrid.numberOfColumns, 3)
-
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 0.0)
-    warpGrid = warpGrid.replacingBySourcePositions(positions: [float2(30.0)])
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 30.0)
-
-    expectEqual(warpGrid.destPosition(at: 0).x, 0.0)
-    warpGrid = warpGrid.replacingByDestinationPositions(positions: [float2(30.0)])
-    expectEqual(warpGrid.destPosition(at: 0).x, 30.0)
-  }
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/SpriteKit.swift b/validation-test/stdlib/SpriteKit.swift
index 6e4685fc8ec24..fe1378963fa00 100644
--- a/validation-test/stdlib/SpriteKit.swift
+++ b/validation-test/stdlib/SpriteKit.swift
@@ -52,9 +52,9 @@ if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
     expectEqual(node.attributeValues["test"], attrVal)
   }
 
-  SpriteKitTests.test("SKWarpGeometryGrid") {
+  SpriteKitTests.test("SKWarpGeometryGrid/1") {
     var warpGrid = SKWarpGeometryGrid(columns: 1, rows: 1)
-    expectEqual(warpGrid.numberOfColumns, 1) 
+    expectEqual(warpGrid.numberOfColumns, 1)
 
     expectEqual(warpGrid.sourcePosition(at: 0).x, 0.0)
     warpGrid = warpGrid.replacingBySourcePositions(positions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
@@ -76,6 +76,19 @@ if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
     expectEqual(warpGrid.destPosition(at: 0).x, 1.0)
     expectEqual(warpGrid.sourcePosition(at: 0).x, 2.0)
   }
+
+  SpriteKitTests.test("SKWarpGeometryGrid/2") {
+    var warpGrid = SKWarpGeometryGrid(columns: 3, rows: 4)
+    expectEqual(warpGrid.numberOfColumns, 3)
+
+    expectEqual(warpGrid.sourcePosition(at: 0).x, 0.0)
+    warpGrid = warpGrid.replacingBySourcePositions(positions: [float2(30.0)])
+    expectEqual(warpGrid.sourcePosition(at: 0).x, 30.0)
+
+    expectEqual(warpGrid.destPosition(at: 0).x, 0.0)
+    warpGrid = warpGrid.replacingByDestinationPositions(positions: [float2(30.0)])
+    expectEqual(warpGrid.destPosition(at: 0).x, 30.0)
+  }
 }
 
 runAllTests()