X-Git-Url: http://jaekl.net/gitweb/?p=frank.git;a=blobdiff_plain;f=test%2Fnet%2Fjaekl%2Ffrank%2FErrorHandlerTest.java;h=91efd6c14dac1140a3046375baf7022a034c5630;hp=4db0602c8cf428aa4deb7bef90f500ba4fc2da57;hb=a7583be0d5ac4a95b66293a897a79f53830d222c;hpb=60dc53edca9ae2bcd6703e02b26acd47ef3d61a8

diff --git a/test/net/jaekl/frank/ErrorHandlerTest.java b/test/net/jaekl/frank/ErrorHandlerTest.java
index 4db0602..91efd6c 100644
--- a/test/net/jaekl/frank/ErrorHandlerTest.java
+++ b/test/net/jaekl/frank/ErrorHandlerTest.java
@@ -3,6 +3,7 @@ package net.jaekl.frank;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.SocketTimeoutException;
 import java.sql.SQLException;
 import java.util.Locale;
 
@@ -56,20 +57,29 @@ public class ErrorHandlerTest {
 	}
 	
 	@Test
-	public void testExplain_unexpectedException() {
+	public void testExplain_simpleExceptions() {
 		Locale[] locales = { Locale.CANADA, Locale.FRANCE, Locale.JAPAN, Locale.CHINA};
+		Object[][] data = { 
+				{new NullPointerException(), FrankBundle.UNEXPECTED_EXCEPTION},
+				{new SocketTimeoutException(), FrankBundle.SERVER_TIMEOUT}
+			};
 		
 		ErrorHandler eh = new ErrorHandler();
 		
 		for (Locale locale : locales) {
 			FrankBundle bundle = FrankBundle.getInst(locale);
 			
-			m_baos.reset();
-			eh.writeErrorPage(m_pw, new NullPointerException(),  Locale.CANADA);
-			m_pw.flush();
-			
-			String actual = m_baos.toString();
-			Assert.assertTrue(actual.contains(bundle.get(FrankBundle.UNEXPECTED_EXCEPTION)));
+			for (Object[] tuple : data) {
+				Exception e = (Exception)tuple[0];
+				String key = (String)tuple[1];
+				
+				m_baos.reset();
+				eh.writeErrorPage(m_pw, e, locale);
+				m_pw.flush();
+				
+				String actual = m_baos.toString();
+				Assert.assertTrue(actual.contains(bundle.get(key)));
+			}
 		}
 	}
 	
@@ -85,7 +95,7 @@ public class ErrorHandlerTest {
 			FrankBundle bundle = FrankBundle.getInst(locale);
 			
 			m_baos.reset();
-			eh.writeErrorPage(m_pw, fe,  Locale.CANADA);
+			eh.writeErrorPage(m_pw, fe,  locale);
 			m_pw.flush();
 			
 			String actual = m_baos.toString();