You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/01/24 09:22:34 UTC
git commit: [OLINGO-117] refactor unit tests
Updated Branches:
refs/heads/olingo-117 674f0fa74 -> 567103a5e
[OLINGO-117] refactor unit tests
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/567103a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/567103a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/567103a5
Branch: refs/heads/olingo-117
Commit: 567103a5ecc17bf309b590bc772704fc5772239e
Parents: 674f0fa
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri Jan 24 09:21:59 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri Jan 24 09:21:59 2014 +0100
----------------------------------------------------------------------
.../fit/client/ClientDeltaResponseTest.java | 33 ++++++++++++--------
1 file changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/567103a5/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 909ce19..1b939be 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
@@ -57,6 +57,9 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
private static final String DELTATOKEN_1234 = "!deltatoken=1234";
+ private static int roomDataCount = 2;
+ private static int deletedRoomDataCount = 2;
+
private Client client;
StubProcessor processor;
@@ -81,9 +84,6 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
private class StubProcessor extends ODataSingleProcessor {
- private int roomDataCount = 2;
- private int deletedRoomDataCount = 2;
-
@Override
public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType)
throws ODataException {
@@ -172,47 +172,54 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
}
private void testDeltaFeedWithDeltaLink(final String contentType) throws Exception {
+ roomDataCount = 3;
+ deletedRoomDataCount = 4;
+
ODataFeed feed = client.readFeed("Container1", "Rooms", contentType);
String deltaLink = feed.getFeedMetadata().getDeltaLink();
assertNotNull(feed);
- assertEquals(2, feed.getEntries().size());
+ assertEquals(roomDataCount, feed.getEntries().size());
assertEquals(getEndpoint().toASCIIString() + "Rooms?" + DELTATOKEN_1234, feed.getFeedMetadata().getDeltaLink());
ODataDeltaFeed deltaFeed = client.readDeltaFeed("Container1", "Rooms", contentType, deltaLink);
assertNotNull(deltaFeed);
- assertEquals(2, deltaFeed.getEntries().size());
+ assertEquals(roomDataCount, deltaFeed.getEntries().size());
assertEquals(deltaLink, deltaFeed.getFeedMetadata().getDeltaLink());
List<DeletedEntryMetadata> deletedEntries = deltaFeed.getDeletedEntries();
assertNotNull(deletedEntries);
- assertEquals(2, deletedEntries.size());
+ assertEquals(deletedRoomDataCount, deletedEntries.size());
- assertEquals("http://localhost:19000/abc/ClientDeltaResponseTest/Rooms('3')", deletedEntries.get(0).getUri());
- assertEquals("http://localhost:19000/abc/ClientDeltaResponseTest/Rooms('4')", deletedEntries.get(1).getUri());
+ 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());
+ }
}
private void testDeltaFeedWithZeroEntries(final String contentType) throws Exception {
- processor.roomDataCount = 0;
- processor.deletedRoomDataCount = 0;
+ roomDataCount = 0;
+ deletedRoomDataCount = 0;
ODataFeed feed = client.readFeed("Container1", "Rooms", contentType);
String deltaLink = feed.getFeedMetadata().getDeltaLink();
assertNotNull(feed);
- assertEquals(0, feed.getEntries().size());
+ assertEquals(roomDataCount, feed.getEntries().size());
assertEquals(getEndpoint().toASCIIString() + "Rooms?" + DELTATOKEN_1234, feed.getFeedMetadata().getDeltaLink());
ODataDeltaFeed deltaFeed = client.readDeltaFeed("Container1", "Rooms", contentType, deltaLink);
assertNotNull(deltaFeed);
- assertEquals(0, deltaFeed.getEntries().size());
+ assertEquals(roomDataCount, deltaFeed.getEntries().size());
assertEquals(deltaLink, deltaFeed.getFeedMetadata().getDeltaLink());
List<DeletedEntryMetadata> deletedEntries = deltaFeed.getDeletedEntries();
assertNotNull(deletedEntries);
- assertEquals(0, deletedEntries.size());
+ assertEquals(deletedRoomDataCount, deletedEntries.size());
}
@Test