Merge pull request #2 from MarcusAdriano/feature/cover_rate

Include: coverage limit rate

build.gradle

@@ -13,17 +13,66 @@ repositories {
 }
 
 test {
+    // listen to events in the test execution lifecycle
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+
+    onOutput { descriptor, event ->
+        logger.lifecycle("Test: " + descriptor + " produced standard out/err: " + event.message )
+    }
+
     useJUnitPlatform()
-    finalizedBy jacocoTestReport
+}
+
+def jacocoExcludes = [
+    'io/github/marcusadriano/brawlstars/model/**'
+]
+
+def jacocoRulesExcludes = [
+        'io.github.marcusadriano.brawlstars.model.**'
+]
+
+jacocoTestCoverageVerification {
+    violationRules {
+        rule {
+            element = 'METHOD'
+            excludes = jacocoRulesExcludes
+            limit {
+                counter = 'BRANCH'
+                minimum = 0.9
+            }
+        }
+    }
 }
 
 jacocoTestReport {
-    dependsOn test
     reports {
         xml.enabled true
+        csv.enabled false
+        html.enabled true
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: jacocoExcludes)
+        }))
     }
 }
 
+check {
+    dependsOn jacocoTestCoverageVerification
+    dependsOn jacocoTestReport
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions {
+        freeCompilerArgs = ["-Xinline-classes", "-Xjvm-default=compatibility"]
+    }
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
 
 dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -32,17 +81,8 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
 
+    testImplementation 'com.squareup.retrofit2:retrofit-mock:2.9.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
     testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs = ["-Xinline-classes", "-Xjvm-default=compatibility"]
-    }
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
 }

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'BrawlStarsSDK'
+rootProject.name = 'BrawlStars-SDK'
 

src/main/kotlin/io/github/marcusadriano/brawlstars/BrawlStars.kt

@@ -1,15 +1,35 @@
 package io.github.marcusadriano.brawlstars
 
+import io.github.marcusadriano.brawlstars.model.BrawlStarsAuthInterceptor
+import io.github.marcusadriano.brawlstars.model.BrawlStarsToken
 import io.github.marcusadriano.brawlstars.service.BrawlStarsService
+import io.github.marcusadriano.brawlstars.service.BrawlStarsServiceApi
 import io.github.marcusadriano.brawlstars.service.impl.BrawlStarsServiceImpl
-import java.lang.RuntimeException
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 
 object BrawlStars {
 
     private var service: BrawlStarsService? = null
 
     @JvmStatic fun setup(token: String) {
-        service = BrawlStarsServiceImpl(BrawlStarsToken(token))
+        val bsToken = BrawlStarsToken(token)
+
+        val tokenInterceptor =
+            BrawlStarsAuthInterceptor(bsToken)
+
+        val okHttpClient = OkHttpClient.Builder()
+            .addInterceptor(tokenInterceptor)
+            .build()
+
+        val retrofit = Retrofit.Builder()
+            .client(okHttpClient)
+            .baseUrl("https://api.brawlstars.com/v1/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+        val api = retrofit.create(BrawlStarsServiceApi::class.java)
+        service = BrawlStarsServiceImpl(api)
     }
 
     @JvmStatic fun service(): BrawlStarsService {

src/main/kotlin/io/github/marcusadriano/brawlstars/BrawlStarsAuthInterceptor.kt → src/main/kotlin/io/github/marcusadriano/brawlstars/model/BrawlStarsAuthInterceptor.kt

@@ -1,4 +1,4 @@
-package io.github.marcusadriano.brawlstars
+package io.github.marcusadriano.brawlstars.model
 
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -10,7 +10,6 @@ internal class BrawlStarsAuthInterceptor(val token: BrawlStarsToken) : Intercept
         const val AUTHORIZATION = "Authorization"
     }
 
-
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
 

src/main/kotlin/io/github/marcusadriano/brawlstars/BrawlStarsToken.kt → src/main/kotlin/io/github/marcusadriano/brawlstars/model/BrawlStarsToken.kt

@@ -1,4 +1,4 @@
-package io.github.marcusadriano.brawlstars
+package io.github.marcusadriano.brawlstars.model
 
 inline class BrawlStarsToken(private val value: String) {
 

src/main/kotlin/io/github/marcusadriano/brawlstars/service/impl/BrawlStarsServiceImpl.kt

@@ -1,38 +1,15 @@
 package io.github.marcusadriano.brawlstars.service.impl
 
 import com.google.gson.Gson
-import io.github.marcusadriano.brawlstars.BrawlStarsAuthInterceptor
-import io.github.marcusadriano.brawlstars.BrawlStarsToken
 import io.github.marcusadriano.brawlstars.model.BattleLog
 import io.github.marcusadriano.brawlstars.model.Error
 import io.github.marcusadriano.brawlstars.model.Player
 import io.github.marcusadriano.brawlstars.model.Result
 import io.github.marcusadriano.brawlstars.service.BrawlStarsService
 import io.github.marcusadriano.brawlstars.service.BrawlStarsServiceApi
-import okhttp3.OkHttpClient
 import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
-internal class BrawlStarsServiceImpl(token: BrawlStarsToken) : BrawlStarsService {
-
-    private val retrofit: Retrofit
-    private val api: BrawlStarsServiceApi
-
-    init {
-        val tokenInterceptor = BrawlStarsAuthInterceptor(token)
-
-        val okHttpClient = OkHttpClient.Builder()
-            .addInterceptor(tokenInterceptor)
-            .build()
-
-        retrofit = Retrofit.Builder()
-            .client(okHttpClient)
-            .baseUrl("https://api.brawlstars.com/v1/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-        api = retrofit.create(BrawlStarsServiceApi::class.java)
-    }
+internal class BrawlStarsServiceImpl(private val api: BrawlStarsServiceApi) : BrawlStarsService {
 
     protected fun <T> parseResult(response: Response<T>): Result<T> {
         if (response.isSuccessful) {

src/test/kotlin/io/github/marcusadriano/brawlstars/BrawlStarsTest.kt

@@ -0,0 +1,22 @@
+package io.github.marcusadriano.brawlstars
+
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+
+internal class BrawlStarsTest {
+
+    @Test
+    fun `should create BsService Instance`() {
+        BrawlStars.setup("any")
+        val bs = BrawlStars.service()
+        assertNotNull(bs)
+    }
+
+    @Test
+    fun `should throw RuntimeException`() {
+        assertThrows<RuntimeException> {
+            BrawlStars.service()
+        }
+    }
+}