Merge branch 'dev'

# Conflicts: # RELEASE_NOTES.md
MinterTeam · Jan 28, 2019 · cfc54b7 · cfc54b7
2 parents 7d20349 + 615b284
commit cfc54b7
Show file tree

Hide file tree

Showing 62 changed files with 2,735 additions and 447 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,15 @@
 # Release Notes
 
+## 1.2.7
+ - Updated SDK
+ - Written basic UI tests
+ - Fixed minor UI issues
+
+## 1.2.6 
+ - (!) unreleased
+
 ## 1.2.5
- - HotFixed error while getting free coins
+  - HotFixed error while getting free coins
 
 ## 1.2.4
  - Updated blockchain SDK (min/max values to buy/sell)

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by MinterTeam. 2018
+ * Copyright (C) by MinterTeam. 2019
  * @link <a href="https://github.com/MinterTeam">Org Github</a>
  * @link <a href="https://github.com/edwardstock">Maintainer Github</a>
  *
@@ -27,21 +27,35 @@
 plugins {
     id 'com.android.application'
     id 'io.fabric'
+//    id 'firebase.test.lab'
 }
 
+//apply plugin: 'firebase.test.lab'
+
 Properties localProps = new Properties()
 localProps.load(project.rootProject.file('local.properties').newDataInputStream())
 
+//firebaseTestLab {
+//    keyFile = file(getProperty('minter_firebase_keypath'))
+//    googleProjectId = "bip-wallet"
+//    devices {
+//        nexusEmulator {
+//            deviceIds = ["hammerhead"]
+//            androidApiLevels = [23]
+//        }
+//    }
+//}
+
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "network.minter.bipwallet"
         minSdkVersion minterMinSdk
         targetSdkVersion minterMaxSdk
-        versionCode 58
-        versionName "1.2.5"
-        testInstrumentationRunner "network.minter.bipwallet.internal.WalletTestRunner"
+        versionCode 63
+        versionName "1.2.7"
+        testInstrumentationRunner "network.minter.bipwallet.tests.internal.WalletTestRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
@@ -60,6 +74,13 @@ android {
         additionalParameters "--no-version-vectors"
     }
 
+    testOptions {
+        animationsDisabled true
+        unitTests.all {
+
+        }
+    }
+
 
     signingConfigs {
         config {
@@ -78,6 +99,7 @@ android {
         }
 
         debug {
+            testCoverageEnabled = true
             signingConfig signingConfigs.config
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'proguard-test-rules.pro', 'proguard-release-rules.pro'
@@ -117,9 +139,9 @@ android {
 }
 
 ext {
-    minterExplorerSDK = "0.2.7"
+    minterExplorerSDK = "0.2.9"
     minterProfileSDK = "0.2.1"
-    minterBlockchainSDK = "0.4.0"
+    minterBlockchainSDK = "0.5.1"
     minterCoreSDK = "0.2.2"
 }
 
@@ -220,9 +242,9 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
     // networking
-    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
 
@@ -234,7 +256,6 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
 
     // don't update to 2.2.0 - some issues when using elevation
-
     //noinspection GradleDependency
     implementation 'de.hdodenhof:circleimageview:2.1.0'
     annotationProcessor 'io.sweers.barber:barber-compiler:1.3.1'
@@ -246,12 +267,21 @@ dependencies {
     implementation 'com.pnikosis:materialish-progress:1.7'
 
     // testing
+    implementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'junit:junit:4.12'
+    testImplementation "org.mockito:mockito-core:2.23.4"
+    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
+    androidTestImplementation 'com.squareup.retrofit2:retrofit-mock:2.5.0'
+    androidTestImplementation 'com.jakewharton.espresso:okhttp3-idling-resource:1.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+//    androidTest
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
-    androidTestImplementation 'com.squareup.rx.idler:rx2-idler:0.9.0'
+    androidTestImplementation 'com.squareup.rx.idler:rx2-idler:0.9.1'
+
+    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.16'
+    androidTestAnnotationProcessor 'com.google.dagger:dagger-android-processor:2.16'
 }
 repositories {
     mavenCentral()

diff --git a/app/proguard-test-rules.pro b/app/proguard-test-rules.pro
@@ -3,15 +3,15 @@
 
 -keepattributes *Annotation*
 
--dontnote junit.framework.**
--dontnote junit.runner.**
-
--dontwarn android.test.**
--dontwarn android.support.test.**
--dontwarn org.junit.**
--dontwarn org.hamcrest.**
--dontwarn com.squareup.javawriter.JavaWriter
+-keep class org.hamcrest.** {*;}
+-keep class junit.framework.** {*;}
+-keep class junit.runner.** {*;}
+-keep class org.junit.** { *; }
+-keep class org.mockito.** {*;}
+-keep class android.test.** {*;}
+-keep class android.support.test.** {*;}
+-keep class com.squareup.javawriter.JavaWriter {*;}
 -keep class io.reactivex.plugins.RxJavaPlugins { *; }
 -keep class io.reactivex.disposables.CompositeDisposable { *; }
-# Uncomment this if you use Mockito
-#-dontwarn org.mockito.**
+-keep class network.minter.bipwallet.* { *; }
+-keep class android.support.test.** { *; }
diff --git a/app/src/androidTest/java/network/minter/bipwallet/auth/ui/AdvancedModeAuthTest.java b/app/src/androidTest/java/network/minter/bipwallet/auth/ui/AdvancedModeAuthTest.java
diff --git a/...ipwallet/data/KVStorageQueueSaveTest.java → ...et/tests/data/KVStorageQueueSaveTest.java b/...ipwallet/data/KVStorageQueueSaveTest.java → ...et/tests/data/KVStorageQueueSaveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by MinterTeam. 2018
+ * Copyright (C) by MinterTeam. 2019
  * @link <a href="https://github.com/MinterTeam">Org Github</a>
  * @link <a href="https://github.com/edwardstock">Maintainer Github</a>
  *
@@ -24,8 +24,9 @@
  * THE SOFTWARE.
  */
 
-package network.minter.bipwallet.data;
+package network.minter.bipwallet.tests.data;
 
+import android.support.annotation.NonNull;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -35,8 +36,8 @@
 import java.util.LinkedList;
 import java.util.Queue;
 
-import network.minter.bipwallet.internal.TestWallet;
 import network.minter.bipwallet.internal.storage.KVStorage;
+import network.minter.bipwallet.tests.internal.TestWallet;
 
 import static junit.framework.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
@@ -55,10 +56,10 @@ public void testOrderPreserves() {
         Queue<QueuedObj> data = new LinkedList<>();
         data.add(new QueuedObj(1, "A"));
         data.add(new QueuedObj(2, "B"));
-        data.add(new QueuedObj(1, "C"));
-        data.add(new QueuedObj(3, "D"));
-        data.add(new QueuedObj(1, "E"));
-        data.add(new QueuedObj(4, "F"));
+        data.add(new QueuedObj(3, "C"));
+        data.add(new QueuedObj(4, "D"));
+        data.add(new QueuedObj(5, "E"));
+        data.add(new QueuedObj(6, "F"));
 
         final KVStorage storage = TestWallet.app().storage();
         storage.putQueue("test_queue", data);
@@ -89,5 +90,11 @@ public static class QueuedObj {
             this.id = id;
             this.name = name;
         }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return String.format("id=%d, n=%s", id, name);
+        }
     }
 }