Repository: camel Updated Branches: refs/heads/master 55223cf81 -> aa87d4622
fix olingo2's sporadic test error caused by non-determinism Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa87d462 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa87d462 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa87d462 Branch: refs/heads/master Commit: aa87d46227ace447a5db6388d6a35d7978241c14 Parents: 55223cf Author: Akitoshi Yoshida <a...@apache.org> Authored: Wed Nov 11 14:47:00 2015 +0100 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Wed Nov 11 14:47:45 2015 +0100 ---------------------------------------------------------------------- .../camel/component/olingo2/Olingo2AppAPITest.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/aa87d462/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java ---------------------------------------------------------------------- diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java index 3d1bdd2..2dd6ca4 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java +++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPITest.java @@ -41,6 +41,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.http.entity.ContentType; import org.apache.olingo.odata2.api.commons.HttpStatusCodes; import org.apache.olingo.odata2.api.edm.Edm; +import org.apache.olingo.odata2.api.edm.EdmEntitySet; import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo; import org.apache.olingo.odata2.api.ep.EntityProvider; import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties; @@ -104,6 +105,7 @@ public class Olingo2AppAPITest { private static Olingo2App olingoApp; private static Edm edm; + private static Map<String, EdmEntitySet> edmEntitySetMap; private static Olingo2SampleServer server; @@ -142,6 +144,11 @@ public class Olingo2AppAPITest { edm = responseHandler.await(); LOG.info("Read default EntityContainer: {}", responseHandler.await().getDefaultEntityContainer().getName()); + edmEntitySetMap = new HashMap<String, EdmEntitySet>(); + for (EdmEntitySet ees : edm.getEntitySets()) { + edmEntitySetMap.put(ees.getName(), ees); + } + // wait for generated data to be registered in server Thread.sleep(2000); } @@ -183,7 +190,7 @@ public class Olingo2AppAPITest { final InputStream rawfeed = responseHandler.await(); assertNotNull("Data feed", rawfeed); // for this test, we just let EP to verify the stream data - final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, edm.getEntitySets().get(2), + final ODataFeed dataFeed = EntityProvider.readFeed(TEST_FORMAT_STRING, edmEntitySetMap.get(MANUFACTURERS), rawfeed, EntityProviderReadProperties.init().build()); LOG.info("Entries: {}", prettyPrint(dataFeed)); } @@ -218,7 +225,7 @@ public class Olingo2AppAPITest { olingoApp.uread(edm, TEST_MANUFACTURER, null, responseHandler); InputStream rawentry = responseHandler.await(); - ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, edm.getEntitySets().get(2), + ODataEntry entry = EntityProvider.readEntry(TEST_FORMAT_STRING, edmEntitySetMap.get(MANUFACTURERS), rawentry, EntityProviderReadProperties.init().build()); LOG.info("Single Entry: {}", prettyPrint(entry)); @@ -226,7 +233,7 @@ public class Olingo2AppAPITest { olingoApp.uread(edm, TEST_CAR, null, responseHandler); rawentry = responseHandler.await(); - entry = EntityProvider.readEntry(TEST_FORMAT_STRING, edm.getEntitySets().get(0), + entry = EntityProvider.readEntry(TEST_FORMAT_STRING, edmEntitySetMap.get(CARS), rawentry, EntityProviderReadProperties.init().build()); LOG.info("Single Entry: {}", prettyPrint(entry)); @@ -237,7 +244,7 @@ public class Olingo2AppAPITest { olingoApp.uread(edm, TEST_MANUFACTURER, queryParams, responseHandler); rawentry = responseHandler.await(); - ODataEntry entryExpanded = EntityProvider.readEntry(TEST_FORMAT_STRING, edm.getEntitySets().get(2), + ODataEntry entryExpanded = EntityProvider.readEntry(TEST_FORMAT_STRING, edmEntitySetMap.get(MANUFACTURERS), rawentry, EntityProviderReadProperties.init().build()); LOG.info("Single Entry with expanded Cars relation: {}", prettyPrint(entryExpanded)); }
