coverage in progress

pain64 · Jan 5, 2025 · e3ba2f8 · e3ba2f8
1 parent b575e87
commit e3ba2f8
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 23 deletions.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -8,6 +8,10 @@ plugins {
 
 }
 
+jacoco {
+    toolVersion = "0.8.12"
+}
+
 repositories {
     mavenCentral()
 }
@@ -101,6 +105,7 @@ tasks.test {
 tasks.jacocoTestReport {
     reports {
         csv.required.set(true)
+        xml.required.set(true)
     }
 }
 

diff --git a/lib/src/main/java/net/truej/sql/compiler/BoundTypeExtractor.java b/lib/src/main/java/net/truej/sql/compiler/BoundTypeExtractor.java
@@ -34,11 +34,12 @@ private static Type up(
                     if (r != null) return r;
                 }
 
-            // We have grantee that we will find
-            var parent = (Type.ClassType) from.getSuperclass();
-            saveTypeArguments.accept(parent);
+            if (from.getSuperclass() instanceof Type.ClassType parent) {
+                saveTypeArguments.accept(parent);
+                return up(typeReadWriteSymbol, map, (Symbol.ClassSymbol) parent.tsym);
+            }
 
-            return up(typeReadWriteSymbol, map, (Symbol.ClassSymbol) parent.tsym);
+            return null;
         }
     }
 

diff --git a/lib/src/main/java/net/truej/sql/compiler/InvocationsFinder.java b/lib/src/main/java/net/truej/sql/compiler/InvocationsFinder.java
@@ -641,8 +641,7 @@ else throw new ValidationException(
                     className ->
                         parsedConfig.typeBindings().stream()
                             .filter(b -> b.className().equals(className))
-                            .findFirst().orElseThrow(() -> new IllegalStateException("unreachable"))
-                            .rwClassName(),
+                            .findFirst().get().rwClassName(),
                     lineNumber,
                     sourceMode,
                     queryMode,

diff --git a/lib/src/test/java/net/truej/sql/compiler/GenericArrayRw.java b/lib/src/test/java/net/truej/sql/compiler/GenericArrayRw.java
@@ -2,9 +2,12 @@
 
 import net.truej.sql.config.TypeReadWrite;
 
+import java.io.Serializable;
 import java.sql.*;
 
-public abstract class GenericArrayRw<T> implements TypeReadWrite<T> {
+public abstract class GenericArrayRw<T> implements
+    Serializable, // need for coverage
+    TypeReadWrite<T> {
     abstract T convert(Array array) throws SQLException;
 
     @Override public T get(ResultSet rs, int columnIndex) throws SQLException {

diff --git a/lib/src/test/java/net/truej/sql/compiler/__03__CharTestMapperGenerator.java b/lib/src/test/java/net/truej/sql/compiler/__03__CharTestMapperGenerator.java
diff --git a/...compiler/__03__CharTestTrueSqlPlugin.java → ...l/compiler/__03__CharTestUnreachable.java b/...compiler/__03__CharTestTrueSqlPlugin.java → ...l/compiler/__03__CharTestUnreachable.java
@@ -1,12 +1,16 @@
 package net.truej.sql.compiler;
 
+import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.TypeTag;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import com.sun.tools.javac.code.Type;
 
-public class __03__CharTestTrueSqlPlugin {
+public class __03__CharTestUnreachable {
     @Test public void test() {
+        Assertions.assertEquals(
+            Character.class.getName(),
+            MapperGenerator.boxedClassName("char")
+        );
         Assertions.assertEquals(
             "char",
             TrueSqlPlugin.arrayClassNameToSourceCodeType("Char")
@@ -22,4 +26,5 @@ public class __03__CharTestTrueSqlPlugin {
             TrueSqlPlugin.primitiveTypeToBoxedClass(new Type.JCPrimitiveType(TypeTag.CHAR, null))
         );
     }
+
 }
diff --git a/lib/src/test/java/net/truej/sql/test/__11__ConstraintViolation.java b/lib/src/test/java/net/truej/sql/test/__11__ConstraintViolation.java
@@ -25,6 +25,20 @@ static class Handled extends Exception { }
         );
     }
 
+    @TestTemplate  public void triedButUnhandled(MainDataSource ds) {
+        assertThrows(ConstraintViolationException.class, () -> {
+            try {
+                ds.q("delete from city").fetchNone();
+            } catch (ConstraintViolationException ex) {
+                ex.when(
+                    ds.constraint("users", "users_pk", () -> {
+                        throw new Handled();
+                    })
+                );
+            }
+        });
+    }
+
     @TestTemplate public void rethrow(MainDataSource ds) {
         assertThrows(Handled.class, () -> {
             try {