X-Git-Url: http://jaekl.net/gitweb/?p=frank.git;a=blobdiff_plain;f=test%2Fnet%2Fjaekl%2Fqd%2Fhttp%2FRequestBrokerMock.java;h=55a0598f9168e2ae1771d7ec0b594c923dbd0509;hp=7e7624b415bfd1842ec20badf4b55f5abd3755f7;hb=d870b8b1ca2e633b0f2b58969cc042888d07db6e;hpb=07c8e189128f4fb3be7f49db75b48cf9e2e3de6e

diff --git a/test/net/jaekl/qd/http/RequestBrokerMock.java b/test/net/jaekl/qd/http/RequestBrokerMock.java
index 7e7624b..55a0598 100644
--- a/test/net/jaekl/qd/http/RequestBrokerMock.java
+++ b/test/net/jaekl/qd/http/RequestBrokerMock.java
@@ -59,31 +59,38 @@ public class RequestBrokerMock extends RequestBroker {
 		}
 	}
 	
-	HashMap<InputParams, String> m_output;
+	HashMap<InputParams, Object> m_result;
 	
 	public RequestBrokerMock(String gatewayUrl, ArrayList<NameValuePair> baseParams) {
 		super(gatewayUrl, baseParams);
-		m_output = new HashMap<InputParams, String>();
+		m_result = new HashMap<InputParams, Object>();
 	}
 	
-	public void setOutput(String method, ArrayList<NameValuePair> passedParams, String output) {
+	public void setResult(String method, ArrayList<NameValuePair> passedParams, Object result) {
 		InputParams ip = new InputParams(method, passedParams);
-		m_output.put(ip, output);
+		m_result.put(ip, result);
 	}
 	
 	@Override 
 	InputStream doSubmit(String method, ArrayList<NameValuePair> passedParams) throws QDException
 	{
 		InputParams ip = new InputParams(method, passedParams);
-		String output = m_output.get(ip);
+		Object result = m_result.get(ip);
 		
-		if (null == output) {
-			Assert.fail("No output specified for given inputs.");
+		if (null == result) {
+			Assert.fail("No result specified for given inputs.");
 		}
 		
+		if (result instanceof QDException) {
+			throw (QDException)result;
+		}
+		
+		Assert.assertTrue(result instanceof String);
+		
 		InputStream is = null;
 		
 		try {
+			String output = (String)result;
 			is = new ByteArrayInputStream(output.getBytes("UTF-8"));
 		}
 		catch (UnsupportedEncodingException uee) {