aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-03-18 18:11:20 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-03-18 18:11:20 +0200
commit4f4b5f052200fde6ccc6aa06094904cf9bf3106b (patch)
tree7c9b06eeeb747ecafb0b865611886ae8ab314999 /Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com
parenta21d0758fd56a76d934a036a3bfeacea8984ee85 (diff)
downloadTango-4f4b5f052200fde6ccc6aa06094904cf9bf3106b.tar.gz
Tango-4f4b5f052200fde6ccc6aa06094904cf9bf3106b.zip
Refactored android project to use the new logging library.
Implemented continuous request timeout on android.
Diffstat (limited to 'Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com')
-rw-r--r--Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java3
-rw-r--r--Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java4
2 files changed, 2 insertions, 5 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
index a1baa6f67..2f02ef972 100644
--- 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
@@ -27,9 +27,6 @@ public class Logging_TST
LogManager logManager = LogManager.getDefault();
- logManager.registerLogger(new LogCatLogger());
- logManager.registerLogger(new FileLogger(appContext));
-
logManager.log("This is a general log message.");
logManager.log("This is a critical log message", LogCategory.Critical);
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());