Skip to content

Commit 47e068d

Browse files
committed
Merge branch '1.9'
2 parents 1a10732 + 683088c commit 47e068d

File tree

180 files changed

+3697
-1273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+3697
-1273
lines changed

.gitignore

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Created by .gitignore support plugin (hsz.mobi)
2+
### Android template
3+
# Built application files
4+
*.apk
5+
*.ap_
6+
7+
# Files for the Dalvik VM
8+
*.dex
9+
10+
# Java class files
11+
*.class
12+
13+
# Generated files
14+
bin/
15+
gen/
16+
17+
# Gradle files
18+
.gradle/
19+
build/
20+
21+
# Local configuration file (sdk path, etc)
22+
local.properties
23+
24+
# Proguard folder generated by Eclipse
25+
proguard/
26+
27+
# Log Files
28+
*.log
29+
30+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
31+
32+
## Directory-based project format
33+
.idea/
34+
35+
## File-based project format
36+
*.ipr
37+
*.iml
38+
*.iws
39+
40+
## Additional for IntelliJ
41+
out/
42+
43+
# generated by mpeltonen/sbt-idea plugin
44+
.idea_modules/
45+
46+
# generated by JIRA plugin
47+
atlassian-ide-plugin.xml
48+
49+
# generated by Crashlytics plugin (for Android Studio and Intellij)
50+
com_crashlytics_export_strings.xml.DS_Store
51+
.idea*
52+
*.iml
53+
*.db
54+
out
55+
bin
56+
gen

build.gradle

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
mavenCentral()
5+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
6+
mavenLocal()
7+
}
8+
dependencies {
9+
classpath "com.android.tools.build:gradle:0.14.2"
10+
classpath "com.github.dcendents:android-maven-plugin:1.2"
11+
}
12+
}
13+
14+
subprojects {
15+
group = 'com.jaspersoft.android.sdk'
16+
version = '1.9'
17+
18+
ext.androidMinSdkVersion = 9
19+
ext.androidTargetSdkVersion = 19
20+
ext.androidCompileSdkVersion = 19
21+
ext.androidBuildToolsVersion = "19.1"
22+
23+
repositories {
24+
jcenter()
25+
mavenCentral()
26+
mavenLocal()
27+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
28+
maven { url "file://${System.getenv("ANDROID_HOME")}/extras/android/m2repository" }
29+
}
30+
}
31+
32+
apply plugin: 'java' // ensure clean is also triggered for root build folder
33+
apply plugin: 'build-dashboard'
34+
35+
buildDashboard {
36+
reports.html.destination = "build/"
37+
}
38+
39+
test.reports.html.enabled = false // just clean up dashboard from not generated reports
40+
test.reports.junitXml.enabled = false // just clean up dashboard from not generated reports
41+

client/build.gradle

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
apply plugin: 'com.android.library'
2+
apply plugin: 'android-maven'
3+
4+
description = 'js-android-sdk-client'
5+
6+
ext {
7+
PUBLISH_GROUP_ID = group
8+
PUBLISH_ARTIFACT_ID = description
9+
PUBLISH_VERSION = '1.9'
10+
}
11+
12+
android {
13+
compileSdkVersion androidCompileSdkVersion
14+
buildToolsVersion androidBuildToolsVersion
15+
16+
defaultConfig {
17+
minSdkVersion androidMinSdkVersion
18+
targetSdkVersion androidTargetSdkVersion
19+
versionCode 9010900
20+
versionName version
21+
}
22+
23+
packagingOptions {
24+
exclude 'META-INF/notice.txt'
25+
exclude 'META-INF/license.txt'
26+
exclude 'META-INF/LICENSE.txt'
27+
exclude 'META-INF/NOTICE.txt'
28+
}
29+
lintOptions {
30+
abortOnError false
31+
}
32+
33+
buildTypes {
34+
debug {
35+
runProguard false
36+
}
37+
}
38+
}
39+
40+
dependencies {
41+
compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE'
42+
compile 'com.octo.android.robospice:robospice:1.4.14'
43+
compile 'com.octo.android.robospice:robospice-spring-android:1.4.14'
44+
compile('org.simpleframework:simple-xml:2.7') {
45+
exclude group: 'stax', module: 'stax'
46+
exclude group: 'stax', module: 'stax-api'
47+
exclude group: 'xpp3', module: 'xpp3'
48+
}
49+
}
50+
51+
apply from: '../scripts/android-release-aar.gradle'

client/pom.xml

Lines changed: 0 additions & 101 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2012-2014 Jaspersoft Corporation. All rights reserved.
4+
http://community.jaspersoft.com/project/mobile-sdk-android
5+
6+
Unless you have purchased a commercial license agreement from Jaspersoft,
7+
the following license terms apply:
8+
9+
This program is part of Jaspersoft Mobile SDK for Android.
10+
11+
Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
12+
it under the terms of the GNU Lesser General Public License as published by
13+
the Free Software Foundation, either version 3 of the License, or
14+
(at your option) any later version.
15+
16+
Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
GNU Lesser General Public License for more details.
20+
21+
You should have received a copy of the GNU Lesser General Public License
22+
along with Jaspersoft Mobile SDK for Android. If not, see
23+
<http://www.gnu.org/licenses/lgpl>.
24+
-->
25+
26+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
27+
package="com.jaspersoft.android.sdk.integration" >
28+
29+
<application/>
30+
31+
</manifest>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.jaspersoft.android.sdk.integration;
2+
3+
import com.jaspersoft.android.sdk.client.async.request.CheckReportStatusRequest;
4+
import com.jaspersoft.android.sdk.client.async.request.RunReportExecutionRequest;
5+
import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionRequest;
6+
import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionResponse;
7+
import com.jaspersoft.android.sdk.client.oxm.report.ReportStatusResponse;
8+
import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
9+
import com.jaspersoft.android.sdk.integration.utils.SampleData;
10+
11+
/**
12+
* @author Tom Koptel
13+
* @since 1.9
14+
*/
15+
public class CheckReportStatusRequestTest extends ProtoInstrumentation {
16+
17+
private RunReportExecutionRequest runReportExecutionRequest;
18+
19+
@Override
20+
protected void setUp() throws Exception {
21+
super.setUp();
22+
ReportExecutionRequest reportExecutionRequest = SampleData.getSampleExecutionData(getJsRestClient(), RESOURCE_URI);
23+
runReportExecutionRequest = new RunReportExecutionRequest(getJsRestClient(), reportExecutionRequest);
24+
}
25+
26+
public void test_requestReportStatus() throws Exception {
27+
ReportExecutionResponse runReportExecutionResponse = runReportExecutionRequest.loadDataFromNetwork();
28+
String requestId = runReportExecutionResponse.getRequestId();
29+
30+
CheckReportStatusRequest checkReportStatusRequest = new CheckReportStatusRequest(getJsRestClient(), requestId);
31+
ReportStatusResponse response = checkReportStatusRequest.loadDataFromNetwork();
32+
assertFalse(response.getStatus() == null);
33+
}
34+
35+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright (c) 2014. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
3+
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
4+
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
5+
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
6+
* Vestibulum commodo. Ut rhoncus gravida arcu.
7+
*/
8+
9+
package com.jaspersoft.android.sdk.integration;
10+
11+
import com.jaspersoft.android.sdk.client.async.request.GetRootFolderDataRequest;
12+
import com.jaspersoft.android.sdk.client.oxm.report.FolderDataResponse;
13+
import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
14+
15+
public class GetRootFolderDataRequestTest extends ProtoInstrumentation {
16+
17+
@Override
18+
protected void setUp() throws Exception {
19+
super.setUp();
20+
}
21+
22+
public void test_getRootFolderUriMethod() throws Exception {
23+
GetRootFolderDataRequest request = new GetRootFolderDataRequest(getJsRestClient());
24+
FolderDataResponse response = request.loadDataFromNetwork();
25+
assertTrue(response.getUri().equals("/"));
26+
}
27+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.jaspersoft.android.sdk.integration;
2+
3+
import com.jaspersoft.android.sdk.client.async.request.ReportDetailsRequest;
4+
import com.jaspersoft.android.sdk.client.async.request.RunReportExecutionRequest;
5+
import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionRequest;
6+
import com.jaspersoft.android.sdk.client.oxm.report.ReportExecutionResponse;
7+
import com.jaspersoft.android.sdk.integration.utils.ProtoInstrumentation;
8+
import com.jaspersoft.android.sdk.integration.utils.SampleData;
9+
10+
/**
11+
* @author Tom Koptel
12+
* @since 1.9
13+
*/
14+
public class ReportDetailsRequestTest extends ProtoInstrumentation {
15+
16+
private RunReportExecutionRequest runReportExecutionRequest;
17+
18+
@Override
19+
protected void setUp() throws Exception {
20+
super.setUp();
21+
ReportExecutionRequest reportExecutionRequest = SampleData.getSampleExecutionData(getJsRestClient(), RESOURCE_URI);
22+
runReportExecutionRequest = new RunReportExecutionRequest(getJsRestClient(), reportExecutionRequest);
23+
}
24+
25+
public void test_requestReportDetails() throws Exception {
26+
ReportExecutionResponse runReportExecutionResponse = runReportExecutionRequest.loadDataFromNetwork();
27+
String requestId = runReportExecutionResponse.getRequestId();
28+
29+
ReportDetailsRequest reportDetailsRequest = new ReportDetailsRequest(getJsRestClient(), requestId);
30+
ReportExecutionResponse response = reportDetailsRequest.loadDataFromNetwork();
31+
assertFalse(response == null);
32+
}
33+
34+
}

0 commit comments

Comments
 (0)