bugfixes and more

Author: jonasrottmann

.travis.yml

@@ -37,6 +37,10 @@ before_script:
   - android-wait-for-emulator
 
 script:
-  - ./gradlew assemble
-  - ./gradlew build check # Local unit tests
-  - ./gradlew build connectedCheck # Instrumented unit tests
+  - ./gradlew clean
+  - ./gradlew check # Local unit tests
+  - ./gradlew connectedCheck # Instrumented unit tests
+  - ./gradlew jacocoTestReport
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

androidlib.gradle

@@ -15,6 +15,7 @@ android {
         targetSdkVersion project.targetSdkVersion
         versionCode project.gitCommitCount
         versionName project.gitTag
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -43,6 +44,10 @@ dependencies {
     compile "com.android.support:appcompat-v7:$project.supportLibVersion"
     compile "com.jakewharton.timber:timber:$project.timberVersion"
 
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+
     // test local version of realm-browser
     normalCompile project(':realm-browser')
     noopCompile project(':realm-browser-no-op')

app/build.gradle

@@ -4,25 +4,23 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
 import de.jonasrottmann.realmbrowser.RealmBrowser;
 import de.jonasrottmann.realmsample.data.Address;
 import de.jonasrottmann.realmsample.data.Contact;
 import de.jonasrottmann.realmsample.data.RealmString;
 import de.jonasrottmann.realmsample.data.User;
 import io.realm.Realm;
+import io.realm.RealmConfiguration;
 import io.realm.RealmList;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 public class MainActivity extends Activity implements View.OnClickListener {
 
     private TextView mTxtTitle;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -96,7 +94,7 @@ private void insertUsers(int count) {
             user.setAge(i);
             user.setAddress(address);
             user.setUuid(UUID.randomUUID().toString());
-            user.setByteArray(new byte[]{1, 2, 3});
+            user.setByteArray(new byte[] { 1, 2, 3 });
             user.setCreationDate(new Date(System.currentTimeMillis()));
 
             RealmList<RealmString> emailList = new RealmList<>();
@@ -134,6 +132,9 @@ private void startRealmFilesActivity() {
 
 
     private void startRealmModelsActivity() {
-        RealmBrowser.startRealmModelsActivity(this, Realm.getDefaultInstance().getConfiguration());
+        Realm realm = Realm.getDefaultInstance();
+        RealmConfiguration configuration = realm.getConfiguration();
+        realm.close();
+        RealmBrowser.startRealmModelsActivity(this, configuration);
     }
 }

app/src/main/java/de/jonasrottmann/realmsample/MainActivity.java

@@ -10,13 +10,14 @@ buildscript {
         minSdkVersion = 15
 
         // plugins
-        androidGradlePluginVersion = '2.2.3'
-        realmVersion = '2.3.1'
+        androidGradlePluginVersion = '2.3.0'
+        realmVersion = '3.0.0'
         dexcountVersion = '0.6.2'
 
         // dependencies
         timberVersion = '4.3.0'
-        supportLibVersion = '25.2.0'
+        supportLibVersion = '25.3.0'
+        lombokVersion = '1.12.6'
     }
 
     repositories {

build.gradle

@@ -0,0 +1,57 @@
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion = "0.7.9"
+}
+
+/**
+ * The correct path of the report is $rootProjectDir/app/build/reports/jacoco/index.html
+ * to run this task use: ./gradlew clean jacocoTestReport
+ */
+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) { //we use "debug" build type for test coverage (can be other)
+    group = "reporting"
+    description = "Generate unified JaCoCo code coverage report"
+
+    reports {
+        xml.enabled = true
+        html.enabled = true
+        csv.enabled = false
+        xml.destination = "${buildDir}/reports/jacocoTestReport.xml"
+        html.destination = "${buildDir}/reports/jacoco"
+        csv.destination = "${buildDir}/reports/jacocoTestReport.csv"
+    }
+
+    def fileFilter = [
+        '**/*Test*.*',
+        '**/AutoValue_*.*',
+        '**/*JavascriptBridge.class',
+        '**/R.class',
+        '**/R$*.class',
+        '**/Manifest*.*',
+        'android/**/*.*',
+        '**/BuildConfig.*',
+        '**/*$ViewBinder*.*',
+        '**/*$ViewInjector*.*',
+        '**/Lambda$*.class',
+        '**/Lambda.class',
+        '**/*Lambda.class',
+        '**/*Lambda*.class',
+        '**/*$InjectAdapter.class',
+        '**/*$ModuleAdapter.class',
+        '**/*$ViewInjector*.class',
+        '**/*_MembersInjector.class', //Dagger2 generated code
+        '*/*_MembersInjector*.*', //Dagger2 generated code
+        '**/*_*Factory*.*', //Dagger2 generated code
+        '*/*Component*.*', //Dagger2 generated code
+        '**/*Module*.*' //Dagger2 generated code
+    ]
+    def debugTree = fileTree(dir: "${buildDir}/intermediates/classes/debug", excludes: fileFilter) //we use "debug" build type for test coverage (can be other)
+    def mainSrc = "${project.projectDir}/src/main/java"
+
+    sourceDirectories = files([mainSrc])
+    classDirectories = files([debugTree])
+    executionData = fileTree(dir: "$buildDir", includes: [
+        "jacoco/testDebugUnitTest.exec", //we use "debug" build type for test coverage (can be other)
+        "outputs/code-coverage/connected/*coverage.ec"
+    ])
+}

coverage.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 apply plugin: 'android-maven'
 
-group = 'de.jonasrottmann.realmbrowser'
+group = 'de.jonasrottmann.realm-browser'
 
 // build a jar with source files
 task sourcesJar(type: Jar) {

publish.gradle

@@ -2,7 +2,23 @@ apply plugin: 'com.android.library'
 apply plugin: 'realm-android'
 apply plugin: 'com.getkeepsafe.dexcount'
 
-apply from: rootProject.file('androidlib.gradle')
+android {
+    compileSdkVersion project.compileSdkVersion
+    buildToolsVersion project.buildToolsVersion
+    resourcePrefix 'realm_browser_'
+
+    defaultConfig {
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionCode project.gitCommitCount
+        versionName project.gitTag
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])

realm-browser-no-op/build.gradle

@@ -2,22 +2,77 @@ apply plugin: 'com.android.library'
 apply plugin: 'realm-android'
 apply plugin: 'com.getkeepsafe.dexcount'
 
-apply from: rootProject.file('androidlib.gradle')
+android {
+    compileSdkVersion project.compileSdkVersion
+    buildToolsVersion project.buildToolsVersion
+    resourcePrefix 'realm_browser_'
+
+    defaultConfig {
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionCode project.gitCommitCount
+        versionName project.gitTag
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled true
+        }
+    }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+        unitTests.all {
+            jacoco {
+                includeNoLocationClasses = true
+            }
+        }
+    }
+
+    sourceSets {
+        String sharedTestDir = 'src/sharedTest/java'
+        test {
+            java.srcDir sharedTestDir
+        }
+        androidTest {
+            java.srcDir sharedTestDir
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    // This enables long timeouts required on slow environments, e.g. Travis
+    adbOptions {
+        timeOutInMs 10 * 60 * 1000 // 10 minutes
+        installOptions "-d", "-t"
+    }
+}
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+
     compile "com.android.support:appcompat-v7:$project.supportLibVersion"
     compile "com.android.support:recyclerview-v7:$project.supportLibVersion"
     compile "com.android.support:design:$project.supportLibVersion"
     compile "com.android.support:support-annotations:$project.supportLibVersion"
     compile "com.jakewharton.timber:timber:$project.timberVersion"
+
     testCompile "junit:junit:4.12"
     androidTestCompile "junit:junit:4.12"
     androidTestCompile "com.android.support:support-annotations:$project.supportLibVersion"
     androidTestCompile "com.android.support.test:runner:0.5"
     androidTestCompile "com.android.support.test:rules:0.5"
-//    androidTestApt "io.realm:realm-annotations:$project.realmVersion"
-//    androidTestApt "io.realm:realm-annotations-processor:$project.realmVersion"
+    androidTestAnnotationProcessor "io.realm:realm-annotations:$project.realmVersion"
+    androidTestAnnotationProcessor "io.realm:realm-annotations-processor:$project.realmVersion"
 }
 
+apply from: rootProject.file('coverage.gradle')
 apply from: rootProject.file('publish.gradle')

realm-browser/build.gradle

@@ -1,5 +1,6 @@
 package de.jonasrottmann.realmbrowser;
 
+import de.jonasrottmann.realmbrowser.helper.TestRealmConfigurationFactory;
 import io.realm.DynamicRealm;
 import io.realm.Realm;
 import io.realm.RealmConfiguration;