Test fixes

4 files changed, 7 insertions, 9 deletions

diff --git a/swift/src/Ice/CommunicatorI.swift b/swift/src/Ice/CommunicatorI.swift
index 9c2f2f46b9b..f4dff7c7666 100644
--- a/swift/src/Ice/CommunicatorI.swift
+++ b/swift/src/Ice/CommunicatorI.swift
@@ -36,10 +36,6 @@ class CommunicatorI: LocalObject<ICECommunicator>, Communicator {
         super.init(handle: handle)
     }
 
-    deinit {
-        print("destryoing communicator")
-    }
-
     func destroy() {
         _handle.destroy()
     }
diff --git a/swift/src/Ice/Globals.swift b/swift/src/Ice/Globals.swift
index da213916735..a609c55adfd 100644
--- a/swift/src/Ice/Globals.swift
+++ b/swift/src/Ice/Globals.swift
@@ -64,14 +64,14 @@ public func initialize(args: StringSeq = [],
     }
 }
 
-public func createProperties(args: StringSeq? = nil, defaults: Properties? = nil) throws -> (Properties, StringSeq?) {
+public func createProperties(args: StringSeq? = nil, defaults: Properties? = nil) throws -> (Properties, StringSeq) {
     return try autoreleasepool {
         var remArgs: NSArray?
         let propertiesHandle = try ICEUtil.createProperties(args,
                                                             defaults: (defaults as? PropertiesI)?._handle,
                                                             remArgs: &remArgs)
 
-        return (PropertiesI(handle: propertiesHandle), remArgs as? StringSeq)
+        return (PropertiesI(handle: propertiesHandle), remArgs as! StringSeq)
     }
 }
 
diff --git a/swift/src/Ice/InitializationData.swift b/swift/src/Ice/InitializationData.swift
index dae3ffe629b..b5ba18b077b 100644
--- a/swift/src/Ice/InitializationData.swift
+++ b/swift/src/Ice/InitializationData.swift
@@ -8,6 +8,8 @@
 // **********************************************************************
 
 public struct InitializationData {
-    var properties: Properties?
-    var logger: Logger?
+    public init() {}
+
+    public var properties: Properties?
+    public var logger: Logger?
 }
diff --git a/swift/src/Ice/OutputStream.swift b/swift/src/Ice/OutputStream.swift
index 22266a29ee4..7b9a7c1f1f6 100644
--- a/swift/src/Ice/OutputStream.swift
+++ b/swift/src/Ice/OutputStream.swift
@@ -125,7 +125,7 @@ public class OutputStream {
         }
     }
 
-    func finished() -> [UInt8] {
+    public func finished() -> [UInt8] {
         // Create a copy
         return Array(UnsafeRawBufferPointer(start: buf.baseAddress!, count: buf.count))
     }