Skip to content

test: re-enable FFM sample coverage #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hokila wants to merge 1 commit into from
Closed

test: re-enable FFM sample coverage #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package com.example.swift;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.concurrent.CountDownLatch;
Expand All @@ -34,14 +33,13 @@ void call_globalTakeInt() {
}

@Test
@Disabled("Upcalls not yet implemented in new scheme")
@SuppressWarnings({"Convert2Lambda", "Convert2MethodRef"})
void call_globalCallMeRunnable() {
CountDownLatch countDownLatch = new CountDownLatch(3);

MySwiftLibrary.globalCallMeRunnable(new MySwiftLibrary.globalCallMeRunnable.run() {
MySwiftLibrary.globalCallMeRunnable(new java.lang.Runnable() {
@Override
public void apply() {
public void run() {
countDownLatch.countDown();
}
});
Expand Down Expand Up @@ -113,19 +111,19 @@ void call_globalCallMeDoublePredicate_noThrow() {

@Test
void call_globalCallMeIntUnaryOperator_noThrow() {
int result = MySwiftLibrary.globalCallMeIntBinaryOperator((int a) -> { return a; });
int result = MySwiftLibrary.globalCallMeIntUnaryOperator((int a) -> { return a; });
assertEquals(1, result);
}

@Test
void call_globalCallMeLongUnaryOperator_noThrow() {
long result = MySwiftLibrary.globalCallMeLongBinaryOperator((long a) -> { return a; });
long result = MySwiftLibrary.globalCallMeLongUnaryOperator((long a) -> { return a; });
assertEquals(1L, result);
}

@Test
void call_globalCallMeDoubleUnaryOperator_noThrow() {
double result = MySwiftLibrary.globalCallMeDoubleBinaryOperator((double a) -> { return a; });
double result = MySwiftLibrary.globalCallMeDoubleUnaryOperator((double a) -> { return a; });
assertEquals(1.0, result);
}

Expand Down
2 changes: 0 additions & 2 deletions Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package com.example.swift;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.swift.swiftkit.core.SwiftLibraries;
import org.swift.swiftkit.ffm.AllocatingSwiftArena;
Expand Down Expand Up @@ -86,7 +85,6 @@ void test_MySwiftClass_classMembers() {
}

@Test
@Disabled // TODO: Need var mangled names in interfaces
void test_MySwiftClass_property_x() {
try(var arena = AllocatingSwiftArena.ofConfined()) {
MySwiftClass o = MySwiftClass.init(12, 42, arena);
Expand Down
2 changes: 0 additions & 2 deletions Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package com.example.swift;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.swift.swiftkit.ffm.generated.SwiftJavaErrorException;

Expand Down Expand Up @@ -76,7 +75,6 @@ void call_globalStringIdentity_empty() {
}

@Test
@Disabled("Upcalls not yet implemented in new scheme")
@SuppressWarnings({"Convert2Lambda", "Convert2MethodRef"})
void call_globalCallMeRunnable() {
CountDownLatch countDownLatch = new CountDownLatch(3);
Expand Down
Loading