Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9789D18E86 for ; Tue, 12 May 2015 21:04:26 +0000 (UTC) Received: (qmail 92477 invoked by uid 500); 12 May 2015 21:04:26 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 92445 invoked by uid 500); 12 May 2015 21:04:26 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 92427 invoked by uid 99); 12 May 2015 21:04:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 21:04:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E3A7E0329; Tue, 12 May 2015 21:04:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Message-Id: <12f92a425d664b7cbb0534118e8fba08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: curator git commit: TestCompressionInTransactionNew Date: Tue, 12 May 2015 21:04:26 +0000 (UTC) Repository: curator Updated Branches: refs/heads/CURATOR-215 854c0b5df -> 72555faca TestCompressionInTransactionNew Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/72555fac Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/72555fac Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/72555fac Branch: refs/heads/CURATOR-215 Commit: 72555facabfc574c5a90c951f923fdf8752e98e3 Parents: 854c0b5 Author: randgalt Authored: Tue May 12 16:04:16 2015 -0500 Committer: randgalt Committed: Tue May 12 16:04:16 2015 -0500 ---------------------------------------------------------------------- .../imps/TestCompressionInTransaction.java | 157 ------------------ .../imps/TestCompressionInTransactionNew.java | 162 +++++++++++++++++++ .../imps/TestCompressionInTransactionOld.java | 158 ++++++++++++++++++ 3 files changed, 320 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/72555fac/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransaction.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransaction.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransaction.java deleted file mode 100644 index c18af99..0000000 --- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransaction.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.curator.framework.imps; - -import org.apache.curator.test.BaseClassForTests; -import org.apache.curator.utils.CloseableUtils; -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.framework.api.CompressionProvider; -import org.apache.curator.retry.RetryOneTime; -import org.testng.Assert; -import org.testng.annotations.Test; - -import java.util.concurrent.atomic.AtomicInteger; - -public class TestCompressionInTransaction extends BaseClassForTests -{ - @Test - public void testSetData() throws Exception - { - final String path = "/a"; - final byte[] data = "here's a string".getBytes(); - - CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); - try - { - client.start(); - - //Create uncompressed data in a transaction - client.inTransaction().create().forPath(path, data).and().commit(); - Assert.assertEquals(data, client.getData().forPath(path)); - - //Create compressed data in transaction - client.inTransaction().setData().compressed().forPath(path, data).and().commit(); - Assert.assertEquals(data, client.getData().decompressed().forPath(path)); - } - finally - { - CloseableUtils.closeQuietly(client); - } - } - - @Test - public void testSetCompressedAndUncompressed() throws Exception - { - final String path1 = "/a"; - final String path2 = "/b"; - - final byte[] data1 = "here's a string".getBytes(); - final byte[] data2 = "here's another string".getBytes(); - - CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); - try - { - client.start(); - - //Create the nodes - client.inTransaction().create().compressed().forPath(path1).and(). - create().forPath(path2).and().commit(); - - //Check they exist - Assert.assertNotNull(client.checkExists().forPath(path1)); - Assert.assertNotNull(client.checkExists().forPath(path2)); - - //Set the nodes, path1 compressed, path2 uncompressed. - client.inTransaction().setData().compressed().forPath(path1, data1).and(). - setData().forPath(path2, data2).and().commit(); - - Assert.assertNotEquals(data1, client.getData().forPath(path1)); - Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); - - Assert.assertEquals(data2, client.getData().forPath(path2)); - } - finally - { - CloseableUtils.closeQuietly(client); - } - } - - @Test - public void testSimple() throws Exception - { - final String path1 = "/a"; - final String path2 = "/a/b"; - - final byte[] data1 = "here's a string".getBytes(); - final byte[] data2 = "here's another string".getBytes(); - - CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); - try - { - client.start(); - - client.inTransaction().create().compressed().forPath(path1, data1).and(). - create().compressed().forPath(path2, data2).and().commit(); - - Assert.assertNotEquals(data1, client.getData().forPath(path1)); - Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); - - Assert.assertNotEquals(data2, client.getData().forPath(path2)); - Assert.assertEquals(data2, client.getData().decompressed().forPath(path2)); - } - finally - { - CloseableUtils.closeQuietly(client); - } - } - - /** - * Test the case where both uncompressed and compressed data is generated in - * the same transaction - * @throws Exception - */ - @Test - public void testCreateCompressedAndUncompressed() throws Exception - { - final String path1 = "/a"; - final String path2 = "/b"; - - final byte[] data1 = "here's a string".getBytes(); - final byte[] data2 = "here's another string".getBytes(); - - CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); - try - { - client.start(); - - client.inTransaction().create().compressed().forPath(path1, data1).and(). - create().forPath(path2, data2).and().commit(); - - Assert.assertNotEquals(data1, client.getData().forPath(path1)); - Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); - - Assert.assertEquals(data2, client.getData().forPath(path2)); - } - finally - { - CloseableUtils.closeQuietly(client); - } - } -} http://git-wip-us.apache.org/repos/asf/curator/blob/72555fac/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionNew.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionNew.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionNew.java new file mode 100644 index 0000000..d302119 --- /dev/null +++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionNew.java @@ -0,0 +1,162 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.curator.framework.imps; + +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.framework.api.transaction.CuratorOp; +import org.apache.curator.retry.RetryOneTime; +import org.apache.curator.test.BaseClassForTests; +import org.apache.curator.utils.CloseableUtils; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class TestCompressionInTransactionNew extends BaseClassForTests +{ + @Test + public void testSetData() throws Exception + { + final String path = "/a"; + final byte[] data = "here's a string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + //Create uncompressed data in a transaction + CuratorOp op = client.transactionOp().create().forPath(path, data); + client.transaction().forOperations(op); + Assert.assertEquals(data, client.getData().forPath(path)); + + //Create compressed data in transaction + op = client.transactionOp().setData().compressed().forPath(path, data); + client.transaction().forOperations(op); + Assert.assertEquals(data, client.getData().decompressed().forPath(path)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + @Test + public void testSetCompressedAndUncompressed() throws Exception + { + final String path1 = "/a"; + final String path2 = "/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + //Create the nodes + CuratorOp op1 = client.transactionOp().create().compressed().forPath(path1); + CuratorOp op2 = client.transactionOp().create().forPath(path2); + client.transaction().forOperations(op1, op2); + + //Check they exist + Assert.assertNotNull(client.checkExists().forPath(path1)); + Assert.assertNotNull(client.checkExists().forPath(path2)); + + //Set the nodes, path1 compressed, path2 uncompressed. + op1 = client.transactionOp().setData().compressed().forPath(path1, data1); + op2 = client.transactionOp().setData().forPath(path2, data2); + client.transaction().forOperations(op1, op2); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertEquals(data2, client.getData().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + @Test + public void testSimple() throws Exception + { + final String path1 = "/a"; + final String path2 = "/a/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + CuratorOp op1 = client.transactionOp().create().compressed().forPath(path1, data1); + CuratorOp op2 = client.transactionOp().create().compressed().forPath(path2, data2); + + client.transaction().forOperations(op1, op2); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertNotEquals(data2, client.getData().forPath(path2)); + Assert.assertEquals(data2, client.getData().decompressed().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + /** + * Test the case where both uncompressed and compressed data is generated in + * the same transaction + * @throws Exception + */ + @Test + public void testCreateCompressedAndUncompressed() throws Exception + { + final String path1 = "/a"; + final String path2 = "/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + CuratorOp op1 = client.transactionOp().create().compressed().forPath(path1, data1); + CuratorOp op2 = client.transactionOp().create().forPath(path2, data2); + client.transaction().forOperations(op1, op2); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertEquals(data2, client.getData().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } +} http://git-wip-us.apache.org/repos/asf/curator/blob/72555fac/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionOld.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionOld.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionOld.java new file mode 100644 index 0000000..ebf591b --- /dev/null +++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCompressionInTransactionOld.java @@ -0,0 +1,158 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.curator.framework.imps; + +import org.apache.curator.test.BaseClassForTests; +import org.apache.curator.utils.CloseableUtils; +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.framework.api.CompressionProvider; +import org.apache.curator.retry.RetryOneTime; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.concurrent.atomic.AtomicInteger; + +@SuppressWarnings("deprecation") +public class TestCompressionInTransactionOld extends BaseClassForTests +{ + @Test + public void testSetData() throws Exception + { + final String path = "/a"; + final byte[] data = "here's a string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + //Create uncompressed data in a transaction + client.inTransaction().create().forPath(path, data).and().commit(); + Assert.assertEquals(data, client.getData().forPath(path)); + + //Create compressed data in transaction + client.inTransaction().setData().compressed().forPath(path, data).and().commit(); + Assert.assertEquals(data, client.getData().decompressed().forPath(path)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + @Test + public void testSetCompressedAndUncompressed() throws Exception + { + final String path1 = "/a"; + final String path2 = "/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + //Create the nodes + client.inTransaction().create().compressed().forPath(path1).and(). + create().forPath(path2).and().commit(); + + //Check they exist + Assert.assertNotNull(client.checkExists().forPath(path1)); + Assert.assertNotNull(client.checkExists().forPath(path2)); + + //Set the nodes, path1 compressed, path2 uncompressed. + client.inTransaction().setData().compressed().forPath(path1, data1).and(). + setData().forPath(path2, data2).and().commit(); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertEquals(data2, client.getData().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + @Test + public void testSimple() throws Exception + { + final String path1 = "/a"; + final String path2 = "/a/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + client.inTransaction().create().compressed().forPath(path1, data1).and(). + create().compressed().forPath(path2, data2).and().commit(); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertNotEquals(data2, client.getData().forPath(path2)); + Assert.assertEquals(data2, client.getData().decompressed().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } + + /** + * Test the case where both uncompressed and compressed data is generated in + * the same transaction + * @throws Exception + */ + @Test + public void testCreateCompressedAndUncompressed() throws Exception + { + final String path1 = "/a"; + final String path2 = "/b"; + + final byte[] data1 = "here's a string".getBytes(); + final byte[] data2 = "here's another string".getBytes(); + + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + try + { + client.start(); + + client.inTransaction().create().compressed().forPath(path1, data1).and(). + create().forPath(path2, data2).and().commit(); + + Assert.assertNotEquals(data1, client.getData().forPath(path1)); + Assert.assertEquals(data1, client.getData().decompressed().forPath(path1)); + + Assert.assertEquals(data2, client.getData().forPath(path2)); + } + finally + { + CloseableUtils.closeQuietly(client); + } + } +}