commit 639c4b30d81835f4e123f37ee9414d70f8688e4f
author Alex Ruiz <alruiz@google.com> Wed Mar 07 10:43:29 2012 -0800
committer Alex Ruiz <alruiz@google.com> Wed Mar 07 10:43:29 2012 -0800
tree a2e3c0001e6109f020c3695a2ca5a13998ae1fe2
parent 2a0e4f9a9c01c7bf7963f1b4eabd3b650f6d6e41

Code cleanup.

com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java

diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java
index d518334..0ceeb19 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java
@@ -36,7 +36,7 @@
   //
   // import 'google/protobuf/descriptor.proto';
   @Test public void should_format_syntax() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
   // package com.google.proto.test;import 'google/protobuf/descriptor.proto';
@@ -45,7 +45,7 @@
   //
   // import 'google/protobuf/descriptor.proto';
   @Test public void should_format_package() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
   // import 'dummy.proto';import 'google/protobuf/descriptor.proto';
@@ -53,7 +53,7 @@
   // import 'dummy.proto';
   // import 'google/protobuf/descriptor.proto';
   @Test public void should_format_normal_import() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
   // import public 'dummy.proto';import 'google/protobuf/descriptor.proto';
@@ -61,7 +61,7 @@
   // import public 'dummy.proto';
   // import 'google/protobuf/descriptor.proto';
   @Test public void should_format_public_import() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
   // import weak 'dummy.proto';import 'google/protobuf/descriptor.proto';
@@ -69,7 +69,7 @@
   // import weak 'dummy.proto';
   // import 'google/protobuf/descriptor.proto';
   @Test public void should_format_weak_import() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
   // option java_package = "com.foo.bar";option optimize_for = CODE_SIZE;
@@ -77,12 +77,13 @@
   // option java_package = "com.foo.bar";
   // option optimize_for = CODE_SIZE;
   @Test public void should_format_native_option() {
-    assertThat(formatText(), equalTo(commentReader.expectedText()));
+    assertThatFormattingWorksCorrectly();
   }
 
-  private String formatText() {
+  private void assertThatFormattingWorksCorrectly() {
     ICompositeNode rootNode = commentReader.rootNode();
     IFormattedRegion region = formatter.format(rootNode, 0, rootNode.getText().length());
-    return region.getFormattedText();
+    String formatted = region.getFormattedText();
+    assertThat(formatted, equalTo(commentReader.expectedText()));
   }
 }