From f672a31b8b19baab95373e4f2f6d110aa8b8f0fb Mon Sep 17 00:00:00 2001
From: corysmith <corysmith@google.com>
Date: Fri, 16 Feb 2018 13:14:29 -0800
Subject: Normalized the serialization proto to save space and allow greater
 versatility in storage.

RELNOTES: None
PiperOrigin-RevId: 186036607
---
 .../build/android/RClassGeneratorActionTest.java   | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/test/java/com/google/devtools/build/android/RClassGeneratorActionTest.java')

diff --git a/src/test/java/com/google/devtools/build/android/RClassGeneratorActionTest.java b/src/test/java/com/google/devtools/build/android/RClassGeneratorActionTest.java
index e03348cdaa..2f3ae78549 100644
--- a/src/test/java/com/google/devtools/build/android/RClassGeneratorActionTest.java
+++ b/src/test/java/com/google/devtools/build/android/RClassGeneratorActionTest.java
@@ -109,7 +109,7 @@ public class RClassGeneratorActionTest {
     Path jarPath = tempDir.resolve("app_resources.jar");
 
     RClassGeneratorAction.main(
-        ImmutableList.<String>of(
+        ImmutableList.of(
                 "--primaryRTxt",
                 binarySymbols.toString(),
                 "--primaryManifest",
@@ -165,7 +165,7 @@ public class RClassGeneratorActionTest {
     Path jarPath = tempDir.resolve("app_resources.jar");
 
     RClassGeneratorAction.main(
-        ImmutableList.<String>of(
+        ImmutableList.of(
                 "--library",
                 libFooSymbols + "," + libFooManifest,
                 "--library",
@@ -212,11 +212,12 @@ public class RClassGeneratorActionTest {
 
     Path jarPath = tempDir.resolve("app_resources.jar");
 
-    RClassGeneratorAction.main(ImmutableList.<String>of(
-        "--primaryRTxt", binarySymbols.toString(),
-        "--primaryManifest", binaryManifest.toString(),
-        "--classJarOutput", jarPath.toString()
-    ).toArray(new String[0]));
+    RClassGeneratorAction.main(
+        ImmutableList.of(
+                "--primaryRTxt", binarySymbols.toString(),
+                "--primaryManifest", binaryManifest.toString(),
+                "--classJarOutput", jarPath.toString())
+            .toArray(new String[0]));
 
     assertThat(Files.exists(jarPath)).isTrue();
     assertThat(Files.getLastModifiedTime(jarPath)).isEqualTo(FileTime.fromMillis(0));
@@ -239,9 +240,8 @@ public class RClassGeneratorActionTest {
   @Test
   public void noBinary() throws Exception {
     Path jarPath = tempDir.resolve("app_resources.jar");
-    RClassGeneratorAction.main(ImmutableList.<String>of(
-        "--classJarOutput", jarPath.toString()
-    ).toArray(new String[0]));
+    RClassGeneratorAction.main(
+        ImmutableList.of("--classJarOutput", jarPath.toString()).toArray(new String[0]));
 
     assertThat(Files.exists(jarPath)).isTrue();
     assertThat(Files.getLastModifiedTime(jarPath)).isEqualTo(FileTime.fromMillis(0));
@@ -271,7 +271,7 @@ public class RClassGeneratorActionTest {
         "int string ok 0x1");
     Path jarPath = tempDir.resolve("app_resources.jar");
     RClassGeneratorAction.main(
-        ImmutableList.<String>of(
+        ImmutableList.of(
                 "--primaryRTxt",
                 binarySymbols.toString(),
                 "--primaryManifest",
@@ -313,13 +313,13 @@ public class RClassGeneratorActionTest {
     Path binarySymbols = createFile("R.txt", "");
     Path jarPath = tempDir.resolve("app_resources.jar");
     RClassGeneratorAction.main(
-        ImmutableList.<String>of(
-            "--primaryRTxt",
-            binarySymbols.toString(),
-            "--primaryManifest",
-            binaryManifest.toString(),
-            "--classJarOutput",
-            jarPath.toString())
+        ImmutableList.of(
+                "--primaryRTxt",
+                binarySymbols.toString(),
+                "--primaryManifest",
+                binaryManifest.toString(),
+                "--classJarOutput",
+                jarPath.toString())
             .toArray(new String[0]));
 
     assertThat(Files.exists(jarPath)).isTrue();
-- 
cgit v1.2.3