Dev: fix int 8 tests

Author: andriydruk

compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java

@@ -229,7 +229,12 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
 
         if (returnSwiftType != null) {
             if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
-                swiftWriter.emitStatement("return optionalResult");
+                if (returnSwiftType.swiftType.equals("Bool")) {
+                    swiftWriter.emitStatement("return optionalResult == JNI_TRUE");
+                }
+                else {
+                    swiftWriter.emitStatement("return optionalResult");
+                }
             }
             else {
                 swiftWriter.emitStatement("guard let result = optionalResult else {");

compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java

@@ -177,7 +177,7 @@ else if (param.isOptional) {
         }
 
         if (returnSwiftType != null) {
-            if (returnSwiftType.isPrimitiveType()) {
+            if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
                 if (returnSwiftType.swiftType.equals("Bool")) {
                     swiftWriter.emitStatement("return jboolean(result ? JNI_TRUE : JNI_FALSE)");
                 }

compiler/src/main/java/com/readdle/codegen/SwiftGetterDescriptor.java

@@ -75,7 +75,7 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
         swiftWriter.emitStatement(String.format("let result = %s.%s", isStatic ? swiftType : "swiftSelf", swiftName));
 
         if (returnSwiftType != null) {
-            if (returnSwiftType.isPrimitiveType()) {
+            if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
                 if (returnSwiftType.swiftType.equals("Bool")) {
                     swiftWriter.emitStatement("return jboolean(result ? JNI_TRUE : JNI_FALSE)");
                 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int8Tests.java

@@ -1,7 +1,6 @@
 package com.readdle.swiftjava.sample;
 
 import android.support.test.runner.AndroidJUnit4;
-import android.util.Log;
 
 import com.readdle.codegen.anotation.JavaSwift;
 
@@ -52,12 +51,37 @@ public void testOptionalParam() {
         Assert.assertFalse(Int8Test.testOptionalParam(Byte.MIN_VALUE));
     }
 
+    public void testOptionalReturnType() {
+        Byte result = Int8Test.testOptionalReturnType();
+        Assert.assertNotNull(result);
+        Assert.assertEquals(result.byteValue(), Byte.MAX_VALUE);
+    }
+
+    @Test
+    public void testProtocolParam() {
+        boolean result = Int8Test.testProtocolParam(param -> param == Byte.MAX_VALUE);
+        Assert.assertTrue(result);
+    }
+
     @Test
     public void testProtocolReturnType() {
         byte result = Int8Test.testProtocolReturnType(() -> (byte) 42);
         Assert.assertEquals(result, 42);
     }
 
+    @Test
+    public void testProtocolOptionalParam() {
+        boolean result = Int8Test.testProtocolOptionalParam(param -> param != null && param == Byte.MAX_VALUE);
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void testProtocolOptionalReturnType() {
+        Byte result = Int8Test.testProtocolOptionalReturnType(() -> (byte) 42);
+        Assert.assertNotNull(result);
+        Assert.assertEquals(result.byteValue(), 42);
+    }
+
     @Test
     public void testEncode() {
         Int8TestStruct result = Int8Test.testEncode();

sample/src/main/java/com/readdle/swiftjava/sample/Int8Test.kt

@@ -6,31 +6,6 @@ import com.readdle.codegen.anotation.SwiftReference
 import com.readdle.codegen.anotation.SwiftValue
 import java.lang.annotation.Native
 
-// TODO: fix it
-//    @SwiftDelegate(protocols = ["Int8TestParamProtocol"])
-//    interface ParamProtocol {
-//        @SwiftCallbackFunc
-//        fun testParam(param: Byte): Boolean
-//    }
-
-@SwiftDelegate(protocols = ["Int8TestReturnTypeProtocol"])
-interface ReturnTypeProtocol {
-    @SwiftCallbackFunc
-    fun testReturnType(): Byte
-}
-// TODO: fix it
-//    @SwiftDelegate(protocols = ["Int8TestOptionalParamProtocol"])
-//    interface OptionalParamProtocol {
-//        @SwiftCallbackFunc
-//        fun testOptionalParam(param: Byte?): Boolean
-//    }
-
-@SwiftDelegate(protocols = ["Int8TestOptionalReturnTypeProtocol"])
-interface OptionalReturnTypeProtocol {
-    @SwiftCallbackFunc
-    fun testOptionalReturnType(): Byte?
-}
-
 @SwiftValue
 data class Int8TestStruct(var zero: Byte = 0,
                           var max: Byte = Byte.MAX_VALUE,
@@ -41,6 +16,30 @@ data class Int8TestStruct(var zero: Byte = 0,
 @SwiftReference
 class Int8Test private constructor() {
 
+    @SwiftDelegate(protocols = ["Int8TestParamProtocol"])
+    interface Int8ParamProtocol {
+        @SwiftCallbackFunc
+        fun testParam(param: Byte): Boolean
+    }
+
+    @SwiftDelegate(protocols = ["Int8TestReturnTypeProtocol"])
+    interface Int8ReturnTypeProtocol {
+        @SwiftCallbackFunc
+        fun testReturnType(): Byte
+    }
+
+    @SwiftDelegate(protocols = ["Int8TestOptionalParamProtocol"])
+    interface Int8OptionalParamProtocol {
+        @SwiftCallbackFunc
+        fun testOptionalParam(param: Byte?): Boolean
+    }
+
+    @SwiftDelegate(protocols = ["Int8TestOptionalReturnTypeProtocol"])
+    interface Int8OptionalReturnTypeProtocol {
+        @SwiftCallbackFunc
+        fun testOptionalReturnType(): Byte?
+    }
+
     companion object {
         @JvmStatic
         external fun testZero(): Byte
@@ -60,16 +59,20 @@ class Int8Test private constructor() {
         @JvmStatic
         external fun testOptionalParam(param: Byte?): Boolean
 
-        // TODO: fix it
-//        @JvmStatic
-//        external fun testOptionalReturnType(): Byte?
+        @JvmStatic
+        external fun testOptionalReturnType(): Byte?
+
+        @JvmStatic
+        external fun testProtocolParam(callback: Int8ParamProtocol): Boolean
 
         @JvmStatic
-        external fun testProtocolReturnType(callback: ReturnTypeProtocol): Byte
+        external fun testProtocolReturnType(callback: Int8ReturnTypeProtocol): Byte
 
-        // TODO: fix it
-//        @JvmStatic
-//        external fun testProtocolOptionalReturnType(callback: OptionalReturnTypeProtocol): Byte?
+        @JvmStatic
+        external fun testProtocolOptionalParam(callback: Int8OptionalParamProtocol): Boolean
+
+        @JvmStatic
+        external fun testProtocolOptionalReturnType(callback: Int8OptionalReturnTypeProtocol): Byte?
 
         @JvmStatic
         external fun testEncode():  Int8TestStruct

sample/src/main/swift/Sources/SampleAppCore/Int8Test.swift

@@ -79,7 +79,6 @@ public class Int8Test {
     }
 
     public static func testDecode(_ value: Int8TestStruct) -> Bool {
-        NSLog("!!!\(value.max)!!!")
         return value == Int8TestStruct()
     }