You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/03/16 10:06:04 UTC
[15/50] [abbrv] git commit: [OLINGO-117] fix failing delta JSON fit
test
[OLINGO-117] fix failing delta JSON fit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/16106f60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/16106f60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/16106f60
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 16106f603ea978336d937ce73f09d629612a435c
Parents: 5b4a459
Author: Stephan Klevenz <sk...@apache.org>
Authored: Mon Feb 10 15:01:12 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Feb 10 15:01:12 2014 +0100
----------------------------------------------------------------------
.../ep/producer/JsonDeletedEntryEntityProducer.java | 2 +-
.../producer/JsonFeedWithDeltaLinkProducerTest.java | 4 ++++
.../odata2/fit/client/ClientDeltaResponseTest.java | 14 ++++++++------
.../apache/olingo/odata2/fit/client/util/Client.java | 1 +
4 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/16106f60/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
index 872159f..23f72bc 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
@@ -58,7 +58,7 @@ public class JsonDeletedEntryEntityProducer {
jsonStreamWriter.namedStringValue(FormatJson.ID, idValue);
jsonStreamWriter.endObject();
- if (counter < deletedEntries.size()) {
+ if (counter < deletedEntries.size() - 1) {
jsonStreamWriter.separator();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/16106f60/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
index 97063e6..cf035ae 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
@@ -112,6 +112,7 @@ public class JsonFeedWithDeltaLinkProducerTest extends BaseTest {
final String json = writeRoomData(entitySet, tombstoneCallback);
assertDeletedEntries(json);
+ assertTrue("Somthing wrong with closing brakets after deleted entries!", json.endsWith("}]}}"));
}
@Test
@@ -140,6 +141,9 @@ public class JsonFeedWithDeltaLinkProducerTest extends BaseTest {
assertTrue("Delta Link missing or wrong!", json
.contains("__delta\":\"http://host:80/service/Rooms?!deltatoken=1234"));
assertDeletedEntries(json);
+
+ assertTrue("Somthing wrong with closing brakets after deleted entries!", json.contains("}],\"__delta"));
+
}
private void assertDeletedEntries(final String json) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/16106f60/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
index c3ab652..d91aa24 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.fit.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -50,7 +50,6 @@ import org.apache.olingo.odata2.fit.client.util.Client;
import org.apache.olingo.odata2.ref.edm.ScenarioEdmProvider;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class ClientDeltaResponseTest extends AbstractFitTest {
@@ -116,7 +115,7 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
response = EntityProvider.writeFeed(contentType, uriInfo.getTargetEntitySet(), createRoomData(), properties);
return response;
- } catch (URISyntaxException e) {
+ } catch (Exception e) {
throw new ODataRuntimeException(e);
}
@@ -195,7 +194,12 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
for (int i = 0; i < deletedRoomDataCount; i++) {
assertEquals("http://localhost:19000/abc/ClientDeltaResponseTest/Rooms('" + (roomDataCount + i + 1) + "')",
deletedEntries.get(i).getUri());
- assertNotNull(deletedEntries.get(i).getWhen());
+
+ if ("application/json".equals(contentType)) {
+ assertNull(deletedEntries.get(i).getWhen());
+ } else {
+ assertNotNull(deletedEntries.get(i).getWhen());
+ }
}
}
@@ -227,7 +231,6 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
}
@Test
- @Ignore
public void testFeedWithDeltaLinkJson() throws Exception {
testDeltaFeedWithDeltaLink("application/json");
}
@@ -238,7 +241,6 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
}
@Test
- @Ignore
public void testFeedWithZeroEntriesJson() throws Exception {
testDeltaFeedWithZeroEntries("application/json");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/16106f60/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
index dfe27fe..8238926 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
@@ -189,6 +189,7 @@ public class Client {
EdmEntityContainer entityContainer = edm.getEntityContainer(entityContainerName);
InputStream content = (InputStream) connect(deltaLink, contentType, "GET").getContent();
+
return EntityProvider.readDeltaFeed(contentType, entityContainer.getEntitySet(entitySetName), content,
EntityProviderReadProperties.init().build());
}