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 2015/08/14 07:53:07 UTC

olingo-odata4 git commit: [OLINGO-659] Fixed test for two level expand

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 41f8ca2bb -> 99ff44e55


[OLINGO-659] Fixed test for two level expand


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/99ff44e5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/99ff44e5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/99ff44e5

Branch: refs/heads/master
Commit: 99ff44e554a8d6306f51d5ba8506d5e339456a2f
Parents: 41f8ca2
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Aug 14 07:46:21 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Aug 14 07:46:21 2015 +0200

----------------------------------------------------------------------
 .../server/core/serializer/xml/ODataXmlSerializerTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/99ff44e5/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
index 50d432c..9f9ab66 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
@@ -1840,8 +1840,8 @@ public class ODataXmlSerializerTest {
 
     @Override
     public int differenceFound(Difference difference) {
-      final String xpath = "/entry[1]/updated[1]/text()[1]";
-      if(difference.getControlNodeDetail().getXpathLocation().equals(xpath)) {
+      final String xpath = "/updated[1]/text()[1]";
+      if(difference.getControlNodeDetail().getXpathLocation().endsWith(xpath)) {
         String controlValue = difference.getControlNodeDetail().getValue();
         String testValue = difference.getTestNodeDetail().getValue();
         // allow a difference from two seconds