Merge pull request #10 from typelift/topic/tests-fix

Some minor test fixes and improvements

Author: CodaFi

Aquifer/Basic.swift

@@ -361,4 +361,3 @@ private func toListRepr<V>(p: ProxyRepr<X, (), (), V, ()>) -> List<V> {
     case .Pure(_): return []
     }
 }
-

AquiferTests/ProxyTests.swift

@@ -35,15 +35,15 @@ class ProxySpec : XCTestCase {
             let g = aProxy(g2)
             let h = aProxy(h2)
 
-            return formulate((f >-> g) |>| h, (f |>| h) >-> (g |>| h))(s, c)
+            return formulate((f >>->> g) |>| h, (f |>| h) >>->> (g |>| h))(s, c)
         }
 
         property("Request distributes over composition") <- forAll { (f2 : AProxy, g2 : AProxy, h2 : AProxy, s : AServer, c : AClient) in
             let f = aProxy(f2)
             let g = aProxy(g2)
             let h = aProxy(h2)
 
-            return formulate(f >|> (g >-> h), (f >|> g) >-> (f >|> h))(s, c)
+            return formulate(f >|> (g >>->> h), (f >|> g) >>->> (f >|> h))(s, c)
         }
 
         /// Need closures here.  Autoclosures crash Swiftc.
@@ -54,10 +54,15 @@ class ProxySpec : XCTestCase {
                 formulate({ $0.reflect() } • { request($0) }, { respond($0) })(s, c)
         }
 
-        property("Request Zero Law") <- forAll { (p2 : AProxy, s : AServer, c : AClient) in
+        property("Request Right Zero Law") <- forAll { (p2 : AProxy, s : AServer, c : AClient) in
             let p = aProxy(p2)
             return formulate(p >|> Proxy.pure, Proxy.pure)(s, c)
         }
+
+        property("Respond Left Zero Law") <- forAll { (p2 : AProxy, s : AServer, c : AClient) in
+            let p = aProxy(p2)
+            return formulate(Proxy.pure |>| p, Proxy.pure)(s, c)
+        }
 
         property("Push-Pull respect associativity") <- forAll { (f2 : AProxy, g2 : AProxy, h2 : AProxy, s : AServer, c : AClient) in
             let f = aProxy(f2)
@@ -76,12 +81,12 @@ class ProxySpec : XCTestCase {
 
         property("Involution") <- forAll { (p2 : AProxy, s : AServer, c : AClient) in
             let p = aProxy(p2)
-            return formulate({ $0.reflect() } • { $0.reflect() } • p >-> Proxy.pure, p)(s, c)
+            return formulate({ $0.reflect() } • { $0.reflect() } • p, p)(s, c)
         }
     }
 
     func testCategoricalProperties() {
-        property("Kleisli Category") <- self.testCategory(>->)(Proxy<Int, Int, Int, Int, Int>.pure)
+        property("Kleisli Category") <- self.testCategory(>>->>)(Proxy<Int, Int, Int, Int, Int>.pure)
         property("Respond Category") <- self.testCategory(|>|)({ respond($0) })
         property("Request Category") <- self.testCategory(>|>)({ request($0) })
         property("Pull Category") <- self.testCategory(>+>)({ pull($0) })

AquiferTests/TestDefs.swift

@@ -115,7 +115,7 @@ func inc<UO, UI, DI, DO>(n : Int) -> Proxy<UO, UI, DI, DO, Int> {
 
 func correct(str : String) -> String {
 	if str.isEmpty {
-		return "return"
+		return "pure"
 	}
 	return str
 }
@@ -124,7 +124,7 @@ struct AClient : CustomStringConvertible {
 	let unAClient : [ClientStep]
 
 	var description : String {
-		return correct(self.unAClient.map({ $0.description }).intersperse(" >-> ").reduce("", combine: +))
+		return correct(self.unAClient.map({ $0.description }).intersperse(" >>->> ").reduce("", combine: +))
 	}
 }
 
@@ -149,14 +149,14 @@ func aClient(client : AClient) -> (Int -> Proxy<Int, Int, (), X, Int> /* Client<
 			return inc
 		}
 	})
-	return p.reduce(Proxy.pure, combine: >->)
+	return p.reduce(Proxy.pure, combine: >>->>)
 }
 
 struct AServer : CustomStringConvertible {
 	let unAServer : [ServerStep]
 
 	var description : String {
-		return correct(self.unAServer.map({ $0.description }).intersperse(" >-> ").reduce("", combine: +))
+		return correct(self.unAServer.map({ $0.description }).intersperse(" >>->> ").reduce("", combine: +))
 	}
 }
 
@@ -180,14 +180,14 @@ func aServer(server : AServer) -> (Int -> Proxy<X, (), Int, Int, Int> /* Server<
 		case .ServerInc:
 			return inc
 		}
-	}).reduce(Proxy.pure, combine: >->)
+	}).reduce(Proxy.pure, combine: >>->>)
 }
 
 struct AProxy : Hashable, CustomStringConvertible {
 	let unAProxy : [ProxyStep]
 
 	var description : String {
-		return correct(self.unAProxy.map({ $0.description }).intersperse(" >-> ").reduce("", combine: +))
+		return correct(self.unAProxy.map({ $0.description }).intersperse(" >>->> ").reduce("", combine: +))
 	}
 
 	var hashValue : Int {
@@ -227,7 +227,7 @@ func aProxy(proxy : AProxy) -> (Int -> Proxy<Int, Int, Int, Int, Int>) {
 		case .ProxyInc:
 			return inc
 		}
-	}).reduce(Proxy.pure, combine: >->)
+	}).reduce(Proxy.pure, combine: >>->>)
 }
 
 struct ProxyK {
@@ -245,10 +245,13 @@ func formulate(pl : ProxyK.T, _ pr : ProxyK.T)(_ p0 : AServer, _ p1 : AClient) -
 }
 
 /// Kleisli Composition.
-func >-> <A, B, C, UI, UO, DI, DO>(m1 : A -> Proxy<UI, UO, DI, DO, B>, m2 : B -> Proxy<UI, UO, DI, DO, C>) -> (A -> Proxy<UI, UO, DI, DO, C>) {
+infix operator >>->> {
+associativity left
+precedence 110
+}
+
+func >>->> <A, B, C, UI, UO, DI, DO>(m1 : A -> Proxy<UI, UO, DI, DO, B>, m2 : B -> Proxy<UI, UO, DI, DO, C>) -> (A -> Proxy<UI, UO, DI, DO, C>) {
 	return { r in
 		return m1(r) >>- m2
 	}
 }
-
-