update cda sdk version

Author: Mario Bodemann

CHANGELOG.md

@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Version [3.2.1] - 2018-05-28
 - Fix: ignore empty asset fields
+- Update: Contentful CDA SDK to version 10.1.0.
 
 ## Version [3.2.0] - 2018-04-24
 - Change: use https for asset urls.

pom.xml

@@ -49,7 +49,7 @@
 
     <android.platform>19</android.platform>
     <android.version>4.1.1.4</android.version>
-    <cda.version>10.0.0</cda.version>
+    <cda.version>10.1.0</cda.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-io.version>2.5</commons-io.version>
     <commons-lang3.version>3.4</commons-lang3.version>

tests-integration/src/test/java/com/contentful/vaultintegration/EnvironmentSyncTest.java

@@ -17,7 +17,7 @@
 import static com.contentful.vault.BaseFields.REMOTE_ID;
 import static com.google.common.truth.Truth.assertThat;
 
-@Ignore
+@Ignore("Do not test the base test class.")
 public class SyncBase extends BaseTest {
 
   @Override protected void setupVault() {
@@ -41,14 +41,14 @@ protected void assertRequestUpdate() throws InterruptedException {
     server.takeRequest();
     server.takeRequest();
     RecordedRequest request = server.takeRequest();
-    assertThat(request.getPath()).isEqualTo("/spaces/space/sync?sync_token=st1");
+    assertThat(request.getPath()).isEqualTo("/spaces/space/environments/master/sync?sync_token=st1");
   }
 
   protected void assertRequestInitial() throws InterruptedException {
     server.takeRequest();
     server.takeRequest();
     RecordedRequest request = server.takeRequest();
-    assertThat(request.getPath()).isEqualTo("/spaces/space/sync?initial=true");
+    assertThat(request.getPath()).isEqualTo("/spaces/space/environments/master/sync?initial=true");
   }
 
   protected void enqueueInitial() throws IOException {

tests-integration/src/test/java/com/contentful/vaultintegration/SyncBase.java

@@ -16,6 +16,7 @@
 
 package com.contentful.vaultintegration;
 
+import com.contentful.java.cda.CDAClient;
 import com.contentful.vault.Asset;
 import com.contentful.vault.SyncConfig;
 
@@ -39,7 +40,7 @@ public class SyncTest extends SyncBase {
     server.takeRequest();
     server.takeRequest();
     RecordedRequest request = server.takeRequest();
-    assertThat(request.getPath()).isEqualTo("/spaces/space/sync?initial=true");
+    assertThat(request.getPath()).isEqualTo("/spaces/space/environments/master/sync?initial=true");
   }
 
   @Test public void testAssetsInDraft() throws Exception {
@@ -51,7 +52,7 @@ public class SyncTest extends SyncBase {
     server.takeRequest(); // ignore locales request
     server.takeRequest(); // ignore content types request
     RecordedRequest request = server.takeRequest(); // analyse empty asset response
-    assertThat(request.getPath()).isEqualTo("/spaces/space/sync?initial=true");
+    assertThat(request.getPath()).isEqualTo("/spaces/space/environments/master/sync?initial=true");
 
 
     List<Asset> assets = vault.fetch(Asset.class).all();
@@ -115,4 +116,31 @@ public class SyncTest extends SyncBase {
     assertThat(assets.get(3).description()).isEqualTo("nice picture");
     assertThat(assets.get(3).file()).hasSize(4);
   }
+
+  @Test
+  public void syncingOnEnvironmentsWorks() throws Throwable {
+    enqueue("assets/locales.json");
+    enqueue("assets/types.json");
+    enqueue("assets/initial.json");
+
+    final CDAClient localClient = CDAClient.builder()
+        .setSpace("space")
+        .setToken("token")
+        .setEnvironment("environment")
+        .setEndpoint(getServerUrl()) // only used for testing: leave blank if not white labeling
+        .build();
+
+    final SyncConfig config = new SyncConfig.Builder().setClient(localClient).build();
+
+    sync(config);
+
+    RecordedRequest request = server.takeRequest();
+    assertThat(request.getPath()).startsWith("/spaces/space/environments/environment/locales");
+
+    request = server.takeRequest();
+    assertThat(request.getPath()).startsWith("/spaces/space/environments/environment/content_types");
+
+    request = server.takeRequest();
+    assertThat(request.getPath()).startsWith("/spaces/space/environments/environment/sync");
+  }
 }