Cover exception on dummy connection

fabri1983 · Sep 21, 2019 · 61fb03b · 61fb03b
1 parent 9203221
commit 61fb03b
Show file tree

Hide file tree

Showing 8 changed files with 383 additions and 13 deletions.
diff --git a/...va/org/fabri1983/refactorexample/joblogger/enhanced/implementation/DatabaseJobLogger.java b/...va/org/fabri1983/refactorexample/joblogger/enhanced/implementation/DatabaseJobLogger.java
@@ -2,7 +2,6 @@
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
 
 import org.fabri1983.refactorexample.joblogger.enhanced.contract.IEnhancedJobLogger;
 
@@ -22,7 +21,7 @@ public void info(String message) {
 			prepStatement.setString(1, message);
 			prepStatement.setInt(2, 1);
 			prepStatement.execute();
-		} catch (SQLException ex) {
+		} catch (Exception ex) {
 			logger.severe(ex.getMessage());
 		}
 	}
@@ -33,7 +32,7 @@ public void warn(String message) {
 			prepStatement.setString(1, message);
 			prepStatement.setInt(2, 3);
 			prepStatement.execute();
-		} catch (SQLException ex) {
+		} catch (Exception ex) {
 			logger.severe(ex.getMessage());
 		}
 	}
@@ -44,7 +43,7 @@ public void error(String message) {
 			prepStatement.setString(1, message);
 			prepStatement.setInt(2, 2);
 			prepStatement.execute();
-		} catch (SQLException ex) {
+		} catch (Exception ex) {
 			logger.severe(ex.getMessage());
 		}
 	}

diff --git a/src/test/java/org/fabri1983/refactorexample/joblogger/JobLoggerWithMocksTest.java b/src/test/java/org/fabri1983/refactorexample/joblogger/JobLoggerWithMocksTest.java
@@ -64,7 +64,7 @@ public void whenCreatingLogWithFileOuput_thenFileContainsMessage() throws Except
 		PowerMock.verifyAll();
 
 		Assert.assertTrue(tempFile.exists());
-		String loggedMessage = XmlDomUtil.getMessagesFromXmlFile(tempFile).get(0);
+		String loggedMessage = XmlDomUtil.getMessagesFromLogXmlFile(tempFile).get(0);
 		Assert.assertEquals(messageToLog, loggedMessage);
 	}
 

diff --git a/...rg/fabri1983/refactorexample/joblogger/enhanced/implementation/CompoundJobLoggerTest.java b/...rg/fabri1983/refactorexample/joblogger/enhanced/implementation/CompoundJobLoggerTest.java
@@ -71,7 +71,7 @@ public void whenCreatingCompoundJobLogger_thenMessageIsLoggedInEachLogger() thro
 		String errorMessage = "error message";
 		logger.error(errorMessage);
 
-		// then: retrieve logged message from custom console
+		// then: retrieve logged messages from custom console
 		String consoleLoggedMessages = StandardConsoleRedirector.getCurrentConsoleContent();
 
 		// then: restore system console
@@ -85,7 +85,7 @@ public void whenCreatingCompoundJobLogger_thenMessageIsLoggedInEachLogger() thro
 		Assert.assertTrue("Console logged messages are not the same than expected messages.", containsAll);
 
 		// then: logged messages exists in file
-		List<String> fileLoggedMessages = XmlDomUtil.getMessagesFromXmlFile(tempFile);
+		List<String> fileLoggedMessages = XmlDomUtil.getMessagesFromLogXmlFile(tempFile);
 		Assert.assertEquals(Arrays.asList(infoMessage, warningMessage, errorMessage), fileLoggedMessages);
 	}
 

diff --git a/...org/fabri1983/refactorexample/joblogger/enhanced/implementation/ConsoleJobLoggerTest.java b/...org/fabri1983/refactorexample/joblogger/enhanced/implementation/ConsoleJobLoggerTest.java
@@ -30,7 +30,7 @@ public void whenCreatingLogWithConsoleOuput_thenConsoleContainsMessage() throws
 		String errorMessage = "error message";
 		logger.error(errorMessage);
 
-		// then: retrieve logged message from custom console
+		// then: retrieve logged messages from custom console
 		String loggedMessages = StandardConsoleRedirector.getCurrentConsoleContent();
 
 		// then: restore system console