Merged release-0.8 into master

Author: davidmigloz

.travis.yml

@@ -3,6 +3,12 @@ language: android
 jdk: oraclejdk8
 compiler: gcc
 
+addons:
+  sonarqube:
+    branches:
+      - master
+      - develop
+
 env:
   matrix:
     - ANDROID_TARGET=android-22 ANDROID_ABI=armeabi-v7a
@@ -31,9 +37,9 @@ install:
 
 before_script:
     # Compile OpenCV and set it to path
-    - wget https://github.com/opencv/opencv/archive/3.1.0.zip
-    - unzip 3.1.0.zip >/dev/null
-    - mv opencv-3.1.0 opencv
+    - wget https://github.com/opencv/opencv/archive/3.2.0.zip
+    - unzip 3.2.0.zip >/dev/null
+    - mv opencv-3.2.0 opencv
     - cd opencv
     - mkdir build
     - cd build
@@ -42,7 +48,7 @@ before_script:
     - sudo make -j8 install >/dev/null
     - cd ../..
     - mkdir opencv_lib
-    - cp opencv/build/lib/libopencv_java310.so opencv_lib/libopencv_java310.so
+    - cp opencv/build/lib/libopencv_java320.so opencv_lib/libopencv_java320.so
     - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/opencv_lib/
     - chmod +x gradlew
     # Create gradle.properties with fake credentials
@@ -53,6 +59,8 @@ script:
     - ./gradlew assembleDebug lint
     # Run test coverage report
     - ./gradlew jacocoTestMockDebugUnitTestReport
+    # Run SonarQube analysis
+    - ./gradlew sonarqube
     # Build test app
     # ./gradlew assembleAndroidTest
     # Create and lunch emulator
@@ -67,4 +75,7 @@ after_success:
 
 cache:
   directories:
-    - $HOME/.gradle
+    - '$HOME/.m2/repository'
+    - '$HOME/.sonar/cache'
+    - '$HOME/.gradle'
+    - '.gradle'

README.md

@@ -1,10 +1,10 @@
-![header](https://cloud.githubusercontent.com/assets/6546265/19186791/3e4ee522-8c88-11e6-8074-a4c9219871fc.png)
+![header](https://cloud.githubusercontent.com/assets/6546265/22174630/785cdf04-dfe3-11e6-8cf4-024e8dc1c051.png)
 
-[![ZenHub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.com)
 [![GitHub Issues](https://img.shields.io/github/issues/davidmigloz/go-bees.svg)](https://github.com/davidmigloz/go-bees/issues)
 [![Build Status](https://travis-ci.org/davidmigloz/go-bees.svg?branch=master)](https://travis-ci.org/davidmigloz/go-bees)
 [![codecov](https://codecov.io/gh/davidmigloz/go-bees/branch/master/graph/badge.svg)](https://codecov.io/gh/davidmigloz/go-bees)
 [![Code Climate](https://codeclimate.com/github/davidmigloz/go-bees/badges/gpa.svg)](https://codeclimate.com/github/davidmigloz/go-bees)
+[![SonarQube](https://sonarqube.com/api/badges/gate?key=go-bees%3Amaster)](https://sonarqube.com/dashboard/index/go-bees%3Amaster)
 [![Dependency Status](https://www.versioneye.com/user/projects/57f7b19e823b88004e06ad33/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/57f7b19e823b88004e06ad33)
 [![Documentation Status](https://readthedocs.org/projects/go-bees/badge/?version=develop)](http://go-bees.readthedocs.io/es/develop/?badge=develop)
 

app/build.gradle

@@ -23,17 +23,15 @@ apply plugin: 'realm-android'
 android {
     compileSdkVersion 25
     buildToolsVersion '25.0.0'
-
     defaultConfig {
         applicationId "com.davidmiguel.gobees"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 7
-        versionName "v0.7"
+        versionCode 10
+        versionName "v1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-
     buildTypes {
         debug {
             testCoverageEnabled true
@@ -50,12 +48,10 @@ android {
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
         }
     }
-
     buildTypes.each {
         // OpenWeatherMap key (stored in [USER_HOME]/.gradle/gradle.properties)
         it.buildConfigField 'String', 'OPEN_WEATHER_MAP_API_KEY', OpenWeatherMapApiKey
     }
-
     // Mock: stubs out the service layer completely and returns a fake dataset
     // Prod: production version
     productFlavors {
@@ -66,26 +62,27 @@ android {
 
         }
     }
-
     // Remove mockRelease as it's not needed.
     android.variantFilter { variant ->
         if (variant.buildType.name.equals('release')
                 && variant.getFlavors().get(0).name.equals('mock')) {
             variant.setIgnore(true);
         }
     }
-
     // android.jar methods return either null or zero, not throw exceptions
     testOptions {
         unitTests.returnDefaultValues = true
     }
-
     // Always show the result of every unit test, even if it passes
     testOptions.unitTests.all {
         testLogging {
             events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
         }
     }
+    // Lint checks
+    lintOptions {
+        disable 'SetJavaScriptEnabled', 'MissingTranslation'
+    }
 }
 
 sourceSets {
@@ -95,41 +92,39 @@ sourceSets {
 }
 
 dependencies {
+
     // App's dependencies, including test
     compile 'com.android.support:recyclerview-v7:25.1.0'
     compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.android.support:design:25.1.0'
     compile 'com.android.support:cardview-v7:25.1.0'
     compile 'com.android.support:support-v4:25.1.0'
-    compile 'com.github.davidmigloz:opencv-android-gradle-repo:3.1.0'
+    compile 'com.github.davidmigloz:opencv-android-gradle-repo:3.2.0'
     compile 'com.google.android.gms:play-services-location:10.0.1'
     compile 'com.google.guava:guava:20.0'
     compile 'com.makeramen:roundedimageview:2.3.0'
     compile 'com.github.PhilJay:MPAndroidChart:v3.0.1'
     compile 'com.vanniktech:vntnumberpickerpreference:1.0.0'
     compile 'rebus:permission-utils:1.0.6'
-
     // Dependencies for local unit tests
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-all:2.0.2-beta'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.6'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.6'
     testCompile 'org.slf4j:slf4j-api:1.7.22'
     testCompile 'org.slf4j:slf4j-log4j12:1.7.22'
     testCompile 'log4j:log4j:1.2.17'
     testCompile 'org.json:json:20160810'
-
     // Android Testing Support Library's runner and rules
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
-
     // Dependencies for Android unit tests
     androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'org.mockito:mockito-core:2.5.5'
-
+    androidTestCompile 'org.mockito:mockito-core:2.6.2'
     // Espresso UI Testing
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
-
     // Resolve conflicts between main and test APK:
     androidTestCompile 'com.android.support:support-annotations:25.1.0'
     androidTestCompile 'com.android.support:support-v4:25.1.0'
@@ -155,7 +150,7 @@ configurations.compile.dependencies.each { compileDependency ->
 Copy test resources directory (test/mock/debug).
 */
 task copyResDirectoryToTestMockDebugClasses(type: Copy) {
-    from "${projectDir}/src/test/res"
+    from "${projectDir}/src/testMock/res"
     into "${buildDir}/intermediates/classes/test/mock/debug/res"
 }
 
@@ -165,3 +160,21 @@ Run copy test resources directory tasks before build.
 afterEvaluate {
     preBuild.dependsOn(copyResDirectoryToTestMockDebugClasses)
 }
+
+/*
+SonarQube configuration.
+
+*/
+sonarqube {
+    properties {
+        property "sonar.projectName", "GoBees"
+        property "sonar.projectKey", "com.davidmiguel.gobees"
+        property "sonar.projectVersion", versionName
+        property "sonar.exclusions", "**/*.png,**/*.jpg"
+        property "sonar.android.lint.report", "./build/outputs/lint-results-mockDebug.xml"
+        property "sonar.junit.reportsPath", "./build/test-results/mockDebug"
+        property "sonar.jacoco.reportPath", "./build/jacoco/testMockDebugUnitTest.exec"
+        property "sonar.java.coveragePlugin", "jacoco"
+        property "sonar.jacoco.reportMissing.force.zero", true
+    }
+}

app/proguard-rules.pro

@@ -48,4 +48,6 @@
 # Guava 19.0
 -dontwarn java.lang.ClassValue
 -dontwarn com.google.j2objc.annotations.Weak
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+# RecyclerView
+-keep class android.support.v7.widget.RecyclerView { *; }

app/proguardTest-rules.pro

@@ -41,4 +41,6 @@
 # Guava 19.0
 -dontwarn java.lang.ClassValue
 -dontwarn com.google.j2objc.annotations.Weak
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+# RecyclerView
+-keep class android.support.v7.widget.RecyclerView { *; }

app/src/androidTest/java/com/davidmiguel/gobees/about/AboutTest.java

@@ -0,0 +1,132 @@
+/*
+ * GoBees
+ * Copyright (c) 2016 - 2017 David Miguel Lozano
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.davidmiguel.gobees.about;
+
+
+import android.support.test.espresso.ViewInteraction;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.filters.LargeTest;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import com.davidmiguel.gobees.R;
+import com.davidmiguel.gobees.splash.SplashActivity;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withParent;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+/**
+ * About GoBees test.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class AboutTest {
+
+    @Rule
+    public ActivityTestRule<SplashActivity> mActivityTestRule =
+            new ActivityTestRule<>(SplashActivity.class);
+
+    private static Matcher<View> childAtPosition(
+            final Matcher<View> parentMatcher, final int position) {
+
+        return new TypeSafeMatcher<View>() {
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("Child at position " + position + " in parent ");
+                parentMatcher.describeTo(description);
+            }
+
+            @Override
+            public boolean matchesSafely(View view) {
+                ViewParent parent = view.getParent();
+                return parent instanceof ViewGroup && parentMatcher.matches(parent)
+                        && view.equals(((ViewGroup) parent).getChildAt(position));
+            }
+        };
+    }
+
+    @Test
+    public void aboutTest() {
+        ViewInteraction appCompatImageButton = onView(
+                allOf(withContentDescription("Navigate up"),
+                        withParent(withId(R.id.toolbar)),
+                        isDisplayed()));
+        appCompatImageButton.perform(click());
+
+        ViewInteraction appCompatCheckedTextView = onView(
+                allOf(withId(R.id.design_menu_item_text), withText("About GoBees"), isDisplayed()));
+        appCompatCheckedTextView.perform(click());
+
+        ViewInteraction textView = onView(
+                allOf(withId(R.id.app_name), withText("GoBees App"),
+                        childAtPosition(
+                                allOf(withId(R.id.linear_layout),
+                                        childAtPosition(
+                                                withId(R.id.contentFrame),
+                                                0)),
+                                1),
+                        isDisplayed()));
+        textView.check(matches(withText("GoBees App")));
+
+        ViewInteraction button = onView(
+                allOf(withId(R.id.website_btn),
+                        childAtPosition(
+                                childAtPosition(
+                                        withId(R.id.linear_layout),
+                                        3),
+                                0),
+                        isDisplayed()));
+        button.check(matches(isDisplayed()));
+
+        ViewInteraction button2 = onView(
+                allOf(withId(R.id.license_btn),
+                        childAtPosition(
+                                childAtPosition(
+                                        withId(R.id.linear_layout),
+                                        3),
+                                1),
+                        isDisplayed()));
+        button2.check(matches(isDisplayed()));
+
+        ViewInteraction button3 = onView(
+                allOf(withId(R.id.changelog_btn),
+                        childAtPosition(
+                                childAtPosition(
+                                        withId(R.id.linear_layout),
+                                        3),
+                                2),
+                        isDisplayed()));
+        button3.check(matches(isDisplayed()));
+    }
+}