Updated Branches: refs/heads/trunk 67f9eba79 -> 660902929
use %n for new line in printf Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66090292 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66090292 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66090292 Branch: refs/heads/trunk Commit: 660902929ad789f3b07a0b1a67190184f8c5fb2a Parents: 67f9eba Author: Dave Brosius <[email protected]> Authored: Thu Dec 26 18:44:57 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Thu Dec 26 18:44:57 2013 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/config/CFMetaDataTest.java | 4 ++-- .../src/org/apache/cassandra/stress/util/JavaDriverClient.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66090292/test/unit/org/apache/cassandra/config/CFMetaDataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java index 0d2fa95..9cd4adf 100644 --- a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java +++ b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java @@ -123,7 +123,7 @@ public class CFMetaDataTest extends SchemaLoader // Test thrift conversion CFMetaData before = cfm; CFMetaData after = CFMetaData.fromThrift(before.toThrift()); - assert before.equals(after) : String.format("\n%s\n!=\n%s", before, after); + assert before.equals(after) : String.format("%n%s%n!=%n%s", before, after); // Test schema conversion Mutation rm = cfm.toSchema(System.currentTimeMillis()); @@ -131,6 +131,6 @@ public class CFMetaDataTest extends SchemaLoader ColumnFamily serializedCD = rm.getColumnFamily(Schema.instance.getId(Keyspace.SYSTEM_KS, SystemKeyspace.SCHEMA_COLUMNS_CF)); UntypedResultSet.Row result = QueryProcessor.resultify("SELECT * FROM system.schema_columnfamilies", new Row(k, serializedCf)).one(); CFMetaData newCfm = CFMetaData.fromSchemaNoTriggers(result, ColumnDefinition.resultify(new Row(k, serializedCD))); - assert cfm.equals(newCfm) : String.format("\n%s\n!=\n%s", cfm, newCfm); + assert cfm.equals(newCfm) : String.format("%n%s%n!=%n%s", cfm, newCfm); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/66090292/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index f13c1b6..7f2ab16 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -73,11 +73,11 @@ public class JavaDriverClient } cluster = clusterBuilder.build(); Metadata metadata = cluster.getMetadata(); - System.out.printf("Connected to cluster: %s\n", + System.out.printf("Connected to cluster: %s%n", metadata.getClusterName()); for (Host host : metadata.getAllHosts()) { - System.out.printf("Datatacenter: %s; Host: %s; Rack: %s\n", + System.out.printf("Datatacenter: %s; Host: %s; Rack: %s%n", host.getDatacenter(), host.getAddress(), host.getRack()); }
