diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml index f5ef0c2f18..98bbffca52 100644 --- a/zanata-war/pom.xml +++ b/zanata-war/pom.xml @@ -1138,26 +1138,30 @@ org.zanata - zanata-api-compat - 1.0.0 + zanata-api-1.4.4 + 1.3-SNAPSHOT test - v1.4.4 - org.zanata - zanata-api-compat - 1.0.0 - test - v1.3 + org.zanata + zanata-api-1.3 + 1.3-SNAPSHOT + test org.zanata - zanata-api-compat - 1.1 + zanata-api-1.5.0 + 1.3-SNAPSHOT + test + + + + org.zanata + zanata-api-2.3.0 + 1.3-SNAPSHOT test - v1.5.0 diff --git a/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java b/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java index f189f17046..cd25d47656 100644 --- a/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java +++ b/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java @@ -83,7 +83,7 @@ public void postResource() throws Exception ITranslationResources translationsClient = super.createProxy( createClientProxyFactory(ADMIN, ADMIN_KEY), ITranslationResources.class, "/projects/p/sample-project/iterations/i/1.0/r/"); - ClientResponse response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID)); + ClientResponse response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID), true); assertThat( response.getStatus(), is(Status.CREATED.getStatusCode()) ); // 201 response.releaseConnection(); @@ -130,13 +130,13 @@ public void doublePostResource() throws Exception // Post once ITranslationResources translationsClient = super.createProxy( createClientProxyFactory(ADMIN, ADMIN_KEY), ITranslationResources.class, "/projects/p/sample-project/iterations/i/1.0/r/"); - ClientResponse response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID)); + ClientResponse response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID), true); assertThat( response.getStatus(), is(Status.CREATED.getStatusCode()) ); // 201 response.releaseConnection(); // Post Twice (should conflict) - response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID)); + response = translationsClient.post(res, new StringSet(PoHeader.ID + ";" + SimpleComment.ID), true); assertThat(response.getStatus(), is(Status.CONFLICT.getStatusCode())); // 409 response.releaseConnection(); diff --git a/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java b/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java index 79e651a97e..ac4d4568a0 100644 --- a/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java +++ b/zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java @@ -23,7 +23,7 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.junit.Test; import org.zanata.RestTest; -import org.zanata.v1_5_0.rest.client.IVersion; +import org.zanata.v1_5_0.rest.client.IVersionResource; import org.zanata.v1_5_0.rest.dto.VersionInfo; import static org.hamcrest.MatcherAssert.assertThat; @@ -41,9 +41,9 @@ protected void prepareDBUnitOperations() @RunAsClient public void getVersionXml() { - IVersion versionClient = super.createProxy(createClientProxyFactory(TRANSLATOR, TRANSLATOR_KEY), - IVersion.class, "/version"); - VersionInfo versionInfo = versionClient.get(); + IVersionResource versionClient = super.createProxy(createClientProxyFactory(TRANSLATOR, TRANSLATOR_KEY), + IVersionResource.class, "/version"); + VersionInfo versionInfo = versionClient.get().getEntity(); assertThat( versionInfo.getVersionNo(), notNullValue() ); assertThat( versionInfo.getBuildTimeStamp(), notNullValue() );