[OLINGO-260] provided primitive keys integration test for proxy and pojogen
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/620f4e99 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/620f4e99 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/620f4e99 Branch: refs/heads/master Commit: 620f4e99ba743bb01ad350612dd29e61e2be6ab5 Parents: 9eae6cb Author: fmartelli <[email protected]> Authored: Wed May 14 12:07:44 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Mon May 19 14:33:28 2014 +0200 ---------------------------------------------------------------------- .../apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java | 9 +++------ .../odata/services/primitivekeysservice/TestContext.java | 4 +--- pom.xml | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/620f4e99/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java index f0a4912..ed33ef7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals; import java.math.BigDecimal; import java.util.UUID; -import org.apache.olingo.client.api.v3.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.TestContext; @@ -46,11 +45,9 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase { @Test public void readPrimitiveKeys() { - final EntityContainerFactory<EdmEnabledODataClient> testContainerFactory = - EntityContainerFactory.getV3(testPrimitiveKeysServiceRootURL); - testContainerFactory.getClient().getConfiguration(). - setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); - final TestContext testContainer = testContainerFactory.getEntityContainer(TestContext.class); + containerFactory = EntityContainerFactory.getV3(testPrimitiveKeysServiceRootURL); + containerFactory.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); + final TestContext testContainer = containerFactory.getEntityContainer(TestContext.class); assertNotNull(testContainer); final EdmBoolean edmBooleanSet = testContainer.getEdmBooleanSet().get(Boolean.TRUE); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/620f4e99/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java index 5e9ef59..3ed7588 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java @@ -24,7 +24,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace; import org.apache.olingo.ext.proxy.api.annotations.EntityContainer; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.Container; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; @@ -91,5 +90,4 @@ public interface TestContext extends Container { public interface Operations { } - - } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/620f4e99/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1eeb196..0cfa9ba 100644 --- a/pom.xml +++ b/pom.xml @@ -415,7 +415,7 @@ <failOnViolation>true</failOnViolation> <violationSeverity>warning</violationSeverity> <!-- fit autogenerated (via pojogen plugin) resources --> - <excludes>**/fit/proxy/v4/staticservice/**/*.java, **/fit/proxy/v3/staticservice/**/*.java, **/fit/proxy/v3/actionoverloading/**/*.java</excludes> + <excludes>**/fit/proxy/v4/staticservice/**/*.java, **/fit/proxy/v3/staticservice/**/*.java, **/fit/proxy/v3/actionoverloading/**/*.java, **/fit/proxy/v3/primitivekeys/**/*.java</excludes> </configuration> </plugin> <plugin>
