Moved synchronization to its own module

1 files changed, 14 insertions, 12 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
index 9b3422a5d..f1d71b07a 100644
--- a/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
@@ -6,10 +6,10 @@ import java.util.List;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
-import de.danoeh.antennapod.core.sync.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.core.sync.gpoddernet.GpodnetServiceException;
-import de.danoeh.antennapod.core.sync.gpoddernet.model.GpodnetDevice;
-import de.danoeh.antennapod.core.sync.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.net.sync.gpoddernet.model.GpodnetDevice;
+import de.danoeh.antennapod.net.sync.gpoddernet.model.GpodnetTag;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -28,14 +28,16 @@ public class GPodnetServiceTest {
 
     private static final String USER = "";
     private static final String PW = "";
+    private static final String DEVICE_ID = "radio";
 
     @Before
     public void setUp() {
-        service = new GpodnetService(AntennapodHttpClient.getHttpClient(), GpodnetService.DEFAULT_BASE_HOST);
+        service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
+                GpodnetService.DEFAULT_BASE_HOST, DEVICE_ID, USER, PW);
     }
 
     private void authenticate() throws GpodnetServiceException {
-        service.authenticate(USER, PW);
+        service.login();
     }
 
     @Test
@@ -43,7 +45,7 @@ public class GPodnetServiceTest {
         authenticate();
         ArrayList<String> l = new ArrayList<>();
         l.add("http://bitsundso.de/feed");
-        service.uploadSubscriptions("radio", l);
+        service.uploadSubscriptions(DEVICE_ID, l);
     }
 
     @Test
@@ -52,7 +54,7 @@ public class GPodnetServiceTest {
         ArrayList<String> l = new ArrayList<>();
         l.add("http://bitsundso.de/feed");
         l.add("http://gamesundso.de/feed");
-        service.uploadSubscriptions("radio", l);
+        service.uploadSubscriptions(DEVICE_ID, l);
     }
 
     @Test
@@ -62,14 +64,14 @@ public class GPodnetServiceTest {
         List<String> subscriptions = Arrays.asList(URLS[0], URLS[1]);
         List<String> removed = singletonList(URLS[0]);
         List<String> added = Arrays.asList(URLS[2], URLS[3]);
-        service.uploadSubscriptions("radio", subscriptions);
-        service.uploadChanges("radio", added, removed);
+        service.uploadSubscriptions(DEVICE_ID, subscriptions);
+        service.uploadSubscriptionChanges(added, removed);
     }
 
     @Test
     public void testGetSubscriptionChanges() throws GpodnetServiceException {
         authenticate();
-        service.getSubscriptionChanges("radio", 1362322610L);
+        service.getSubscriptionChanges(1362322610L);
     }
 
     @Test
@@ -83,7 +85,7 @@ public class GPodnetServiceTest {
     public void testGetSubscriptionsOfDevice()
             throws GpodnetServiceException {
         authenticate();
-        service.getSubscriptionsOfDevice("radio");
+        service.getSubscriptionsOfDevice(DEVICE_ID);
     }
 
     @Test