Increased test coverage

fugerit-org · Oct 22, 2023 · 418a7bb · 418a7bb
1 parent 533be3e
commit 418a7bb
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 6 deletions.
diff --git a/fj-core/src/main/java/org/fugerit/java/core/cfg/ConfigException.java b/fj-core/src/main/java/org/fugerit/java/core/cfg/ConfigException.java
@@ -109,6 +109,10 @@ public static ConfigException convertEx( Exception e ) {
 
 	public static final UnsafeConsumer<Exception, ConfigException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
 
+	private static UnsafeConsumer<Exception, ConfigException> createRethrowWithMessageExHandler( String message ) {
+		return e -> { throw convertEx( message , e); };
+	}
+
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws ConfigException {
 		return get( fun, EX_HANDLER_DEFAULT );
 	}
@@ -126,11 +130,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
 	}
 
 	public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws ConfigException {
-		return get( fun, e -> { throw convertEx( message , e); } );
+		return get( fun, createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws ConfigException {
-		apply(fun,  e -> { throw convertEx( message , e); } );
+		apply( fun,  createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, ConfigException> exHandler ) throws ConfigException {

diff --git a/fj-core/src/main/java/org/fugerit/java/core/db/dao/DAOException.java b/fj-core/src/main/java/org/fugerit/java/core/db/dao/DAOException.java
@@ -81,6 +81,10 @@ public static DAOException convertEx( Exception e ) {
 
 	public static final UnsafeConsumer<Exception, DAOException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
 
+	private static UnsafeConsumer<Exception, DAOException> createRethrowWithMessageExHandler( String message ) {
+		return e -> { throw convertEx( message , e); };
+	}
+
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws DAOException {
 		return get( fun, EX_HANDLER_DEFAULT );
 	}
@@ -98,11 +102,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
 	}
 
 	public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws DAOException {
-		return get( fun, e -> { throw convertEx( message , e); } );
+		return get( fun, createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws DAOException {
-		apply(fun,  e -> { throw convertEx( message , e); } );
+		apply(fun,  createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, DAOException> exHandler ) throws DAOException {

diff --git a/fj-core/src/main/java/org/fugerit/java/core/io/helper/HelperIOException.java b/fj-core/src/main/java/org/fugerit/java/core/io/helper/HelperIOException.java
@@ -63,6 +63,10 @@ public static void close( Closeable ac ) throws IOException {
 
 	public static final UnsafeConsumer<Exception, IOException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
 
+	private static UnsafeConsumer<Exception, IOException> createRethrowWithMessageExHandler( String message ) {
+		return e -> { throw convertEx( message , e); };
+	}
+
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws IOException {
 		return get( fun, EX_HANDLER_DEFAULT );
 	}
@@ -80,11 +84,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
 	}
 
 	public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws IOException {
-		return get( fun, e -> { throw convertEx( message , e); } );
+		return get( fun, createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws IOException {
-		apply(fun,  e -> { throw convertEx( message , e); } );
+		apply(fun,  createRethrowWithMessageExHandler( message ) );
 	}
 
 	public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, IOException> exHandler ) throws IOException {

diff --git a/fj-core/src/test/java/test/org/fugerit/java/core/cfg/TestConfigException.java b/fj-core/src/test/java/test/org/fugerit/java/core/cfg/TestConfigException.java
@@ -7,8 +7,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import lombok.extern.slf4j.Slf4j;
 import test.org.fugerit.java.core.HelperCheck;
 
+@Slf4j
 public class TestConfigException {
 
 
@@ -45,6 +47,18 @@ public void testGetEXMessage() {
 		Assert.assertThrows( ConfigException.class ,() -> ConfigException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
 	}
 
+	@Test
+	public void testApplyEXMessageOk() throws ConfigException {
+		boolean ok = true;
+		ConfigException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
+		Assert.assertTrue( ok );
+	}
+
+	@Test
+	public void testGetEXMessageOk() throws ConfigException {
+		Assert.assertNotNull( ConfigException.getWithMessage( () -> "test ok" , "test message" ) );
+	}
+
 	@Test
 	public void testApply() throws ConfigException {
 		HelperCheck check = new HelperCheck();

diff --git a/fj-core/src/test/java/test/org/fugerit/java/core/db/dao/TestDAOException.java b/fj-core/src/test/java/test/org/fugerit/java/core/db/dao/TestDAOException.java
@@ -7,6 +7,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class TestDAOException {
 
 	@Test
@@ -32,6 +35,18 @@ public void testGetEXMessage() {
 		Assert.assertThrows( DAOException.class ,() -> DAOException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
 	}
 
+	@Test
+	public void testApplyEXMessageOk() throws DAOException {
+		boolean ok = true;
+		DAOException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
+		Assert.assertTrue( ok );
+	}
+
+	@Test
+	public void testGetEXMessageOk() throws DAOException {
+		Assert.assertNotNull( DAOException.getWithMessage( () -> "test ok" , "test message" ) );
+	}
+
 	@Test
 	public void testApply() {
 		Assert.assertThrows( DAOException.class ,() -> DAOException.apply( () -> { throw new SQLException( "junit test scenario" ); } ) );

diff --git a/fj-core/src/test/java/test/org/fugerit/java/core/io/line/helper/TestHelperIOEx.java b/fj-core/src/test/java/test/org/fugerit/java/core/io/line/helper/TestHelperIOEx.java
@@ -36,6 +36,18 @@ public void testGetEXMessage() {
 		Assert.assertThrows( IOException.class ,() -> HelperIOException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
 	}
 
+	@Test
+	public void testApplyEXMessageOk() throws IOException {
+		boolean ok = true;
+		HelperIOException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
+		Assert.assertTrue( ok );
+	}
+
+	@Test
+	public void testGetEXMessageOk() throws IOException {
+		Assert.assertNotNull( HelperIOException.getWithMessage( () -> "test ok" , "test message" ) );
+	}
+
 	@Test
 	public void testEx1() {
 		Assert.assertNotNull( new HelperIOException() );