Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B461A10CEC for ; Fri, 10 Jan 2014 19:55:36 +0000 (UTC) Received: (qmail 37213 invoked by uid 500); 10 Jan 2014 19:55:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37192 invoked by uid 500); 10 Jan 2014 19:55:36 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 37183 invoked by uid 99); 10 Jan 2014 19:55:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jan 2014 19:55:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4FCBE32A6D5; Fri, 10 Jan 2014 19:55:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 10 Jan 2014 19:55:36 -0000 Message-Id: <71ece911d9ef455fa23b0c726eb7c1d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: fix tests Updated Branches: refs/heads/cassandra-2.0 87c6ec11c -> 2bfaf8f8d refs/heads/trunk 82b086f47 -> 8ebeee104 fix tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbd51b77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbd51b77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbd51b77 Branch: refs/heads/cassandra-2.0 Commit: fbd51b77a047f2a04a94c4b474881c2be9bf1171 Parents: 87c6ec1 Author: Brandon Williams Authored: Fri Jan 10 13:50:35 2014 -0600 Committer: Brandon Williams Committed: Fri Jan 10 13:53:05 2014 -0600 ---------------------------------------------------------------------- .../cassandra/service/LeaveAndBootstrapTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd51b77/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java index a9d8057..4c1421a 100644 --- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java +++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java @@ -24,7 +24,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; -import org.apache.cassandra.db.SystemKeyspace; +import org.apache.cassandra.db.SystemTable; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.config.Schema; import org.junit.Test; @@ -661,14 +661,14 @@ public class LeaveAndBootstrapTest VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(partitioner); // create a ring of 2 nodes - ArrayList endpointTokens = new ArrayList<>(); - List hosts = new ArrayList<>(); + ArrayList endpointTokens = new ArrayList(); + List hosts = new ArrayList(); Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList(), hosts, new ArrayList(), 2); InetAddress toRemove = hosts.get(1); - SystemKeyspace.updatePeerInfo(toRemove, "data_center", "'dc42'"); - SystemKeyspace.updatePeerInfo(toRemove, "rack", "'rack42'"); - assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); + SystemTable.updatePeerInfo(toRemove, "data_center", "'dc42'"); + SystemTable.updatePeerInfo(toRemove, "rack", "'rack42'"); + assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); // mark the node as removed Gossiper.instance.injectApplicationState(toRemove, ApplicationState.STATUS, @@ -678,7 +678,7 @@ public class LeaveAndBootstrapTest // state changes made after the endpoint has left should be ignored ss.onChange(hosts.get(1), ApplicationState.RACK, valueFactory.rack("rack9999")); - assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack")); + assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack")); } private static Collection makeAddrs(String... hosts) throws UnknownHostException