fix: test harness would incorrectly match less than "detect" size chunks

Author: ktoso

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -131,6 +131,7 @@ extension FFMSwift2JavaGenerator {
       }
       printer.print("import \(module)")
     }
+    printer.println()
   }
 }
 

Tests/JExtractSwiftTests/Asserts/TextAssertions.swift

@@ -28,7 +28,7 @@ func assertOutput(
   _ mode: JExtractGenerationMode,
   _ renderKind: RenderKind,
   swiftModuleName: String = "SwiftModule",
-  detectChunkByInitialLines: Int = 4,
+  detectChunkByInitialLines _detectChunkByInitialLines: Int = 4,
   expectedChunks: [String],
   fileID: String = #fileID,
   filePath: String = #filePath,
@@ -79,19 +79,22 @@ func assertOutput(
   let gotLines = output.split(separator: "\n").filter { l in
     l.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).count > 0
   }
-  for expected in expectedChunks {
-    let expectedLines = expected.split(separator: "\n")
+  for expectedChunk in expectedChunks {
+    let expectedLines = expectedChunk.split(separator: "\n")
+    let detectChunkByInitialLines = min(expectedLines.count, _detectChunkByInitialLines)
+    precondition(detectChunkByInitialLines > 0, "Chunk size to detect cannot be zero lines!")
 
     var matchingOutputOffset: Int? = nil
     let expectedInitialMatchingLines = expectedLines[0..<min(expectedLines.count, detectChunkByInitialLines)]
       .map({$0.trimmingCharacters(in: .whitespacesAndNewlines)})
       .joined(separator: "\n")
-    for offset in 0..<gotLines.count where gotLines.count > (offset+detectChunkByInitialLines) {
-      let textLinesAtOffset = gotLines[offset..<offset+detectChunkByInitialLines]
+
+    for lineOffset in 0..<gotLines.count where gotLines.count > (lineOffset+detectChunkByInitialLines) {
+      let textLinesAtOffset = gotLines[lineOffset..<lineOffset+detectChunkByInitialLines]
         .map({$0.trimmingCharacters(in: .whitespacesAndNewlines)})
         .joined(separator: "\n")
       if textLinesAtOffset == expectedInitialMatchingLines {
-        matchingOutputOffset = offset
+        matchingOutputOffset = lineOffset
         break
       }
     }
@@ -105,13 +108,13 @@ func assertOutput(
 
       print("==== ---------------------------------------------------------------")
       print("Expected output:")
-      print(expected.yellow)
+      print("'\(expectedChunk.yellow)'")
       print("==== ---------------------------------------------------------------")
       print("Got output:")
       print(output)
       print("==== ---------------------------------------------------------------")
 
-      #expect(output.contains(expected), sourceLocation: sourceLocation)
+      #expect(output.contains(expectedChunk), sourceLocation: sourceLocation)
       fatalError("Failed: \(filePath):\(line)")
       continue
     }

Tests/JExtractSwiftTests/DataImportTests.swift

@@ -402,7 +402,7 @@ final class DataImportTests {
 
         // Just to make sure 'Data' is imported.
         """
-        public final class Data
+        public final class Data extends FFMSwiftInstance implements SwiftValue {
         """
       ]
     )

Tests/JExtractSwiftTests/OptionalImportTests.swift

@@ -47,8 +47,8 @@ final class OptionalImportTests {
           private static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
           public static void call(java.lang.foreign.MemorySegment arg) {
             try {
-              if (SwiftRuntime.TRACE_DOWNCALLS) {
-                SwiftRuntime.traceDowncall(arg);
+              if (CallTraces.TRACE_DOWNCALLS) {
+                CallTraces.traceDowncall(arg);
               }
               HANDLE.invokeExact(arg);
             } catch (Throwable ex$) {
@@ -87,8 +87,8 @@ final class OptionalImportTests {
           private static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
           public static void call(java.lang.foreign.MemorySegment arg) {
             try {
-              if (SwiftRuntime.TRACE_DOWNCALLS) {
-                SwiftRuntime.traceDowncall(arg);
+              if (CallTraces.TRACE_DOWNCALLS) {
+                CallTraces.traceDowncall(arg);
               }
               HANDLE.invokeExact(arg);
             } catch (Throwable ex$) {
@@ -128,8 +128,8 @@ final class OptionalImportTests {
           private static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
           public static void call(java.lang.foreign.MemorySegment arg) {
             try {
-              if (SwiftRuntime.TRACE_DOWNCALLS) {
-                SwiftRuntime.traceDowncall(arg);
+              if (CallTraces.TRACE_DOWNCALLS) {
+                CallTraces.traceDowncall(arg);
               }
               HANDLE.invokeExact(arg);
             } catch (Throwable ex$) {