Refactor benchmark for enabling CppCodeGenerator.

--
PiperOrigin-RevId: 150440499
MOS_MIGRATED_REVID=150440499

4 files changed, 27 insertions, 16 deletions

diff --git a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/BUILD b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/BUILD
index dba4c5b39f..2c481da396 100644
--- a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/BUILD
+++ b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/BUILD
@@ -50,6 +50,7 @@ java_test(
         "//src/main/java/com/google/devtools/common/options",
         "//src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator:codegenerator_lib",
         "//third_party:junit4",
+        "//third_party:truth",
     ],
 )
 
diff --git a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/CppCodeGeneratorTest.java b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/CppCodeGeneratorTest.java
index 68d2dc27ee..87154669ca 100644
--- a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/CppCodeGeneratorTest.java
+++ b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/CppCodeGeneratorTest.java
@@ -37,7 +37,13 @@ public class CppCodeGeneratorTest {
   public void testGenerateNewProject() throws IOException {
     File createdFolder = folder.newFolder("GenerateNewProject");
     Path dir = createdFolder.toPath();
-    (new CppCodeGenerator()).generateNewProject(dir.toString(), true, true, true, true);
+    CppCodeGenerator cppCodeGenerator = new CppCodeGenerator();
+    cppCodeGenerator.generateNewProject(dir.toString(), ImmutableSet.of(
+        CppCodeGenerator.TARGET_A_FEW_FILES,
+        CppCodeGenerator.TARGET_LONG_CHAINED_DEPS,
+        CppCodeGenerator.TARGET_MANY_FILES,
+        CppCodeGenerator.TARGET_PARALLEL_DEPS
+    ));
 
     // Check dir contains 4 project directories
     File[] filesList = dir.toFile().listFiles();
diff --git a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/JavaCodeGeneratorTest.java b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/JavaCodeGeneratorTest.java
index 016e82e065..1e7985436b 100644
--- a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/JavaCodeGeneratorTest.java
+++ b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/JavaCodeGeneratorTest.java
@@ -39,7 +39,11 @@ public class JavaCodeGeneratorTest {
     File createdFolder = folder.newFolder("GenerateNewProject");
     Path dir = createdFolder.toPath();
     JavaCodeGenerator javaCodeGenerator = new JavaCodeGenerator();
-    javaCodeGenerator.generateNewProject(dir.toString(), true, true, true, true);
+    javaCodeGenerator.generateNewProject(dir.toString(), ImmutableSet.of(
+        JavaCodeGenerator.TARGET_A_FEW_FILES,
+        JavaCodeGenerator.TARGET_LONG_CHAINED_DEPS,
+        JavaCodeGenerator.TARGET_MANY_FILES,
+        JavaCodeGenerator.TARGET_PARALLEL_DEPS));
 
     // Check dir contains 4 project directories
     File[] filesList = dir.toFile().listFiles();
diff --git a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/MainTest.java b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/MainTest.java
index ef47492dbb..5d46a7f054 100644
--- a/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/MainTest.java
+++ b/src/tools/benchmark/javatests/com/google/devtools/build/benchmark/codegenerator/MainTest.java
@@ -14,7 +14,7 @@
 
 package com.google.devtools.build.benchmark.codegenerator;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.devtools.common.options.OptionsParsingException;
@@ -33,7 +33,7 @@ public class MainTest {
       Main.parseArgs(new String[]{});
       fail("Should throw IllegalArgumentException");
     } catch (IllegalArgumentException e) {
-      assertEquals("--output_dir should not be empty.", e.getMessage());
+      assertThat(e).hasMessage("--output_dir should not be empty.");
     }
   }
 
@@ -43,8 +43,7 @@ public class MainTest {
       Main.parseArgs(new String[]{"--modify=mango"});
       fail("Should throw OptionsParsingException");
     } catch (OptionsParsingException e) {
-      assertEquals(
-          "While parsing option --modify=mango: 'mango' is not a boolean", e.getMessage());
+      assertThat(e).hasMessage("While parsing option --modify=mango: 'mango' is not a boolean");
     }
   }
 
@@ -54,7 +53,7 @@ public class MainTest {
       Main.parseArgs(new String[]{"--modify"});
       fail("Should throw IllegalArgumentException");
     } catch (IllegalArgumentException e) {
-      assertEquals("--output_dir should not be empty.", e.getMessage());
+      assertThat(e).hasMessage("--output_dir should not be empty.");
     }
   }
 
@@ -64,7 +63,7 @@ public class MainTest {
       Main.parseArgs(new String[]{"--modify", "--output_dir=mango"});
       fail("Should throw IllegalArgumentException");
     } catch (IllegalArgumentException e) {
-      assertEquals("--output_dir (mango) does not contain code for modification.", e.getMessage());
+      assertThat(e).hasMessage("--output_dir (mango) does not contain code for modification.");
     }
   }
 
@@ -74,19 +73,20 @@ public class MainTest {
       Main.parseArgs(new String[]{"--output_dir=mango"});
       fail("Should throw IllegalArgumentException");
     } catch (IllegalArgumentException e) {
-      assertEquals("No type of package is specified.", e.getMessage());
+      assertThat(e).hasMessage("No type of package is specified.");
     }
   }
 
   @Test
   public void testParseArgsCorrect() throws OptionsParsingException, IOException {
     GeneratorOptions opt = Main.parseArgs(
-        new String[]{"--modify=false", "--output_dir=mango", "--a_few_files", "--parallel_deps"});
-    assertEquals(opt.modificationMode, false);
-    assertEquals(opt.outputDir, "mango");
-    assertEquals(opt.aFewFiles, true);
-    assertEquals(opt.manyFiles, false);
-    assertEquals(opt.longChainedDeps, false);
-    assertEquals(opt.parallelDeps, true);
+        new String[]{
+            "--modify=false",
+            "--output_dir=mango",
+            "--project_name=AFewFiles",
+            "--project_name=ParallelDeps"});
+    assertThat(opt.modificationMode).isFalse();
+    assertThat(opt.outputDir).isEqualTo("mango");
+    assertThat(opt.projectNames).containsExactly("AFewFiles", "ParallelDeps");
   }
 }