You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/16 21:06:34 UTC

[17/21] curator git commit: wip for fixing tests

wip for fixing tests


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/74013456
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/74013456
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/74013456

Branch: refs/heads/CURATOR-419
Commit: 74013456da1260f9155a72fa651d5d6fa449d984
Parents: 123f2ec
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 16 14:21:23 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 16 14:21:23 2017 -0500

----------------------------------------------------------------------
 .../org/apache/curator/x/async/TestBasicOperations.java   | 10 ++++++++++
 .../curator/x/async/modeled/TestModeledFramework.java     |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/74013456/curator-x-async/src/test/java/org/apache/curator/x/async/TestBasicOperations.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/TestBasicOperations.java b/curator-x-async/src/test/java/org/apache/curator/x/async/TestBasicOperations.java
index 3e980ec..12d3014 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/TestBasicOperations.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/TestBasicOperations.java
@@ -189,4 +189,14 @@ public class TestBasicOperations extends CompletableBaseClassForTests
             Assert.assertEquals(v.getCode(), KeeperException.Code.CONNECTIONLOSS);
         });
     }
+
+    @Test
+    public void testGetDataWithStat()
+    {
+        complete(client.create().forPath("/test"));
+
+        Stat stat = new Stat();
+        complete(client.getData().storingStatIn(stat).forPath("/test"));
+        Assert.assertEquals(stat.getVersion(), 1);
+    }
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/74013456/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java
index 42a9e63..53eb517 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java
@@ -102,10 +102,10 @@ public class TestModeledFramework extends TestModeledFrameworkBase
     @Test
     public void testBadNode()
     {
-        complete(async.create().forPath(modelSpec.path().fullPath(), "fubar".getBytes()));
+        complete(async.create().forPath(modelSpec.path().fullPath(), "fubar".getBytes()), (v, e) -> {});    // ignore error
 
         ModeledFramework<TestModel> client = ModeledFramework.builder(async, modelSpec).watched().build();
-        complete(client.read().whenComplete((model, e) -> Assert.assertTrue(e instanceof RuntimeException)));
+        complete(client.read(), (model, e) -> Assert.assertTrue(e instanceof KeeperException.NoNodeException));
     }
 
     @Test
@@ -138,13 +138,13 @@ public class TestModeledFramework extends TestModeledFrameworkBase
     public void testVersioned()
     {
         ModeledFramework<TestModel> client = ModeledFramework.wrap(async, modelSpec);
-        client.set(new TestModel("John", "Galt", "Galt's Gulch", 21, BigInteger.valueOf(1010101)));
+        complete(client.set(new TestModel("John", "Galt", "Galt's Gulch", 21, BigInteger.valueOf(1010101))));
 
         VersionedModeledFramework<TestModel> versioned = client.versioned();
         complete(versioned.read().whenComplete((v, e) -> {
             Assert.assertNull(e);
             Assert.assertTrue(v.version() > 0);
-        }).thenCompose(versioned::set).whenComplete((s, e) -> Assert.assertNull(e))); // version is correct should succeed
+        }).thenCompose(versioned::set), (s, e) -> Assert.assertNull(e)); // version is correct should succeed
 
         complete(versioned.read().whenComplete((v, e) -> {
             Assert.assertNull(e);