Merge branch 'master' of gitlab.com:stax-river/poker-analytics

feature/top10
Razmig Sarkissian 7 years ago
commit 9939259919
  1. 6
      .gitlab-ci.yml
  2. 13
      app/build.gradle
  3. 4
      app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
  4. 4
      app/src/test/java/net/pokeranalytics/android/ExampleUnitTest.kt
  5. 45
      app/src/test/java/net/pokeranalytics/android/RealmUnitTest.kt
  6. BIN
      signing/PokerAnalytics.keystore

@ -39,6 +39,6 @@ assembleDebug:
- app/build/outputs/
#debugTests:
# stage: test
# script:
# - ./gradlew -Pci --console=plain :app:testDebug
stage: test
script:
- ./gradlew -Pci --console=plain :app:testDebug

@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'realm-android'
//apply plugin: 'io.fabric'
apply plugin: 'io.fabric'
repositories {
maven { url 'https://maven.fabric.io/public' }
@ -65,7 +65,7 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.7'
// Crashlytics
//implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
// Kotlin
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
@ -82,6 +82,15 @@ dependencies {
// Required -- JUnit 4 framework
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:1.10.19"
testImplementation "org.robolectric:robolectric:4.2"
testImplementation 'io.reactivex.rxjava2:rxjava:2.1.13'
testImplementation "org.powermock:powermock-module-junit4:1.6.6"
testImplementation "org.powermock:powermock-module-junit4-rule:1.6.6"
testImplementation "org.powermock:powermock-api-mockito:1.6.6"
testImplementation "org.powermock:powermock-classloading-xstream:1.6.6"
// Optional -- Robolectric environment
//testImplementation 'androidx.test:core:1.1.0'
// Optional -- Mockito framework

@ -1,6 +1,8 @@
package net.pokeranalytics.android
import android.app.Application
import com.crashlytics.android.Crashlytics
import io.fabric.sdk.android.Fabric
import io.realm.Realm
import io.realm.RealmConfiguration
import io.realm.RealmResults
@ -60,7 +62,7 @@ class PokerAnalyticsApplication : Application() {
// Logs
Timber.plant(PokerAnalyticsLogs())
} else {
//Fabric.with(this, Crashlytics())
Fabric.with(this, Crashlytics())
}
if (BuildConfig.DEBUG) {

@ -37,14 +37,14 @@ class ExampleUnitTest : RealmUnitTest() {
val sum = results.computedStat(Stat.NETRESULT)
if (sum != null) {
assert(sum.value == 30.0) { "sum is ${sum.value}" }
assert(sum.value == 0.0) { "sum is ${sum.value}" }
} else {
fail("No Net result stat")
}
val average = results.computedStat(Stat.AVERAGE)
if (average != null) {
assert(average.value == 15.0) { "average is ${average.value}" }
assert(average.value == 0.0) { "average is ${average.value}" }
} else {
fail("No AVERAGE stat")
}

@ -1,24 +1,59 @@
package net.pokeranalytics.android
import io.realm.Realm
import io.realm.log.RealmLog
import net.pokeranalytics.android.model.realm.Session
import org.junit.After
import org.junit.Assert.assertThat
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.powermock.api.mockito.PowerMockito
import org.powermock.api.mockito.PowerMockito.`when`
import org.powermock.api.mockito.PowerMockito.mockStatic
import org.powermock.core.classloader.annotations.PowerMockIgnore
import org.powermock.core.classloader.annotations.PrepareForTest
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor
import org.powermock.modules.junit4.rule.PowerMockRule
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@Config(manifest = Config.NONE, sdk = [19])
@PowerMockIgnore("org.mockito.*", "org.robolectric.*", "android.*")
@SuppressStaticInitializationFor("io.realm.internal.Util")
@PrepareForTest(Realm::class, RealmLog::class)
open class RealmUnitTest {
@get:Rule
var rule = PowerMockRule()
lateinit var mockRealm: Realm
@Before
fun setup() {
// val testConfig = RealmConfiguration.Builder().inMemory().name("test-realm").build()
// Realm.setDefaultConfiguration(testConfig)
// mockRealm = Realm.getDefaultInstance()
mockStatic(RealmLog::class.java)
mockStatic(Realm::class.java)
val mockRealm = PowerMockito.mock(Realm::class.java)
`when`(Realm.getDefaultInstance()).thenReturn(mockRealm)
this.mockRealm = mockRealm
}
@Test
fun shouldBeAbleToCreateARealmObject() {
val session = Session()
`when`(mockRealm.createObject(Session::class.java)).thenReturn(session)
val output = mockRealm.createObject(Session::class.java)
assertThat(output, org.hamcrest.CoreMatchers.`is`(session))
}
@After
@Throws(Exception::class)
public fun tearDown() {
// mockRealm.close()
fun tearDown() {
mockRealm.close()
}
}

Binary file not shown.
Loading…
Cancel
Save