Merge pull request #4213 from apple/test-cleanups

Assorted test cleanups and fixes

Author: gribozavr

test/1_stdlib/BitwiseOperationsType.swift

@@ -1,5 +1,8 @@
-// RUN: %target-run-simple-swift | FileCheck %s
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+
+import StdlibUnittest
+
 struct MyInt32 : BitwiseOperations {
   var underlying: Int32
 
@@ -22,18 +25,19 @@ prefix func ~(x: MyInt32) -> MyInt32 {
   return MyInt32(underlying: ~x.underlying)
 }
 
-// |=
-var a = MyInt32(underlying: 0x3)
-a |= MyInt32(underlying: 0x4)
-assert(a.underlying == 0x7)
+let BitwiseOperationsTests = TestSuite("BitwiseOperations")
+
+BitwiseOperationsTests.test("smoke test") {
+  var a = MyInt32(underlying: 0x3)
+  a |= MyInt32(underlying: 0x4)
+  expectEqual(0x7, a.underlying)
 
-// &=
-a &= MyInt32(underlying: 0x5)
-assert(a.underlying == 0x5)
+  a &= MyInt32(underlying: 0x5)
+  expectEqual(0x5, a.underlying)
+
+  a ^= MyInt32(underlying: 0x6)
+  expectEqual(0x3, a.underlying)
+}
 
-// ^= 
-a ^= MyInt32(underlying: 0x6)
-assert(a.underlying == 0x3)
+runAllTests()
 
-// CHECK: done
-print("done")

test/1_stdlib/Float.swift

@@ -1,15 +1,19 @@
-// RUN: rm -rf %t &&mkdir %t
+// RUN: rm -rf %t && mkdir %t
 // RUN: cp %s %t/main.swift
 
 // RUN: echo "typealias TestFloat = Float" > %t/float_type.swift
 // RUN: %target-build-swift %t/main.swift %t/float_type.swift -o %t/float.out
-// RUN: %target-run %t/float.out | FileCheck %s
+// RUN: %target-run %t/float.out
 
 // RUN: echo "typealias TestFloat = Double" > %t/double_type.swift
 // RUN: %target-build-swift %t/main.swift %t/double_type.swift -o %t/double.out
-// RUN: %target-run %t/double.out | FileCheck %s
+// RUN: %target-run %t/double.out
 // REQUIRES: executable_test
 
+import StdlibUnittest
+
+var FloatTests = TestSuite("Float")
+
 //===---
 // Helpers
 //===---
@@ -36,7 +40,7 @@ func checkNormal(_ normal: TestFloat) {
   _precondition(!normal.isSignalingNaN)
 }
 
-func testNormal() {
+FloatTests.test("normal") {
   let positiveNormal: TestFloat = 42.0
   checkNormal(positiveNormal)
   _precondition(positiveNormal.sign == .plus)
@@ -53,11 +57,7 @@ func testNormal() {
   _precondition(negativeNormal != positiveNormal)
   _precondition(positiveNormal == -negativeNormal)
   _precondition(negativeNormal == -positiveNormal)
-
-  print("testNormal done")
 }
-testNormal()
-// CHECK: testNormal done
 
 //===---
 // Zeroes
@@ -73,7 +73,7 @@ func checkZero(_ zero: TestFloat) {
   _precondition(!zero.isSignalingNaN)
 }
 
-func testZero() {
+FloatTests.test("zero") {
   let plusZero = noinlinePlusZero()
   checkZero(plusZero)
   _precondition(plusZero.sign == .plus)
@@ -90,11 +90,7 @@ func testZero() {
   _precondition(minusZero == -0.0)
   _precondition(minusZero == plusZero)
   _precondition(minusZero == minusZero)
-
-  print("testZero done")
 }
-testZero()
-// CHECK: testZero done
 
 //===---
 // Subnormals
@@ -118,7 +114,8 @@ func asUInt64(_ a: UInt32) -> UInt64 {
   return UInt64(a)
 }
 
-func testSubnormal() {
+#if !arch(arm)
+FloatTests.test("subnormal") {
   var iterations: Int
   switch asUInt64(TestFloat.RawSignificand.max) {
     case UInt64.max:
@@ -145,16 +142,8 @@ func testSubnormal() {
   _precondition(negativeSubnormal.sign == .minus)
   _precondition(negativeSubnormal.floatingPointClass == .negativeSubnormal)
   _precondition(negativeSubnormal != -0.0)
-
-  print("testSubnormal done")
 }
-
-#if arch(arm)
-  print("testSubnormal done")
-#else
-  testSubnormal()
 #endif
-// CHECK: testSubnormal done
 
 //===---
 // Infinities
@@ -170,7 +159,7 @@ func checkInf(_ inf: TestFloat) {
   _precondition(!inf.isSignalingNaN)
 }
 
-func testInf() {
+FloatTests.test("infinity") {
   var stdlibPlusInf = TestFloat.infinity
   checkInf(stdlibPlusInf)
   _precondition(stdlibPlusInf.sign == .plus)
@@ -196,11 +185,7 @@ func testInf() {
 
   _precondition(stdlibPlusInf != computedMinusInf)
   _precondition(stdlibMinusInf != computedPlusInf)
-
-  print("testInf done")
 }
-testInf()
-// CHECK: testInf done
 
 //===---
 // NaNs
@@ -231,7 +216,7 @@ func checkSNaN(_ snan: TestFloat) {
 #endif
 }
 
-func testNaN() {
+FloatTests.test("nan") {
   var stdlibDefaultNaN = TestFloat.nan
   checkQNaN(stdlibDefaultNaN)
 
@@ -240,11 +225,7 @@ func testNaN() {
 
   var stdlibSNaN = TestFloat.signalingNaN
   checkSNaN(stdlibSNaN)
-  print("testNaN done")
 }
-testNaN()
-// CHECK: testNaN done
 
-print("all done.")
-// CHECK: all done.
+runAllTests()
 

test/1_stdlib/Zip.swift

@@ -7,4 +7,4 @@
 // A-DAG: Pattern/ExprSpecific:               ['(']{#(x): Int#})[#Void#]{{; name=.+$}}
 // A: End completions
 func f(_ x: Int) {}
-f(#^A^#
+f(#^A^#

test/IDE/complete_at_eof_in_call_no_newline_1.swift

@@ -13,4 +13,4 @@ struct FooStruct {
 }
 var fooObject: FooStruct
 // There is no newline on the following line.  Don't fix this!
-fooObject.#^A^#
+fooObject.#^A^#

test/IDE/complete_at_eof_no_newline_1.swift

@@ -10,4 +10,4 @@
 // A: End completions
 func f() {}
 // There is no newline on the following line.  Don't fix this!
-#^A^#
+#^A^#

test/IDE/complete_at_eof_no_newline_2.swift

@@ -1,4 +1,4 @@
 // RUN: %target-parse-verify-swift
 
 // This file does not end in a trailing newline; this is deliberate!
-/* unterminated block comment expected-note{{comment started here}} expected-error{{unterminated '/*' comment}}{{126-126=*/}}
+/* unterminated block comment expected-note{{comment started here}} expected-error{{unterminated '/*' comment}}{{126-126=*/}}

test/Parse/EOF/block-comment-missing-newline.swift

@@ -4,4 +4,4 @@
 
 // This file does not end in a trailing newline; this is deliberate, don't fix it!
 
-/* expected-error {{unterminated string literal}} */ "
+/* expected-error {{unterminated string literal}} */ "