Replace StringBuffer to StringBuilder. Rename "buffer" to "sb" (in ca…

…se of usage StringBuilder)
seize-the-dave · Feb 18, 2014 · 2859b41 · 2859b41
1 parent eb8b5ee
commit 2859b41
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 27 deletions.
diff --git a/src/main/java/junit/framework/TestFailure.java b/src/main/java/junit/framework/TestFailure.java
@@ -10,7 +10,7 @@
  *
  * @see TestResult
  */
-public class TestFailure extends Object {
+public class TestFailure {
     protected Test fFailedTest;
     protected Throwable fThrownException;
 
@@ -42,17 +42,16 @@ public Throwable thrownException() {
      */
     @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(fFailedTest + ": " + fThrownException.getMessage());
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append(fFailedTest + ": " + fThrownException.getMessage());
+        return sb.toString();
     }
 
     public String trace() {
         StringWriter stringWriter = new StringWriter();
         PrintWriter writer = new PrintWriter(stringWriter);
         thrownException().printStackTrace(writer);
-        StringBuffer buffer = stringWriter.getBuffer();
-        return buffer.toString();
+        return stringWriter.toString();
     }
 
     public String exceptionMessage() {

diff --git a/src/main/java/junit/runner/BaseTestRunner.java b/src/main/java/junit/runner/BaseTestRunner.java
@@ -267,8 +267,7 @@ public static String getFilteredTrace(Throwable t) {
         StringWriter stringWriter = new StringWriter();
         PrintWriter writer = new PrintWriter(stringWriter);
         t.printStackTrace(writer);
-        StringBuffer buffer = stringWriter.getBuffer();
-        String trace = buffer.toString();
+        String trace = stringWriter.toString();
         return BaseTestRunner.getFilteredTrace(trace);
     }
 

diff --git a/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java b/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
@@ -22,18 +22,17 @@ public static String join(String delimiter, Object... params) {
         return join(delimiter, Arrays.asList(params));
     }
 
-    public static String join(String delimiter,
-            Collection<Object> values) {
-        StringBuffer buffer = new StringBuffer();
+    public static String join(String delimiter, Collection<Object> values) {
+        StringBuilder sb = new StringBuilder();
         Iterator<Object> iter = values.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            buffer.append(stringValueOf(next));
+            sb.append(stringValueOf(next));
             if (iter.hasNext()) {
-                buffer.append(delimiter);
+                sb.append(delimiter);
             }
         }
-        return buffer.toString();
+        return sb.toString();
     }
 
     private static String stringValueOf(Object next) {

diff --git a/src/main/java/org/junit/runner/notification/Failure.java b/src/main/java/org/junit/runner/notification/Failure.java
@@ -55,9 +55,9 @@ public Throwable getException() {
 
     @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(getTestHeader() + ": " + fThrownException.getMessage());
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append(getTestHeader() + ": " + fThrownException.getMessage());
+        return sb.toString();
     }
 
     /**
@@ -69,8 +69,7 @@ public String getTrace() {
         StringWriter stringWriter = new StringWriter();
         PrintWriter writer = new PrintWriter(stringWriter);
         getException().printStackTrace(writer);
-        StringBuffer buffer = stringWriter.getBuffer();
-        return buffer.toString();
+        return stringWriter.toString();
     }
 
     /**

diff --git a/src/test/java/junit/samples/money/Money.java b/src/test/java/junit/samples/money/Money.java
@@ -83,9 +83,9 @@ public IMoney subtract(IMoney m) {
 
     @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("[" + amount() + " " + currency() + "]");
-        return buffer.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append("[" + amount() + " " + currency() + "]");
+        return sb.toString();
     }
 
     public /*this makes no sense*/ void appendTo(MoneyBag m) {

diff --git a/src/test/java/junit/samples/money/MoneyBag.java b/src/test/java/junit/samples/money/MoneyBag.java
@@ -140,13 +140,13 @@ public IMoney subtract(IMoney m) {
 
     @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("{");
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
         for (Money each : fMonies) {
-            buffer.append(each);
+            sb.append(each);
         }
-        buffer.append("}");
-        return buffer.toString();
+        sb.append("}");
+        return sb.toString();
     }
 
     public void appendTo(MoneyBag m) {