Merge branch '1.9'

.gitignore

@@ -0,0 +1,56 @@
+# Created by .gitignore support plugin (hsz.mobi)
+### Android template
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+## Directory-based project format
+.idea/
+
+## File-based project format
+*.ipr
+*.iml
+*.iws
+
+## Additional for IntelliJ
+out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# generated by JIRA plugin
+atlassian-ide-plugin.xml
+
+# generated by Crashlytics plugin (for Android Studio and Intellij)
+com_crashlytics_export_strings.xml.DS_Store
+.idea*
+*.iml
+*.db
+out
+bin
+gen

build.gradle

@@ -0,0 +1,41 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        mavenLocal()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:0.14.2"
+        classpath "com.github.dcendents:android-maven-plugin:1.2"
+    }
+}
+
+subprojects {
+    group = 'com.jaspersoft.android.sdk'
+    version = '1.9'
+
+    ext.androidMinSdkVersion = 9
+    ext.androidTargetSdkVersion = 19
+    ext.androidCompileSdkVersion = 19
+    ext.androidBuildToolsVersion = "19.1"
+
+    repositories {
+        jcenter()
+        mavenCentral()
+        mavenLocal()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url "file://${System.getenv("ANDROID_HOME")}/extras/android/m2repository" }
+    }
+}
+
+apply plugin: 'java' // ensure clean is also triggered for root build folder
+apply plugin: 'build-dashboard'
+
+buildDashboard {
+    reports.html.destination = "build/"
+}
+
+test.reports.html.enabled = false     // just clean up dashboard from not generated reports
+test.reports.junitXml.enabled = false // just clean up dashboard from not generated reports
+

client/build.gradle

@@ -0,0 +1,51 @@
+apply plugin: 'com.android.library'
+apply plugin: 'android-maven'
+
+description = 'js-android-sdk-client'
+
+ext {
+    PUBLISH_GROUP_ID = group
+    PUBLISH_ARTIFACT_ID = description
+    PUBLISH_VERSION = '1.9'
+}
+
+android {
+    compileSdkVersion androidCompileSdkVersion
+    buildToolsVersion androidBuildToolsVersion
+
+    defaultConfig {
+        minSdkVersion androidMinSdkVersion
+        targetSdkVersion androidTargetSdkVersion
+        versionCode 9010900
+        versionName version
+    }
+
+    packagingOptions {
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            runProguard false
+        }
+    }
+}
+
+dependencies {
+    compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE'
+    compile 'com.octo.android.robospice:robospice:1.4.14'
+    compile 'com.octo.android.robospice:robospice-spring-android:1.4.14'
+    compile('org.simpleframework:simple-xml:2.7') {
+        exclude group: 'stax', module: 'stax'
+        exclude group: 'stax', module: 'stax-api'
+        exclude group: 'xpp3', module: 'xpp3'
+    }
+}
+
+apply from: '../scripts/android-release-aar.gradle'

client/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2012-2014 Jaspersoft Corporation. All rights reserved.
+    http://community.jaspersoft.com/project/mobile-sdk-android
+
+    Unless you have purchased a commercial license agreement from Jaspersoft,
+    the following license terms apply:
+
+    This program is part of Jaspersoft Mobile SDK for Android.
+
+    Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with Jaspersoft Mobile SDK for Android. If not, see
+    <http://www.gnu.org/licenses/lgpl>.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.jaspersoft.android.sdk.integration" >
+
+    <application/>
+
+</manifest>

client/src/androidTest/java/com/jaspersoft/android/sdk/integration/CheckReportStatusRequestTest.java

@@ -0,0 +1,35 @@
+package com.jaspersoft.android.sdk.integration;
+
+import com.jaspersoft.android.sdk.client.async.request.CheckReportStatusRequest;
+import com.jaspersoft.android.sdk.client.async.request.RunReportExecutionRequest;
+import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionRequest;
+import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionResponse;
+import com.jaspersoft.android.sdk.client.oxm.report.ReportStatusResponse;
+import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
+import com.jaspersoft.android.sdk.integration.utils.SampleData;
+
+/**
+ * @author Tom Koptel
+ * @since 1.9
+ */
+public class CheckReportStatusRequestTest extends ProtoInstrumentation {
+
+    private RunReportExecutionRequest runReportExecutionRequest;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ReportExecutionRequest reportExecutionRequest = SampleData.getSampleExecutionData(getJsRestClient(), RESOURCE_URI);
+        runReportExecutionRequest = new RunReportExecutionRequest(getJsRestClient(), reportExecutionRequest);
+    }
+
+    public void test_requestReportStatus() throws Exception {
+        ReportExecutionResponse runReportExecutionResponse = runReportExecutionRequest.loadDataFromNetwork();
+        String requestId = runReportExecutionResponse.getRequestId();
+
+        CheckReportStatusRequest checkReportStatusRequest = new CheckReportStatusRequest(getJsRestClient(), requestId);
+        ReportStatusResponse response = checkReportStatusRequest.loadDataFromNetwork();
+        assertFalse(response.getStatus() == null);
+    }
+
+}

client/src/androidTest/java/com/jaspersoft/android/sdk/integration/GetRootFolderDataRequestTest.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2014. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+
+package com.jaspersoft.android.sdk.integration;
+
+import com.jaspersoft.android.sdk.client.async.request.GetRootFolderDataRequest;
+import com.jaspersoft.android.sdk.client.oxm.report.FolderDataResponse;
+import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
+
+public class GetRootFolderDataRequestTest extends ProtoInstrumentation {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void test_getRootFolderUriMethod() throws Exception {
+        GetRootFolderDataRequest request = new GetRootFolderDataRequest(getJsRestClient());
+        FolderDataResponse response = request.loadDataFromNetwork();
+        assertTrue(response.getUri().equals("/"));
+    }
+}

client/src/androidTest/java/com/jaspersoft/android/sdk/integration/ReportDetailsRequestTest.java

@@ -0,0 +1,34 @@
+package com.jaspersoft.android.sdk.integration;
+
+import com.jaspersoft.android.sdk.client.async.request.ReportDetailsRequest;
+import com.jaspersoft.android.sdk.client.async.request.RunReportExecutionRequest;
+import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionRequest;
+import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionResponse;
+import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
+import com.jaspersoft.android.sdk.integration.utils.SampleData;
+
+/**
+ * @author Tom Koptel
+ * @since 1.9
+ */
+public class ReportDetailsRequestTest extends ProtoInstrumentation {
+
+    private RunReportExecutionRequest runReportExecutionRequest;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ReportExecutionRequest reportExecutionRequest = SampleData.getSampleExecutionData(getJsRestClient(), RESOURCE_URI);
+        runReportExecutionRequest = new RunReportExecutionRequest(getJsRestClient(), reportExecutionRequest);
+    }
+
+    public void test_requestReportDetails() throws Exception {
+        ReportExecutionResponse runReportExecutionResponse = runReportExecutionRequest.loadDataFromNetwork();
+        String requestId = runReportExecutionResponse.getRequestId();
+
+        ReportDetailsRequest reportDetailsRequest = new ReportDetailsRequest(getJsRestClient(), requestId);
+        ReportExecutionResponse response = reportDetailsRequest.loadDataFromNetwork();
+        assertFalse(response == null);
+    }
+
+}