1 files changed, 35 insertions, 32 deletions
diff --git a/swift/test/Ice/stream/Client.swift b/swift/test/Ice/stream/Client.swift
index 5aca41b2e38..bdd169bb9c3 100644
--- a/swift/test/Ice/stream/Client.swift
+++ b/swift/test/Ice/stream/Client.swift
@@ -3,43 +3,46 @@
 //
 
 import Ice
+import TestCommon
 import Foundation
 
-func main() throws {
-    fputs("testing primitive types... ", stdout)
-    do
-    {
-        var communicator = try Ice.initialize()
-        defer {
-            communicator.destroy()
-        }
+public class Client : TestHelperI {
 
-        var inS:Ice.InputStream
-        var outS:Ice.OutputStream
+    public override func run(args: [String]) throws {
 
-        do {
-            let data = [UInt8]()
-            inS = Ice.InputStream(communicator: communicator, bytes: data)
-        }
+        fputs("testing primitive types... ", stdout)
+        do
+        {
+            var communicator = try Ice.initialize()
+            defer {
+                communicator.destroy()
+            }
+
+            var inS:Ice.InputStream
+            var outS:Ice.OutputStream
 
-        do {
-            outS = Ice.OutputStream(communicator: communicator)
-            outS.startEncapsulation()
-            outS.write(true)
-            outS.endEncapsulation()
-            var data = outS.finished()
-            
-            inS = Ice.InputStream(communicator: communicator, bytes: data)
-            try inS.startEncapsulation()
-            assert(inS.read(as: Bool.self))
-            
-            
-            
+            do {
+                let data = [UInt8]()
+                inS = Ice.InputStream(communicator: communicator, bytes: data)
+            }
+
+            do {
+                outS = Ice.OutputStream(communicator: communicator)
+                outS.startEncapsulation()
+                outS.write(true)
+                outS.endEncapsulation()
+                let data = outS.finished()
+                
+                inS = Ice.InputStream(communicator: communicator, bytes: data)
+                try inS.startEncapsulation()
+                let b = try Bool(from: inS)
+                assert(b)
+            }
         }
+        catch let err
+        {
+            print(err)
+        }
+        print("ok")
     }
-    catch let err
-    {
-        print(err)
-    }
-    print("ok")
 }