From 02b17328a473c6a328e23ab5be521fc2e8668f93 Mon Sep 17 00:00:00 2001
From: Andrei Bechet <andrei.bechet@esrlabs.com>
Date: Mon, 15 Jun 2015 12:43:18 +0200
Subject: [PATCH] finally tests are running (assert fail)

---
 .../.idea/dictionaries/andreibechet.xml       |  8 ++++
 2015/android/Geofence/app/app.iml             | 45 +++++++++++--------
 2015/android/Geofence/app/build.gradle        | 10 +++++
 .../esrlabs/com/geofence/ApplicationTest.java | 13 ------
 .../Geofence/app/src/main/AndroidManifest.xml | 17 +++++--
 .../java/esrlabs/com/geofence/MyService.java  | 37 +++++++++++++++
 .../app/src/main/res/values-w820dp/dimens.xml |  6 +++
 .../app/src/main/res/values/dimens.xml        |  5 +++
 .../esrlabs.com.geofence/MyServiceTest.java   | 33 ++++++++++++++
 2015/android/Geofence/build.gradle            |  3 +-
 10 files changed, 141 insertions(+), 36 deletions(-)
 create mode 100644 2015/android/Geofence/.idea/dictionaries/andreibechet.xml
 delete mode 100644 2015/android/Geofence/app/src/androidTest/java/esrlabs/com/geofence/ApplicationTest.java
 create mode 100644 2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java
 create mode 100644 2015/android/Geofence/app/src/main/res/values-w820dp/dimens.xml
 create mode 100644 2015/android/Geofence/app/src/main/res/values/dimens.xml
 create mode 100644 2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java

diff --git a/2015/android/Geofence/.idea/dictionaries/andreibechet.xml b/2015/android/Geofence/.idea/dictionaries/andreibechet.xml
new file mode 100644
index 0000000..3d533a8
--- /dev/null
+++ b/2015/android/Geofence/.idea/dictionaries/andreibechet.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="andreibechet">
+    <words>
+      <w>esrlabs</w>
+      <w>geofence</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/2015/android/Geofence/app/app.iml b/2015/android/Geofence/app/app.iml
index d70faf7..940ead4 100644
--- a/2015/android/Geofence/app/app.iml
+++ b/2015/android/Geofence/app/app.iml
@@ -9,13 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -26,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -35,12 +34,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -48,6 +41,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -55,13 +55,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -84,11 +84,20 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/2015/android/Geofence/app/build.gradle b/2015/android/Geofence/app/build.gradle
index 2e3e2f8..3a7392b 100644
--- a/2015/android/Geofence/app/build.gradle
+++ b/2015/android/Geofence/app/build.gradle
@@ -10,6 +10,7 @@ android {
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -17,9 +18,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.1.1'
+
+    testCompile 'junit:junit:4.12'
+
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
 }
diff --git a/2015/android/Geofence/app/src/androidTest/java/esrlabs/com/geofence/ApplicationTest.java b/2015/android/Geofence/app/src/androidTest/java/esrlabs/com/geofence/ApplicationTest.java
deleted file mode 100644
index 1f69128..0000000
--- a/2015/android/Geofence/app/src/androidTest/java/esrlabs/com/geofence/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package esrlabs.com.geofence;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/2015/android/Geofence/app/src/main/AndroidManifest.xml b/2015/android/Geofence/app/src/main/AndroidManifest.xml
index cbd49b8..24f5e26 100644
--- a/2015/android/Geofence/app/src/main/AndroidManifest.xml
+++ b/2015/android/Geofence/app/src/main/AndroidManifest.xml
@@ -1,8 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="esrlabs.com.geofence">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="esrlabs.com.geofence" >
 
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <service
+            android:name=".MyService"
+            android:enabled="true"
+            android:exported="true" >
+        </service>
     </application>
 
 </manifest>
diff --git a/2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java b/2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java
new file mode 100644
index 0000000..00d5074
--- /dev/null
+++ b/2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java
@@ -0,0 +1,37 @@
+package esrlabs.com.geofence;
+
+import android.app.Service;
+import android.content.Intent;
+import android.location.Location;
+import android.location.LocationListener;
+import android.os.Bundle;
+import android.os.IBinder;
+
+public class MyService extends Service implements LocationListener {
+    private Location latestLocation;
+
+    public MyService() {
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // TODO: Return the communication channel to the service.
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        latestLocation = location;
+    }
+
+    public Location latestLocation() {
+        return latestLocation;
+    }
+
+    @Override
+    public void onStatusChanged(String s, int i, Bundle bundle) {}
+    @Override
+    public void onProviderDisabled(String s) {}
+    @Override
+    public void onProviderEnabled(String s) {}
+}
diff --git a/2015/android/Geofence/app/src/main/res/values-w820dp/dimens.xml b/2015/android/Geofence/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/2015/android/Geofence/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/2015/android/Geofence/app/src/main/res/values/dimens.xml b/2015/android/Geofence/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/2015/android/Geofence/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java b/2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java
new file mode 100644
index 0000000..7f4079a
--- /dev/null
+++ b/2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java
@@ -0,0 +1,33 @@
+package esrlabs.com.geofence;
+
+import android.test.ServiceTestCase;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class MyServiceTest extends ServiceTestCase {
+
+
+    public MyServiceTest() {
+        super(MyService.class);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+    }
+
+    @Test
+    public void testLatestLocation() throws Exception {
+        assert(false);
+    }
+}
\ No newline at end of file
diff --git a/2015/android/Geofence/build.gradle b/2015/android/Geofence/build.gradle
index 0eb2bb3..b77cb19 100644
--- a/2015/android/Geofence/build.gradle
+++ b/2015/android/Geofence/build.gradle
@@ -3,7 +3,8 @@
 buildscript {
     repositories {
         jcenter {
-            url "http://jcenter.bintray.com/"
+            jcenter()
+            //url "http://jcenter.bintray.com/"
         }
     }
     dependencies {