Skip to content

Commit 418a7bb

Browse files
fugerit79fugerit79
committed
Increased test coverage
1 parent 533be3e commit 418a7bb

File tree

6 files changed

+59
-6
lines changed

6 files changed

+59
-6
lines changed

‎fj-core/src/main/java/org/fugerit/java/core/cfg/ConfigException.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ public static ConfigException convertEx( Exception e ) {
109109

110110
public static final UnsafeConsumer<Exception, ConfigException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
111111

112+
private static UnsafeConsumer<Exception, ConfigException> createRethrowWithMessageExHandler( String message ) {
113+
return e -> { throw convertEx( message , e); };
114+
}
115+
112116
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws ConfigException {
113117
return get( fun, EX_HANDLER_DEFAULT );
114118
}
@@ -126,11 +130,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
126130
}
127131

128132
public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws ConfigException {
129-
return get( fun, e -> { throw convertEx( message , e); } );
133+
return get( fun, createRethrowWithMessageExHandler( message ) );
130134
}
131135

132136
public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws ConfigException {
133-
apply(fun, e -> { throw convertEx( message , e); } );
137+
apply( fun, createRethrowWithMessageExHandler( message ) );
134138
}
135139

136140
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, ConfigException> exHandler ) throws ConfigException {

‎fj-core/src/main/java/org/fugerit/java/core/db/dao/DAOException.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ public static DAOException convertEx( Exception e ) {
8181

8282
public static final UnsafeConsumer<Exception, DAOException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
8383

84+
private static UnsafeConsumer<Exception, DAOException> createRethrowWithMessageExHandler( String message ) {
85+
return e -> { throw convertEx( message , e); };
86+
}
87+
8488
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws DAOException {
8589
return get( fun, EX_HANDLER_DEFAULT );
8690
}
@@ -98,11 +102,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
98102
}
99103

100104
public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws DAOException {
101-
return get( fun, e -> { throw convertEx( message , e); } );
105+
return get( fun, createRethrowWithMessageExHandler( message ) );
102106
}
103107

104108
public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws DAOException {
105-
apply(fun, e -> { throw convertEx( message , e); } );
109+
apply(fun, createRethrowWithMessageExHandler( message ) );
106110
}
107111

108112
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, DAOException> exHandler ) throws DAOException {

‎fj-core/src/main/java/org/fugerit/java/core/io/helper/HelperIOException.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ public static void close( Closeable ac ) throws IOException {
6363

6464
public static final UnsafeConsumer<Exception, IOException> EX_HANDLER_DEFAULT = EX_HANDLER_RETHROW;
6565

66+
private static UnsafeConsumer<Exception, IOException> createRethrowWithMessageExHandler( String message ) {
67+
return e -> { throw convertEx( message , e); };
68+
}
69+
6670
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun ) throws IOException {
6771
return get( fun, EX_HANDLER_DEFAULT );
6872
}
@@ -80,11 +84,11 @@ public static <E extends Exception> void applySilent( UnsafeVoid<E> fun ) throws
8084
}
8185

8286
public static <T, E extends Exception> T getWithMessage( UnsafeSupplier<T, E> fun, String message ) throws IOException {
83-
return get( fun, e -> { throw convertEx( message , e); } );
87+
return get( fun, createRethrowWithMessageExHandler( message ) );
8488
}
8589

8690
public static <E extends Exception> void applyWithMessage( UnsafeVoid<E> fun, String message ) throws IOException {
87-
apply(fun, e -> { throw convertEx( message , e); } );
91+
apply(fun, createRethrowWithMessageExHandler( message ) );
8892
}
8993

9094
public static <T, E extends Exception> T get( UnsafeSupplier<T, E> fun, UnsafeConsumer<Exception, IOException> exHandler ) throws IOException {

‎fj-core/src/test/java/test/org/fugerit/java/core/cfg/TestConfigException.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import org.junit.Assert;
88
import org.junit.Test;
99

10+
import lombok.extern.slf4j.Slf4j;
1011
import test.org.fugerit.java.core.HelperCheck;
1112

13+
@Slf4j
1214
public class TestConfigException {
1315

1416

@@ -45,6 +47,18 @@ public void testGetEXMessage() {
4547
Assert.assertThrows( ConfigException.class ,() -> ConfigException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
4648
}
4749

50+
@Test
51+
public void testApplyEXMessageOk() throws ConfigException {
52+
boolean ok = true;
53+
ConfigException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
54+
Assert.assertTrue( ok );
55+
}
56+
57+
@Test
58+
public void testGetEXMessageOk() throws ConfigException {
59+
Assert.assertNotNull( ConfigException.getWithMessage( () -> "test ok" , "test message" ) );
60+
}
61+
4862
@Test
4963
public void testApply() throws ConfigException {
5064
HelperCheck check = new HelperCheck();

‎fj-core/src/test/java/test/org/fugerit/java/core/db/dao/TestDAOException.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import org.junit.Assert;
88
import org.junit.Test;
99

10+
import lombok.extern.slf4j.Slf4j;
11+
12+
@Slf4j
1013
public class TestDAOException {
1114

1215
@Test
@@ -32,6 +35,18 @@ public void testGetEXMessage() {
3235
Assert.assertThrows( DAOException.class ,() -> DAOException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
3336
}
3437

38+
@Test
39+
public void testApplyEXMessageOk() throws DAOException {
40+
boolean ok = true;
41+
DAOException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
42+
Assert.assertTrue( ok );
43+
}
44+
45+
@Test
46+
public void testGetEXMessageOk() throws DAOException {
47+
Assert.assertNotNull( DAOException.getWithMessage( () -> "test ok" , "test message" ) );
48+
}
49+
3550
@Test
3651
public void testApply() {
3752
Assert.assertThrows( DAOException.class ,() -> DAOException.apply( () -> { throw new SQLException( "junit test scenario" ); } ) );

‎fj-core/src/test/java/test/org/fugerit/java/core/io/line/helper/TestHelperIOEx.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@ public void testGetEXMessage() {
3636
Assert.assertThrows( IOException.class ,() -> HelperIOException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) );
3737
}
3838

39+
@Test
40+
public void testApplyEXMessageOk() throws IOException {
41+
boolean ok = true;
42+
HelperIOException.applyWithMessage( () -> log.info( "test ok" ) , "test message" );
43+
Assert.assertTrue( ok );
44+
}
45+
46+
@Test
47+
public void testGetEXMessageOk() throws IOException {
48+
Assert.assertNotNull( HelperIOException.getWithMessage( () -> "test ok" , "test message" ) );
49+
}
50+
3951
@Test
4052
public void testEx1() {
4153
Assert.assertNotNull( new HelperIOException() );

0 commit comments

Comments
 (0)