Patched up broken build reports action test.
git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1677510 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java b/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
index ab75323..58ede83 100644
--- a/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
+++ b/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
@@ -20,7 +20,6 @@
*/
import com.opensymphony.xwork2.Action;
-import org.apache.commons.io.IOUtils;
import org.apache.continuum.web.action.stub.ViewBuildsReportActionStub;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.BuildResult;
@@ -29,6 +28,9 @@
import org.junit.Before;
import org.junit.Test;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -59,7 +61,6 @@
@Test
public void testInvalidRowCount()
{
- action.setRowCount( -1 );
String result = action.execute();
assertEquals( Action.INPUT, result );
@@ -136,6 +137,12 @@
when( continuum.getBuildResultsInRange( anyCollection(), any( Date.class ), any( Date.class ), anyInt(),
anyString(), anyInt(), anyInt() ) ).thenReturn( results );
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ HttpServletResponse response = mock( HttpServletResponse.class );
+ when( response.getWriter() ).thenReturn( new PrintWriter( out ) );
+
+ action.setServletResponse( response );
action.setProjectGroupId( 0 );
action.setBuildStatus( 0 );
action.setStartDate( "" );
@@ -144,8 +151,8 @@
String result = action.downloadBuildsReport();
- assertEquals( "send-file", result );
- assertFileContentsEqual( IOUtils.toString( action.getInputStream() ), cal.getTime().toString() );
+ assertNull( "result should be null", result );
+ assertFileContentsEqual( out.toString(), cal.getTime().toString() );
}
private void assertSuccessResult( String result )