Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

2 files changed, 47 insertions, 2 deletions

diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java
new file mode 100644
index 000000000..2f02ef972
--- /dev/null
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java
@@ -0,0 +1,45 @@
+package com.twine.tango.unittesting;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.twine.tango.logging.FileLogger;
+import com.twine.tango.logging.LogCatLogger;
+import com.twine.tango.logging.LogCategory;
+import com.twine.tango.logging.LogManager;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Created by Roy on 3/18/2018.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class Logging_TST
+{
+    @Test
+    public void register_and_log_using_log_Cat()
+    {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+    
+        LogManager logManager = LogManager.getDefault();
+        
+        logManager.log("This is a general log message.");
+        logManager.log("This is a critical log message", LogCategory.Critical);
+        
+        while  (logManager.getHasLogsPending())
+        {
+            try
+            {
+                Thread.sleep(5000);
+            }
+            catch (InterruptedException e)
+            {
+                e.printStackTrace();
+            }
+        }
+    }
+}
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 4635bec7a..d7fef49bc 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
@@ -4,12 +4,12 @@ import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.elvishew.xlog.XLog;
 import com.twine.tango.dal.dao.TangoDAO;
 import com.twine.tango.dal.entities.Organization;
 import com.twine.tango.integration.providers.MachineIdentityProvider;
 import com.twine.tango.integration.services.ISynchronizationService;
 import com.twine.tango.integration.services.SynchronizationService;
+import com.twine.tango.logging.LogManager;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,7 +33,7 @@ public class Synchronization_TST
        
         for (Organization org : TangoDAO.getAllOrganizations())
         {
-            XLog.i(org.getName());
+            LogManager.getDefault().log(org.getName());
         }
         
         //ISynchronizationService synchronizer = new SynchronizationService(new MachineIdentityProvider());