merge upstream

Author: memoizr

.travis.yml

@@ -2,4 +2,5 @@ language: java
 jdk:
   - oraclejdk8
 after_success:
-  - ./gradlew cobertura coveralls
+  - if [ -e ./gradlew ]; then ./gradlew jacocoTestReport;else gradle jacocoTestReport;fi
+  - bash <(curl -s https://codecov.io/bash) -t 7a683107-98e4-4c0d-b154-649e9ac9693c

README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/memoizr/assertk-core.svg?branch=master)](https://travis-ci.org/memoizr/assertk-core)
-[![](https://jitpack.io/v/memoizr/assertk-core.svg)](https://jitpack.io/#memoizr/assertk-core)
-[![GitHub license](https://img.shields.io/github/license/kotlintest/kotlintest.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Build Status](https://travis-ci.org/memoizr/assertk-core.svg?branch=master)](https://travis-ci.org/memoizr/assertk-core) [![](https://jitpack.io/v/memoizr/assertk-core.svg)](https://jitpack.io/#memoizr/assertk-core) [![GitHub license](https://img.shields.io/github/license/kotlintest/kotlintest.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![codecov](https://codecov.io/gh/memoizr/assertk-core/branch/master/graph/badge.svg)](https://codecov.io/gh/memoizr/assertk-core)
+
 # AssertK - Fluent assertions for Kotlin
 AssertK provides a Kotlin-friendly syntax for using the amazing AssertJ assertion framework.
 

build.gradle

@@ -11,24 +11,23 @@ buildscript {
     }
 }
 
-plugins {
-    id 'net.saliman.cobertura' version '2.3.1'
-    id 'com.github.kt3k.coveralls' version '2.6.3'
-}
-
-cobertura.coverageFormats = ['html', 'xml']
-cobertura.coverageSourceDirs = ['src/main/kotlin']
-cobertura.coverageSourceDirs = ['src/test/kotlin']
 group 'com.memoizr'
 version '0.1'
 
 apply plugin: 'kotlin'
+apply plugin: 'jacoco'
 
 repositories {
     maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
     jcenter()
 }
 
+jacocoTestReport {
+    reports {
+        xml.enabled true
+    }
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     compile group: 'org.assertj', name: 'assertj-core', version: '2.5.0'

src/main/kotlin/com/memoizr/assertk/AssertionHooks.kt

@@ -13,6 +13,7 @@ interface AssertionHook {
     infix fun that(subjectUnderTest: Float?) = FloatAssert(subjectUnderTest)
     infix fun that(subjectUnderTest: Double?) = DoubleAssert(subjectUnderTest)
     infix fun that(subjectUnderTest: Long?) = LongAssert(subjectUnderTest)
+    infix fun that(subjectUnderTest: Boolean?) = BooleanAssert(subjectUnderTest)
 }
 
 class RealAssertionHook : AssertionHook

src/main/kotlin/com/memoizr/assertk/BooleanAssert.kt

@@ -0,0 +1,15 @@
+package com.memoizr.assertk
+
+import org.assertj.core.api.AbstractBooleanAssert
+import org.assertj.core.api.Assertions
+
+class BooleanAssert internal constructor(
+        subjectUnderTest: Boolean?,
+        override val assertion: AbstractBooleanAssert<*> = Assertions.assertThat(subjectUnderTest)) :
+        AbstractAssertBuilder<BooleanAssert, Boolean>(subjectUnderTest, BooleanAssert::class.java) {
+
+    infix fun _is(other: Boolean): BooleanAssert {
+        if (other) assertion.isTrue() else assertion.isFalse()
+        return this
+    }
+}

src/test/kotlin/com/memoizr/assertk/BooleanAssert test.kt

@@ -0,0 +1,37 @@
+package com.memoizr.assertk
+
+import com.nhaarman.mockito_kotlin.never
+import com.nhaarman.mockito_kotlin.spy
+import com.nhaarman.mockito_kotlin.verify
+import org.assertj.core.api.AbstractBooleanAssert
+import org.assertj.core.api.Assertions
+import org.junit.Test
+
+class `BooleanAssert test` {
+    lateinit var mockAssertion: AbstractBooleanAssert<*>
+    @Suppress("UNCHECKED_CAST")
+    val _expect = object : AssertionHook {
+        override fun that(subjectUnderTest: Boolean?): BooleanAssert {
+            val spy: AbstractBooleanAssert<*> = spy(Assertions.assertThat(subjectUnderTest))
+            mockAssertion = spy
+            return BooleanAssert(subjectUnderTest, mockAssertion)
+        }
+    }
+
+    val chained = Any()
+    infix fun BooleanAssert.andCanBe(chained: Any) = this
+
+    @Test
+    fun isTrue() {
+        _expect that true _is true andCanBe chained
+        verify(mockAssertion).isTrue()
+        verify(mockAssertion, never()).isFalse()
+    }
+
+    @Test
+    fun isFalse() {
+        _expect that false _is false andCanBe chained
+        verify(mockAssertion).isFalse()
+        verify(mockAssertion, never()).isTrue()
+    }
+}