You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/10 20:55:39 UTC
[4/5] git commit: Revert "fix tests"
Revert "fix tests"
This reverts commit fbd51b77a047f2a04a94c4b474881c2be9bf1171.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bfaf8f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bfaf8f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bfaf8f8
Branch: refs/heads/cassandra-2.0
Commit: 2bfaf8f8d991588de43fe3d194a447fe4279cb44
Parents: fbd51b7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 10 13:53:32 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 10 13:53:32 2014 -0600
----------------------------------------------------------------------
.../cassandra/service/LeaveAndBootstrapTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bfaf8f8/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 4c1421a..a9d8057 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.SystemTable;
+import org.apache.cassandra.db.SystemKeyspace;
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<Token> endpointTokens = new ArrayList<Token>();
- List<InetAddress> hosts = new ArrayList<InetAddress>();
+ ArrayList<Token> endpointTokens = new ArrayList<>();
+ List<InetAddress> hosts = new ArrayList<>();
Util.createInitialRing(ss, partitioner, endpointTokens, new ArrayList<Token>(), hosts, new ArrayList<UUID>(), 2);
InetAddress toRemove = hosts.get(1);
- SystemTable.updatePeerInfo(toRemove, "data_center", "'dc42'");
- SystemTable.updatePeerInfo(toRemove, "rack", "'rack42'");
- assertEquals("rack42", SystemTable.loadDcRackInfo().get(toRemove).get("rack"));
+ SystemKeyspace.updatePeerInfo(toRemove, "data_center", "'dc42'");
+ SystemKeyspace.updatePeerInfo(toRemove, "rack", "'rack42'");
+ assertEquals("rack42", SystemKeyspace.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", SystemTable.loadDcRackInfo().get(toRemove).get("rack"));
+ assertEquals("rack42", SystemKeyspace.loadDcRackInfo().get(toRemove).get("rack"));
}
private static Collection<InetAddress> makeAddrs(String... hosts) throws UnknownHostException