Google Git
Sign in
android/platform/external/google-java-format/f0ad4f9^!/.
commit
f0ad4f9b0ab389194dabd59354f34996e0fa71c1
[log]
author
cushon <cushon@google.com>
Mon Aug 15 13:28:55 2016 -0700
committer
Liam Miller-Cushon <cushon@google.com>
Tue Sep 13 13:11:30 2016 -0700
tree
2e44e45977c24e46abb7706428fa77d686ea351a
parent
a41b30b3ad2e6db102b53f72112a3c22d126d98d [diff]
Fix parse errors in regression test inputs

MOE_MIGRATED_REVID=130317135

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.input
index be5772c..b624e8d 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.input
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.input

@@ -31,7 +31,7 @@
                     anyInt(), anyInt(), anyInt()))
         .then();
 
-    private static final List<Integer> XXXXXXXX =
+    final List<Integer> XXXXXXXX =
         ImmutableList.of(
             XXXXXXX, //
             XXXXXXX, //

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.output
index 1755fb1..e1b2e55 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.output
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B23749160.output

@@ -28,7 +28,7 @@
             anyInt(), anyInt(), anyInt()))
         .then();
 
-    private static final List<Integer> XXXXXXXX =
+    final List<Integer> XXXXXXXX =
         ImmutableList.of(
             XXXXXXX, //
             XXXXXXX, //

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.input
index 6842308..7a1cd14 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.input
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.input

@@ -1,49 +1,49 @@
 class Test {
-  private CreationMechanism creationMechanism;
-  private @Nullable String creationUserAgent;
-  private ClientId clientId;
-  private @Nullable String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-  private Token externalId;
+  final CreationMechanism creationMechanism;
+  final @Nullable String creationUserAgent;
+  final ClientId clientId;
+  final @Nullable String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+  final Token externalId;
 
   {
-    private CreationMechanism creationMechanism;
-    private @Nullable String creationUserAgent;
-    private ClientId clientId;
-    private @Nullable String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-    private Token externalId;
+    final CreationMechanism creationMechanism;
+    final @Nullable String creationUserAgent;
+    final ClientId clientId;
+    final @Nullable String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+    final Token externalId;
   }
 }
 
 class Test {
-  private CreationMechanism creationMechanism;
-  @Nullable private String creationUserAgent;
-  private ClientId clientId;
-  @Nullable private String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-  private Token externalId;
+  final CreationMechanism creationMechanism;
+  @Nullable final String creationUserAgent;
+  final ClientId clientId;
+  @Nullable final String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+  final Token externalId;
 
   {
-    private CreationMechanism creationMechanism;
-    @Nullable private String creationUserAgent;
-    private ClientId clientId;
-    @Nullable private String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-    private Token externalId;
+    final CreationMechanism creationMechanism;
+    @Nullable final String creationUserAgent;
+    final ClientId clientId;
+    @Nullable final String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+    final Token externalId;
   }
 }
 
 class Test {
 
   @Nullable
-  private String creationUserAgent;
+  final String creationUserAgent;
 
   {
     @Nullable
-    private String creationUserAgent;
+    final String creationUserAgent;
   }
 
   {
 
     @Nullable
-    private String creationUserAgent;
+    final String creationUserAgent;
 
   }
 }

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.output
index 10d7a2b..2637dde 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.output
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1.output

@@ -1,50 +1,50 @@
 class Test {
-  private CreationMechanism creationMechanism;
-  private @Nullable String creationUserAgent;
-  private ClientId clientId;
-  private @Nullable String
-      creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-  private Token externalId;
+  final CreationMechanism creationMechanism;
+  final @Nullable String creationUserAgent;
+  final ClientId clientId;
+  final @Nullable String
+      creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+  final Token externalId;
 
   {
-    private CreationMechanism creationMechanism;
-    private @Nullable String creationUserAgent;
-    private ClientId clientId;
-    private @Nullable String
+    final CreationMechanism creationMechanism;
+    final @Nullable String creationUserAgent;
+    final ClientId clientId;
+    final @Nullable String
         creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-    private Token externalId;
+    final Token externalId;
   }
 }
 
 class Test {
-  private CreationMechanism creationMechanism;
-  @Nullable private String creationUserAgent;
-  private ClientId clientId;
+  final CreationMechanism creationMechanism;
+  @Nullable final String creationUserAgent;
+  final ClientId clientId;
 
   @Nullable
-  private String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+  final String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
 
-  private Token externalId;
+  final Token externalId;
 
   {
-    private CreationMechanism creationMechanism;
-    @Nullable private String creationUserAgent;
-    private ClientId clientId;
+    final CreationMechanism creationMechanism;
+    @Nullable final String creationUserAgent;
+    final ClientId clientId;
     @Nullable
-    private String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
-    private Token externalId;
+    final String creationUserAgentXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;
+    final Token externalId;
   }
 }
 
 class Test {
 
-  @Nullable private String creationUserAgent;
+  @Nullable final String creationUserAgent;
 
   {
-    @Nullable private String creationUserAgent;
+    @Nullable final String creationUserAgent;
   }
 
   {
-    @Nullable private String creationUserAgent;
+    @Nullable final String creationUserAgent;
   }
 }

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-and-formatting b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-and-formatting
index 51ce1f0..887d43c 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-and-formatting
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-and-formatting

@@ -12,7 +12,7 @@
 @RunWith(JUnit4.class)
 public class SomeTest {
 
-  <T> check(@Nullable List<T> x) {
+  <T> void check(@Nullable List<T> x) {
     Preconditions.checkNodeNull(x);
   }
 

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-only b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-only
index 1078653..88f83f1 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-only
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.imports-only

@@ -11,7 +11,7 @@
 
 @RunWith( JUnit4.class ) public class SomeTest  {
 
-  <T> check(@Nullable List<T> x) {
+  <T> void check(@Nullable List<T> x) {
     Preconditions.checkNodeNull(x);
   }
 

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.input b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.input
index 85827e8..3a3c270 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.input
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testimports/A.input

@@ -14,7 +14,7 @@
 
 @RunWith( JUnit4.class ) public class SomeTest  {
 
-  <T> check(@Nullable List<T> x) {
+  <T> void check(@Nullable List<T> x) {
     Preconditions.checkNodeNull(x);
   }