Condense test directory names for 1.9.

4 files changed, 60 insertions, 0 deletions

diff --git a/test cases/swift/13 mixed objcpp/main.swift b/test cases/swift/13 mixed objcpp/main.swift
new file mode 100644
index 000000000..cd6dd2b3e
--- /dev/null
+++ b/test cases/swift/13 mixed objcpp/main.swift
@@ -0,0 +1,2 @@
+var test: ObjCPPTest = ObjCPPTest()
+test.testCallToObjCPP()
diff --git a/test cases/swift/13 mixed objcpp/meson.build b/test cases/swift/13 mixed objcpp/meson.build
new file mode 100644
index 000000000..69098e246
--- /dev/null
+++ b/test cases/swift/13 mixed objcpp/meson.build
@@ -0,0 +1,12 @@
+project('mixed objcpp', 'objcpp', 'swift')
+
+swiftc = meson.get_compiler('swift')
+
+# Testing Objective-C++ and Swift interoperability requires Swift 5.9
+if not swiftc.version().version_compare('>= 5.9')
+  error('MESON_SKIP_TEST Test requires Swift 5.9')
+endif
+
+lib = static_library('mylib', 'mylib.mm')
+exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib)
+test('objcpp interface', exe)
diff --git a/test cases/swift/13 mixed objcpp/mylib.h b/test cases/swift/13 mixed objcpp/mylib.h
new file mode 100644
index 000000000..1e7b23d70
--- /dev/null
+++ b/test cases/swift/13 mixed objcpp/mylib.h
@@ -0,0 +1,17 @@
+#pragma once
+#import <Foundation/Foundation.h>
+
+class Test {
+public:
+    Test();
+
+    void testCallFromClass();
+};
+
+@interface ObjCPPTest: NSObject {
+    @private Test *test;
+}
+- (id)init;
+- (void)dealloc;
+- (void)testCallToObjCPP;
+@end
diff --git a/test cases/swift/13 mixed objcpp/mylib.mm b/test cases/swift/13 mixed objcpp/mylib.mm
new file mode 100644
index 000000000..f7e9ab3f1
--- /dev/null
+++ b/test cases/swift/13 mixed objcpp/mylib.mm
@@ -0,0 +1,29 @@
+#include "mylib.h"
+#include <iostream>
+
+Test::Test() {
+    std::cout << "Test initialized" << std::endl;
+}
+
+void Test::testCallFromClass() {
+    std::cout << "Calling Objective-C++ class function from Swift is working" << std::endl;
+}
+
+@implementation ObjCPPTest
+- (id)init {
+    self = [super init];
+    if (self) {
+        test = new Test();
+    }
+    return self;
+}
+
+- (void)dealloc {
+    delete test;
+    [super dealloc];
+}
+
+- (void)testCallToObjCPP {
+    test->testCallFromClass();
+}
+@end