* fixed tests and added tests for <swiftSupport>

MobiVM · Jul 16, 2022 · 83eff48 · 83eff48
1 parent 5a723fe
commit 83eff48
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/compiler/compiler/src/test/java/org/robovm/compiler/config/ConfigTest.java b/compiler/compiler/src/test/java/org/robovm/compiler/config/ConfigTest.java
@@ -18,10 +18,7 @@
 
 import static org.junit.Assert.*;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
+import java.io.*;
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -418,4 +415,34 @@ public void testGetFileName() throws Exception {
         assertEquals("com/example/AB9ca44297c0e0d22df654119dce73ee52d3d51c71.class.o",
                 Config.getFileName("com/example/ABCDEFGIHJABCDEFGIHJABCDEFGIHJABCDEFGIHJABCDEFGIHJ", "class.o", 50));
     }
+
+    @Test
+    public void testSwiftSupportEnabledByDefault() throws Exception {
+        String configText = "<config>\n" +
+                "  <target>ios</target>\n" +
+                "</config>";
+        Config.Builder builder = new Config.Builder();
+
+        builder.read(new StringReader(configText), wd);
+        Config config = builder.config;
+
+        assertTrue(config.hasSwiftSupport());
+        assertNotNull(config.getSwiftSupport());
+        assertTrue(config.getSwiftSupport().isEnabled());
+        assertTrue(config.getSwiftSupport().shouldCopySwiftLibs());
+    }
+
+    @Test
+    public void testSwiftSupportCanBeDisabled() throws Exception {
+        String configText = "<config>\n" +
+                "  <swiftSupport>\n" +
+                "    <enable>false</enable>\n" +
+                "  </swiftSupport>\n" +
+                "</config>";
+        Config.Builder builder = new Config.Builder();
+        builder.read(new StringReader(configText), wd);
+        Config config = builder.config;
+        assertFalse(config.hasSwiftSupport());
+        assertNull(config.getSwiftSupport());
+    }
 }
diff --git a/compiler/compiler/src/test/resources/org/robovm/compiler/config/ConfigTest.console.xml b/compiler/compiler/src/test/resources/org/robovm/compiler/config/ConfigTest.console.xml
@@ -15,6 +15,10 @@
     <framework>Foundation</framework>
     <framework>AppKit</framework>
   </frameworks>
+  <swiftSupport>
+    <enable>true</enable>
+    <copySwiftLibs>true</copySwiftLibs>
+  </swiftSupport>
   <resources>
     <resource>resources</resource>
     <resource>/usr/share/resources</resource>

diff --git a/compiler/compiler/src/test/resources/org/robovm/compiler/config/ConfigTest.ios.xml b/compiler/compiler/src/test/resources/org/robovm/compiler/config/ConfigTest.ios.xml
@@ -1,4 +1,8 @@
 <config>
+  <swiftSupport>
+    <enable>true</enable>
+    <copySwiftLibs>true</copySwiftLibs>
+  </swiftSupport>
   <target>ios</target>
   <iosSdkVersion>6.1</iosSdkVersion>
   <iosInfoPList>Info.plist</iosInfoPList>