Merge branch 'demo'

Author: linl33

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.0'
     }
 }

sensorsframework_app/build.gradle

@@ -103,6 +103,8 @@ configurations.all {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:preference-v7:27.1.1'
 
     if (libraryProjectPath.exists() && gradle.useLocal) { // Local project is favoured
         implementation project(libraryProjectName)

sensorsframework_app/src/androidTest/java/org/opendatakit/sensors/ApplicationTest.java

@@ -1,13 +1,66 @@
 package org.opendatakit.sensors;
 
-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);
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ServiceTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.opendatakit.sensors.service.IODKSensorService;
+
+import java.util.concurrent.TimeoutException;
+
+import static org.junit.Assert.assertNotNull;
+
+
+@RunWith(AndroidJUnit4.class)
+public class ApplicationTest {
+
+   private final static String LOGTAG = ApplicationTest.class.getCanonicalName();
+
+   @Rule
+   public final ServiceTestRule mServiceRule = new ServiceTestRule();
+
+   private IODKSensorService bindToService() {
+      Context context = InstrumentationRegistry.getContext();
+      Intent bind_intent = new Intent();
+      bind_intent.setClassName(SensorsConsts.frameworkPackage, SensorsConsts.frameworkService);
+
+      int count = 0;
+      IODKSensorService sensorService;
+      try {
+         IBinder service = null;
+         while ( service == null ) {
+            try {
+               service = mServiceRule.bindService(bind_intent);
+            } catch (TimeoutException e) {
+               service = null;
+            }
+            if ( service == null ) {
+               ++count;
+               if ( count % 20 == 0 ) {
+                  Log.i(LOGTAG, "bindToDbService failed for " + count);
+               }
+               try {
+                  Thread.sleep(10);
+               } catch (InterruptedException e) {
+               }
+            }
+         }
+         sensorService = IODKSensorService.Stub.asInterface(service);
+      } catch (IllegalArgumentException e) {
+         sensorService = null;
+      }
+      return sensorService;
+   }
+
+   @Test
+   public void testBinding() {
+      IODKSensorService serviceInterface = bindToService();
+      assertNotNull( "bind did not succeed", serviceInterface);
    }
 }

sensorsframework_app/src/androidTest/java/org/opendatakit/sensors/service/DummySensorTest.java

@@ -39,7 +39,7 @@ public class DummySensorTest {
 
    @Rule public final ODKServiceTestRule mServiceRule = new ODKServiceTestRule();
 
-   public ODKSensorService boundService;
+   public IODKSensorService boundService;
 
    @Before public void bindToSensorService() {
 
@@ -56,7 +56,7 @@ public class DummySensorTest {
       }
 
       try {
-         boundService = ODKSensorService.Stub.asInterface(srv);
+         boundService = IODKSensorService.Stub.asInterface(srv);
       } catch (IllegalArgumentException e) {
          boundService = null;
       }
@@ -75,12 +75,12 @@ public class DummySensorTest {
    }
 
    @Test public void testBinding() {
-      ODKSensorService serviceInterface = boundService;
+      IODKSensorService serviceInterface = boundService;
       assertNotNull(serviceInterface);
    }
 
    @Test public void testDummyBuiltInSensorExists() {
-      ODKSensorService srv = boundService;
+      IODKSensorService srv = boundService;
       assertNotNull(srv);
 
       try {
@@ -91,7 +91,7 @@ public class DummySensorTest {
    }
 
    @Test public void testDummyInternalSensorConnected() {
-      ODKSensorService srv = boundService;
+      IODKSensorService srv = boundService;
       assertNotNull(srv);
 
       try {
@@ -108,7 +108,7 @@ public class DummySensorTest {
    }
 
    @Test public void testAccelerometerInternalSensorConnected() {
-      ODKSensorService srv = boundService;
+      IODKSensorService srv = boundService;
       assertNotNull(srv);
 
       try {
@@ -126,7 +126,7 @@ public class DummySensorTest {
 
    @Test public void testDummyInternalSensorGetSingleDataPoint() {
 
-      ODKSensorService srv = boundService;
+      IODKSensorService srv = boundService;
       assertNotNull(srv);
 
       try {
@@ -165,7 +165,7 @@ public class DummySensorTest {
 
    @Test public void testDummyInternalSensorGetSingleDataPointVaryingDelaysInGeneration() {
 
-      ODKSensorService srv = boundService;
+      IODKSensorService srv = boundService;
       assertNotNull(srv);
 
       try {

sensorsframework_app/src/main/java/org/opendatakit/sensors/GenericDriverProxy.java

@@ -18,7 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendatakit.sensors.drivers.ODKSensorDriver;
+import org.opendatakit.sensors.drivers.IODKSensorDriver;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -39,7 +39,7 @@ public class GenericDriverProxy implements ServiceConnection, DriverCommunicator
 
 	public static final String TAG = "GenericDriverProxy";
 	private Context componentContext;
-	private ODKSensorDriver sensorDriverProxy;
+	private IODKSensorDriver sensorDriverProxy;
 	private boolean isBoundToService;
 
 	public GenericDriverProxy(String packageName, String className,
@@ -72,7 +72,7 @@ public void shutdown() {
 	@Override
 	public void onServiceConnected(ComponentName className, IBinder service) {
 		Log.d(TAG, "Bound to SensorDriver");
-		sensorDriverProxy = ODKSensorDriver.Stub.asInterface(service);
+		sensorDriverProxy = IODKSensorDriver.Stub.asInterface(service);
 		isBoundToService = true;
 	}
 

sensorsframework_app/src/main/java/org/opendatakit/sensors/manager/WorkerThread.java

@@ -29,7 +29,12 @@
 import org.opendatakit.database.data.ColumnDefinition;
 import org.opendatakit.database.data.ColumnList;
 import org.opendatakit.database.data.OrderedColumns;
-import org.opendatakit.database.service.*;
+import org.opendatakit.database.service.DbHandle;
+import org.opendatakit.database.service.IDbInterface;
+import org.opendatakit.database.service.InternalUserDbInterface;
+import org.opendatakit.database.service.InternalUserDbInterfaceAidlWrapperImpl;
+import org.opendatakit.database.service.UserDbInterface;
+import org.opendatakit.database.service.UserDbInterfaceImpl;
 import org.opendatakit.exception.ServicesAvailabilityException;
 import org.opendatakit.provider.DataTableColumns;
 import org.opendatakit.sensors.DataSeries;
@@ -121,7 +126,7 @@ private void doServiceConnected(ComponentName className, IBinder service) {
 
          try {
             InternalUserDbInterface internalUserDbInterface = new InternalUserDbInterfaceAidlWrapperImpl
-                (AidlDbInterface.Stub.asInterface(service));
+                (IDbInterface.Stub.asInterface(service));
             databaseService = new UserDbInterfaceImpl(internalUserDbInterface);
          } catch (IllegalArgumentException e) {
             databaseService = null;

sensorsframework_app/src/main/java/org/opendatakit/sensors/service/SensorServiceInterface.java

@@ -33,7 +33,7 @@
  * @author [email protected]
  * @author [email protected]
  */
-public class SensorServiceInterface extends ODKSensorService.Stub {
+public class SensorServiceInterface extends IODKSensorService.Stub {
 
    private static final String TAG = SensorServiceInterface.class.getSimpleName();
 

sensorsframework_app/src/test/java/org/opendatakit/sensors/ExampleUnitTest.java

@@ -1,12 +1,15 @@
 package org.opendatakit.sensors;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.junit.Assert.*;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.
  */
+@RunWith(JUnit4.class)
 public class ExampleUnitTest {
    @Test public void addition_isCorrect() throws Exception {
       assertEquals(4, 2 + 2);

settings.gradle

@@ -1,4 +1,4 @@
-gradle.ext.gradleConfigVersion = 107
+gradle.ext.gradleConfigVersion = 112
 
 if (!gradle.ext.has('workspacePath')) {
     def env = System.getProperties();