Fixed bugs #104, #105

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportingServiceIT.java

@@ -3,6 +3,8 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.ReportExecutionDescriptor;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.ReportExecutionRequest;
 import java.io.InputStream;
 import junit.framework.Assert;
 import org.testng.annotations.AfterMethod;
@@ -24,7 +26,7 @@ public void before() {
     }
 
     @Test
-    public void should_return_proper_entity_if_pass_jrprint_report_output_format() {
+    public void should_return_proper_entity_if_pass_pdf_report_output_format() {
 
         /** When **/
         OperationResult<InputStream> result = client
@@ -44,6 +46,50 @@ public void should_return_proper_entity_if_pass_jrprint_report_output_format() {
 
     }
 
+    @Test
+    public void should_return_proper_entity_without_numbers_of_pages() {
+
+        /** When **/
+        OperationResult<InputStream> result = client
+                .authenticate("superuser", "superuser")
+                .reportingService()
+                .report("/organizations/organization_1/adhoc/topics/Cascading_multi_select_topic")
+                .prepareForRun(ReportOutputFormat.PDF)
+                .parameter("Cascading_state_multi_select", "CA")
+                .parameter("Cascading_state_multi_select", "OR", "WA")
+                .parameter("Cascading_name_single_select", "Adams-Steen Transportation Holdings")
+                .parameter("Country_multi_select", "USA")
+                .run();
+
+        InputStream entity = result.getEntity();
+        /** Then **/
+        Assert.assertNotNull(entity);
+
+    }
+
+    @Test
+    public void should_return_proper_entity_in_asunc_mode() {
+
+        /** When **/
+        ReportExecutionRequest request = new ReportExecutionRequest();
+        request.setReportUnitUri("/organizations/organization_1/adhoc/topics/Cascading_multi_select_topic");
+        request
+                .setAsync(true)                         //this means that report will be run on server asynchronously
+                .setOutputFormat(ReportOutputFormat.HTML);               //report can be requested in different formats e.g. html, pdf, etc.
+
+
+
+
+        OperationResult<ReportExecutionDescriptor> operationResult =client.authenticate("superuser", "superuser").
+                reportingService()
+                        .newReportExecutionRequest(request);
+
+        ReportExecutionDescriptor reportExecutionDescriptor = operationResult.getEntity();
+        /** Then **/
+        Assert.assertNotNull(reportExecutionDescriptor);
+
+    }
+
     @AfterMethod
     public void after() {
         client = null;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportsAdapter.java

@@ -58,4 +58,8 @@ public RunReportAdapter prepareForRun(ReportOutputFormat format, PageRange range
         return new RunReportAdapter(sessionStorage, reportUnitUri, format, range);
     }
 
+    public RunReportAdapter prepareForRun(ReportOutputFormat format){
+        return new RunReportAdapter(sessionStorage, reportUnitUri, format);
+    }
+
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/RunReportAdapter.java

@@ -39,18 +39,14 @@
 
 import static java.util.regex.Pattern.compile;
 
-/**
- * @author
- * @author Tetiana Iefimenko
- * */
 public class RunReportAdapter extends AbstractAdapter {
 
     private final MultivaluedMap<String, String> params;
     private final String reportUnitUri;
     private final ReportOutputFormat format;
     private String[] pages;
 
-    private RunReportAdapter(SessionStorage sessionStorage, String reportUnitUri, ReportOutputFormat format) {
+    public RunReportAdapter(SessionStorage sessionStorage, String reportUnitUri, ReportOutputFormat format) {
         super(sessionStorage);
         this.params = new MultivaluedHashMap<String, String>();
         this.reportUnitUri = reportUnitUri;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/reports/ReportExecutionRequest.java

@@ -119,8 +119,8 @@ public String getOutputFormat() {
         return outputFormat;
     }
 
-    public ReportExecutionRequest setOutputFormat(String outputFormat) {
-        this.outputFormat = outputFormat;
+    public ReportExecutionRequest setOutputFormat(ReportOutputFormat outputFormat) {
+        this.outputFormat = outputFormat.toString().toLowerCase();
         return this;
     }
 
@@ -315,7 +315,7 @@ public Builder setTransformerKey(String transformerKey) {
          * <b>Required</b>
          */
         public Builder setOutputFormat(ReportOutputFormat outputFormat) {
-            request.setOutputFormat(outputFormat.name());
+            request.setOutputFormat(outputFormat);
             return this;
         }