Merge pull request #10 from studyplus/android-studio-1.0

Android studio 1.0

Author: x7c1

.gitignore

@@ -2,9 +2,11 @@
 gradle.properties
 /local.properties
 
-/.idea/workspace.xml
+/build
+/reports
 *.iml
 .idea
 
 *.tmp
+*~
 .DS_Store

README.md

@@ -85,6 +85,11 @@ try {
 
 * See also [actual examples](https://github.com/studyplus/Studyplus-Android-SDK/blob/master/SDKExample/src/main/java/jp/studyplus/android/sdk/example/ExampleActivity.java).
 
+### For contributor
+
+* Developed on AndroidStudio 1.0.0 or higher
+
 ## License
 
 * [MIT License](http://opensource.org/licenses/MIT)
+

SDKExample/build.gradle

@@ -1,12 +1,12 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 16
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }
@@ -22,22 +22,22 @@ android {
         release {
             debuggable false
             signingConfig signingConfigs.release
-            runProguard true
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
     productFlavors {
         production {
-            packageName 'jp.studyplus.android.sdk.example'
+            applicationId 'jp.studyplus.android.sdk.example'
         }
         development {
-            packageName 'jp.studyplus.android.sdk.example.dev'
+            applicationId 'jp.studyplus.android.sdk.example.dev'
         }
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.0.1'
+    compile 'com.android.support:appcompat-v7:21.0.0'
     compile 'com.google.code.findbugs:jsr305:1.3.9'
     compile project(':StudyplusAndroidSDK')
 }

StudyplusAndroidSDK/build.gradle

@@ -1,19 +1,40 @@
 
-apply plugin: 'android-library'
-apply plugin: 'android-test'
+apply plugin: 'com.android.library'
+apply plugin: 'robolectric'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 16
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }
-    sourceSets {
-        instrumentTest.setRoot('src/test')
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+    }
+}
+
+robolectric {
+    // configure the set of classes for JUnit tests
+    include '**/*Test.class'
+
+    // Specify max number of processes (default is 1)
+    maxParallelForks = 4
+
+    // Specify max number of test classes to execute in a test process
+    // before restarting the process (default is unlimited)
+    forkEvery = 150
+
+    // configure whether failing tests should fail the build
+    ignoreFailures true
+
+    // use afterTest to listen to the test execution results
+    afterTest { descriptor, result ->
+        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
     }
 }
 
@@ -22,16 +43,14 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.0.1'
     compile 'com.google.guava:guava:16.0'
 
-    def forTesting = [
-        'junit:junit:4.11',
-        'org.robolectric:robolectric:2.3-SNAPSHOT',
-        'com.squareup:fest-android:1.0.7',
-    ]
-    forTesting.each{ testCompile it }
-    forTesting.each{ instrumentTestCompile it }
+    androidTestCompile('junit:junit:4.11')
+    androidTestCompile('org.robolectric:robolectric:2.4') {
+        exclude module: 'commons-logging'
+        exclude module: 'httpclient'
+    }
+    androidTestCompile('com.squareup:fest-android:1.0.7')
 }
 
 apply from: 'gradle/build.values.gradle'

StudyplusAndroidSDK/gradle/build.publish.gradle

@@ -10,7 +10,7 @@ task sdkJar(type: Jar) {
 }
 
 task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.allJava
+    source = android.sourceSets.main.java.getSrcDirs()
 }
 
 task androidJavadocsJar(type: Jar) {
@@ -20,7 +20,7 @@ task androidJavadocsJar(type: Jar) {
 
 task androidSourcesJar(type: Jar) {
     classifier = 'sources'
-    from android.sourceSets.main.allSource
+    from android.sourceSets.main.java.getSrcDirs()
 }
 
 artifacts {

StudyplusAndroidSDK/src/androidTest/java/jp/studyplus/android/sdk/test/MockActivityCreator.java

@@ -0,0 +1,15 @@
+package jp.studyplus.android.sdk.test;
+
+import android.app.Activity;
+
+import org.robolectric.Robolectric;
+
+public final class MockActivityCreator {
+
+	private MockActivityCreator() {}
+
+	public static Activity createActivity() {
+		return Robolectric.buildActivity(Activity.class).create().get();
+	}
+
+}

StudyplusAndroidSDK/src/androidTest/java/jp/studyplus/android/sdk/test/auth/AuthTransitTest.java

@@ -0,0 +1,30 @@
+package jp.studyplus.android.sdk.test.auth;
+
+import android.content.ActivityNotFoundException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import jp.studyplus.android.sdk.service.auth.AuthTransit;
+import jp.studyplus.android.sdk.test.MockActivityCreator;
+
+@Config(emulateSdk = 18)
+@RunWith(RobolectricTestRunner.class)
+public class AuthTransitTest {
+
+	@Before
+	public void setUp(){
+		Robolectric.checkActivities(true);
+	}
+
+	@Test(expected = ActivityNotFoundException.class)
+	public void shouldThrowActivityNotFound() {
+		AuthTransit.from(MockActivityCreator.createActivity())
+				.startActivity("dummy_key", "dummy_key_secret");
+	}
+
+}

StudyplusAndroidSDK/src/test/java/jp/studyplus/android/sdk/test/service/api/StudyplusApiTest.java renamed to StudyplusAndroidSDK/src/androidTest/java/jp/studyplus/android/sdk/test/service/api/StudyplusApiTest.java

@@ -1,19 +1,25 @@
 package jp.studyplus.android.sdk.test.service.api;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import jp.studyplus.android.sdk.service.api.ApiRequest;
 import jp.studyplus.android.sdk.service.api.StudyplusApi;
 import jp.studyplus.android.sdk.service.auth.AccessTokenNotFound;
 import jp.studyplus.android.sdk.service.studyrecord.StudyRecordBuilder;
 import jp.studyplus.android.sdk.service.studyrecord.StudyRecordPostRequest;
-import jp.studyplus.android.sdk.test.RobolectricTest;
+import jp.studyplus.android.sdk.test.MockActivityCreator;
 
-public class StudyplusApiTest extends RobolectricTest{
+@Config(emulateSdk = 18)
+@RunWith(RobolectricTestRunner.class)
+public class StudyplusApiTest {
 
 	@Test(expected = AccessTokenNotFound.class)
 	public void testCatchAccessToken(){
 		ApiRequest request = StudyRecordPostRequest.of(new StudyRecordBuilder().build());
-		StudyplusApi.getClient(getActivity()).send(request);
+		StudyplusApi.getClient(MockActivityCreator.createActivity()).send(request);
 	}
+
 }