Updated Redact samples and tests.

Author: kurtisvg

dlp/src/main/java/com/example/dlp/Redact.java

@@ -22,6 +22,7 @@
 import com.google.privacy.dlp.v2.InfoType;
 import com.google.privacy.dlp.v2.InspectConfig;
 import com.google.privacy.dlp.v2.Likelihood;
+import com.google.privacy.dlp.v2.ProjectName;
 import com.google.privacy.dlp.v2.RedactImageRequest;
 import com.google.privacy.dlp.v2.RedactImageResponse;
 import com.google.protobuf.ByteString;
@@ -110,7 +111,7 @@ private static void redactImage(
 
       RedactImageRequest redactImageRequest =
           RedactImageRequest.newBuilder()
-              .setParent(projectId)
+              .setParent(ProjectName.of(projectId).toString())
               .addAllImageRedactionConfigs(imageRedactionConfigs)
               .setByteItem(byteContentItem)
               .setInspectConfig(inspectConfig)
@@ -142,11 +143,12 @@ public static void main(String[] args) throws Exception {
     commandLineOptions.addOption(infoTypesOption);
 
     Option inputFilePathOption =
-        Option.builder("o").hasArg(true).longOpt("inputFilePath").required(false).build();
+        Option.builder("f").hasArg(true).longOpt("inputFilePath").required(false).build();
     commandLineOptions.addOption(inputFilePathOption);
 
     Option outputFilePathOption =
         Option.builder("o").hasArg(true).longOpt("outputFilePath").required(false).build();
+
     commandLineOptions.addOption(outputFilePathOption);
 
     Option projectIdOption = Option.builder("projectId").hasArg(true).required(false).build();

dlp/src/test/java/com/example/dlp/RedactIT.java

@@ -17,7 +17,10 @@
 package com.example.dlp;
 
 import static junit.framework.TestCase.assertFalse;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
@@ -47,36 +50,27 @@ public void setUp() {
   }
 
   @Test
-  public void testInfoTypesInStringAreReplaced() throws Exception {
-    String text =
-        "\"My phone number is (234) 456-7890 and my email address is [email protected]\"";
-    Redact.main(new String[] {"-s", text, "-r", "_REDACTED_"});
-    String output = bout.toString();
-    assertTrue(output.contains("My phone number is _REDACTED_ and my email address is _REDACTED_"));
-  }
-
-  @Ignore // TODO: b/69461298
-  @Test
-  public void testInfoTypesInImageAreReplaced() throws Exception {
-    ClassLoader classLoader = getClass().getClassLoader();
-    // confirm that current data contains info types
-    File file = new File(classLoader.getResource("test.png").getFile());
-    Inspect.main(new String[] {"-f", file.getAbsolutePath()});
-    String output = bout.toString();
-    assertTrue(output.contains("PHONE_NUMBER"));
-    assertTrue(output.contains("EMAIL_ADDRESS"));
-    bout.reset();
-
-    String outputFilePath = "output.png";
+  public void testRedactImage() throws Exception {
+    // InspectIT Tests verify original has PII present
+    String outputFilePath = "src/test/resources/output.png";
 
+    // Restrict phone number, but not email
     Redact.main(
         new String[] {
-          "-f", file.getAbsolutePath(), "-infoTypes", "PHONE_NUMBER", "-o", outputFilePath
+            "-f", "src/test/resources/test.png",
+            "-infoTypes", "PHONE_NUMBER",
+            "-o", outputFilePath
         });
-    Inspect.main(new String[] {"-f", outputFilePath});
-    output = bout.toString();
-    assertFalse(output.contains("PHONE_NUMBER"));
-    assertTrue(output.contains("EMAIL_ADDRESS"));
+    bout.reset();
+
+    // Verify that phone_number is missing but email is present
+    Inspect.main(new String[] {
+        "-f", outputFilePath,
+        "-infoTypes", "PHONE_NUMBER", "EMAIL_ADDRESS"
+    });
+    String output = bout.toString();
+    assertThat(output, not(containsString("PHONE_NUMBER")));
+    assertThat(output, containsString("EMAIL_ADDRESS"));
   }
 
   @After