MERGE.

3 files changed, 65 insertions, 17 deletions

diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
new file mode 100644
index 000000000..3e020b363
--- /dev/null
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
@@ -0,0 +1,23 @@
+package com.twine.tango.unittesting;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Created by Roy on 12/19/2017.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class DAL_TST
+{
+    @Test
+    public void perform_basic_dal_test()
+    {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+    }
+}
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java
new file mode 100644
index 000000000..fc1758781
--- /dev/null
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java
@@ -0,0 +1,27 @@
+package com.twine.tango.unittesting;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.twine.tango.nativebridge.ColorLibAdapter;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Created by Roy on 12/21/2017.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class NativeBridge_TST
+{
+    @Test
+    public void calculate_using_protobuf()
+    {
+        ColorLibAdapter adapter = new ColorLibAdapter();
+        double a = adapter.calculateProto(10,5);
+        Assert.assertEquals(a,15,0);
+    }
+}
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
index b162c2215..4635bec7a 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
@@ -5,13 +5,11 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
 import com.elvishew.xlog.XLog;
-import com.twine.tango.dal.TangoDB;
 import com.twine.tango.dal.dao.TangoDAO;
 import com.twine.tango.dal.entities.Organization;
-import com.twine.tango.integration.MachineIdentityProvider;
-import com.twine.tango.synchronization.ITangoSynchronizer;
-import com.twine.tango.synchronization.TangoSynchronizer;
-import com.twine.tango.web.WebApiFactory;
+import com.twine.tango.integration.providers.MachineIdentityProvider;
+import com.twine.tango.integration.services.ISynchronizationService;
+import com.twine.tango.integration.services.SynchronizationService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,18 +36,18 @@ public class Synchronization_TST
             XLog.i(org.getName());
         }
         
-        ITangoSynchronizer synchronizer = new TangoSynchronizer(new MachineIdentityProvider());
+        //ISynchronizationService synchronizer = new SynchronizationService(new MachineIdentityProvider());
         
-        synchronizer.synchronizeDB().subscribe(() ->
-        {
-            for (Organization org : TangoDAO.getAllOrganizations())
-            {
-                XLog.i(org.getName());
-            }
-        
-        }, (ex) ->
-        {
-            ex.printStackTrace();
-        });
+//        synchronizer.synchronizeDB().subscribe(() ->
+//        {
+//            for (Organization org : TangoDAO.getAllOrganizations())
+//            {
+//                XLog.i(org.getName());
+//            }
+//
+//        }, (ex) ->
+//        {
+//            ex.printStackTrace();
+//        });
     }
 }