Merge branch '1.9.2'

Author: tomkoptel

client/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 description = 'js-android-sdk-client'
-version = '1.9.1'
+version = '1.9.2'
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9.1'
+    PUBLISH_VERSION = '1.9.2'
 }
 
 android {
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 9010910
+        versionCode 9010920
         versionName version
     }
 

client/src/main/java/com/jaspersoft/android/sdk/client/JsServerProfile.java

@@ -24,6 +24,9 @@
 
 package com.jaspersoft.android.sdk.client;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 /**
  * The <code>JsServerProfile</code> object represents an instance of a JasperReports Server
  * including authentication credentials.
@@ -32,7 +35,7 @@
  * @version $Id$
  * @since 1.0
  */
-public class JsServerProfile {
+public class JsServerProfile implements Parcelable {
     private long id;
     private String alias;
     private String serverUrl;
@@ -166,4 +169,39 @@ public int hashCode() {
         result = 31 * result + password.hashCode();
         return result;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeLong(this.id);
+        dest.writeString(this.alias);
+        dest.writeString(this.serverUrl);
+        dest.writeString(this.organization);
+        dest.writeString(this.username);
+        dest.writeString(this.password);
+    }
+
+    private JsServerProfile(Parcel in) {
+        this.id = in.readLong();
+        this.alias = in.readString();
+        this.serverUrl = in.readString();
+        this.organization = in.readString();
+        this.username = in.readString();
+        this.password = in.readString();
+    }
+
+    public static final Parcelable.Creator<JsServerProfile> CREATOR = new Parcelable.Creator<JsServerProfile>() {
+        public JsServerProfile createFromParcel(Parcel source) {
+            return new JsServerProfile(source);
+        }
+
+        public JsServerProfile[] newArray(int size) {
+            return new JsServerProfile[size];
+        }
+    };
 }

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ReportExecutionResponse.java

@@ -107,6 +107,6 @@ public void setTotalPages(int totalPages) {
     }
 
     public ReportStatus getReportStatus() {
-        return ReportStatus.valueOf(status.toUpperCase());
+        return ReportStatus.valueOf(status);
     }
 }

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ReportStatus.java

@@ -5,5 +5,5 @@
  * @since 1.9
  */
 public enum ReportStatus {
-    QUEUED, READY, FAILED, EXECUTION
+    execution, ready, cancelled, failed, queued
 }

client/src/main/java/com/jaspersoft/android/sdk/client/oxm/report/ReportStatusResponse.java

@@ -30,7 +30,7 @@ public ReportStatusResponse(String status) {
     }
 
     public ReportStatus getReportStatus() {
-        return ReportStatus.valueOf(mStatus.toUpperCase());
+        return ReportStatus.valueOf(mStatus);
     }
 
     public String getStatus() {

unitTests/src/test/java/com/jaspersoft/android/sdk/client/test/oxm/server/ReportExecutionResponseTest.java

@@ -26,25 +26,31 @@ public void setUp() {
     @Test
     public void test_getReportStatus_for_queued() {
         reportExecutionResponse.setStatus("queued");
-        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.QUEUED));
+        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.queued));
     }
 
     @Test
     public void test_getReportStatus_for_ready() {
         reportExecutionResponse.setStatus("ready");
-        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.READY));
+        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.ready));
     }
 
     @Test
     public void test_getReportStatus_for_failed() {
         reportExecutionResponse.setStatus("failed");
-        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.FAILED));
+        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.failed));
     }
 
     @Test
     public void test_getReportStatus_for_execution() {
         reportExecutionResponse.setStatus("execution");
-        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.EXECUTION));
+        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.execution));
+    }
+
+    @Test
+    public void test_getReportStatus_for_cancelled() {
+        reportExecutionResponse.setStatus("cancelled");
+        assertThat(reportExecutionResponse.getReportStatus(), is(ReportStatus.cancelled));
     }
 
 }

unitTests/src/test/java/com/jaspersoft/android/sdk/client/test/oxm/server/ReportStatusResponseTest.java

@@ -26,24 +26,31 @@ public void setUp() {
     @Test
     public void test_getReportStatus_for_queued() {
         reportStatusResponse.setStatus("queued");
-        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.QUEUED));
+        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.queued));
     }
 
     @Test
     public void test_getReportStatus_for_ready() {
         reportStatusResponse.setStatus("ready");
-        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.READY));
+        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.ready));
     }
 
     @Test
     public void test_getReportStatus_for_failed() {
         reportStatusResponse.setStatus("failed");
-        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.FAILED));
+        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.failed));
     }
 
     @Test
     public void test_getReportStatus_for_execution() {
         reportStatusResponse.setStatus("execution");
-        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.EXECUTION));
+        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.execution));
     }
+
+    @Test
+    public void test_getReportStatus_for_cancelled() {
+        reportStatusResponse.setStatus("cancelled");
+        assertThat(reportStatusResponse.getReportStatus(), is(ReportStatus.cancelled));
+    }
+
 }