Skip to content

Commit f5b35ab

Browse files
LayoricLayoric
committed
Remove dependency on org.json and just used google's GSON library.
Created failing auth test.
1 parent e928b22 commit f5b35ab

File tree

13 files changed

+105
-74
lines changed

13 files changed

+105
-74
lines changed

‎src/AndroidClient/.idea/gradle.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/AndroidClient.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>

‎src/AndroidClient/android/android.iml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -62,6 +63,7 @@
6263
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6364
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6465
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6567
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6668
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6769
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,16 +83,18 @@
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8691
</content>
87-
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
92+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8893
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9094
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
91-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
95+
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9296
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
93-
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
97+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9498
<orderEntry type="module" module-name="client" exported="" />
9599
</component>
96100
</module>

src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/AndroidServiceClientTests.java renamed to src/AndroidClient/android/src/androidTest/java/net/servicestack/android/AndroidServiceClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.servicestack.client.tests;
1+
package net.servicestack.android;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TechStacksServiceTestsAsync.java renamed to src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TechStacksServiceTestsAsync.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.servicestack.client.tests;
1+
package net.servicestack.android;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;
@@ -8,6 +8,7 @@
88
import net.servicestack.client.AsyncResult;
99
import net.servicestack.client.Log;
1010
import net.servicestack.client.Utils;
11+
import net.servicestack.client.tests.TechStacksServiceTests;
1112

1213
import java.util.concurrent.CountDownLatch;
1314
import java.util.concurrent.TimeUnit;

src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTestsAsync.java renamed to src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.servicestack.client.tests;
1+
package net.servicestack.android;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;
@@ -10,6 +10,7 @@
1010
import java.util.concurrent.CountDownLatch;
1111
import java.util.concurrent.TimeUnit;
1212

13+
import net.servicestack.client.tests.TestServiceTests;
1314
import net.servicestack.client.tests.testdtos.*;
1415

1516
public class TestServiceTestsAsync extends ApplicationTestCase<Application> {

‎src/AndroidClient/app/app.iml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -81,15 +82,16 @@
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8588
</content>
86-
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
89+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8790
<orderEntry type="sourceFolder" forTests="false" />
88-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
8991
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
90-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9193
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
92-
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
94+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9395
<orderEntry type="module" module-name="android" exported="" />
9496
</component>
9597
</module>

‎src/AndroidClient/client/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

5-
version = "1.0.9"
5+
version = "1.0.10"
66
group = "net.servicestack" // Maven Group ID for the artifact
77
String packageId = "client"
88

@@ -98,7 +98,6 @@ install {
9898
dependencies {
9999
compile fileTree(dir: 'libs', include: ['*.jar'])
100100
compile 'com.google.code.gson:gson:2.3.1'
101-
compile 'org.json:org.json:chargebee-1.0'
102101
}
103102

104103
task sourcesJar(type: Jar) {

‎src/AndroidClient/client/client.iml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -62,6 +63,7 @@
6263
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6364
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6465
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6567
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6668
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6769
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,12 +83,14 @@
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8691
</content>
87-
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
92+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8893
<orderEntry type="sourceFolder" forTests="false" />
8994
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
90-
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
9195
</component>
9296
</module>

‎src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTests.java‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.app.Application;
66
import android.test.ApplicationTestCase;
77

8-
import net.servicestack.android.AndroidLogProvider;
98
import net.servicestack.client.ExceptionFilter;
109
import net.servicestack.client.JsonServiceClient;
1110
import net.servicestack.client.Log;
@@ -26,10 +25,13 @@
2625
import java.util.List;
2726
import java.util.UUID;
2827

28+
import io.techstacks.*;
29+
import io.techstacks.dto;
30+
2931
public class TestServiceTests extends ApplicationTestCase<Application> {
3032
public TestServiceTests() {
3133
super(Application.class);
32-
Log.Instance = new AndroidLogProvider("ZZZ");
34+
//Log.Instance = new AndroidLogProvider("ZZZ");
3335
}
3436

3537
JsonServiceClient client = new JsonServiceClient("http://test.servicestack.net");
@@ -174,6 +176,20 @@ public void test_Can_POST_valid_ThrowValidation_request() {
174176
assertEquals(request.getEmail(), response.getEmail());
175177
}
176178

179+
public void test_does_handle_auth_failure() {
180+
JsonServiceClient techStacksClient = new JsonServiceClient("http://techstacks.io/");
181+
String errorCode = "";
182+
try {
183+
dto.LockTechStack request = new dto.LockTechStack();
184+
request.setTechnologyStackId((long)6);
185+
dto.LockStackResponse res = techStacksClient.post(request);
186+
} catch(WebServiceException ex) {
187+
//private StatusCode has correct code, response status is null due to empty response body.
188+
errorCode = ex.getResponseStatus().errorCode;
189+
}
190+
assertEquals(errorCode,"401");
191+
}
192+
177193
/* TEST HELPERS */
178194

179195
public static HelloAllTypes createHelloAllTypes(){

0 commit comments

Comments
 (0)