Split out the InvocationPolicy parser from the enforcer.

The encapsulation was off, since the format in which we accept policy has nothing to do with how we then enforce the policy.

PiperOrigin-RevId: 151471747

1 files changed, 4 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTestBase.java b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTestBase.java
index ec46925f80..9ed3e006a3 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTestBase.java
@@ -18,6 +18,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
 import com.google.devtools.build.lib.flags.CommandNameCache;
 import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer;
+import com.google.devtools.build.lib.flags.InvocationPolicyParser;
 import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
 import com.google.devtools.common.options.Converter;
 import com.google.devtools.common.options.OptionsParser;
@@ -64,8 +65,9 @@ public class InvocationPolicyEnforcerTestBase {
     String policyOption = "--invocation_policy=" + policyBase64;
     startupOptionsParser.parse(policyOption);
 
-    return InvocationPolicyEnforcer.create(
-        startupOptionsParser.getOptions(BlazeServerStartupOptions.class).invocationPolicy);
+    return new InvocationPolicyEnforcer(
+        InvocationPolicyParser.parsePolicy(
+            startupOptionsParser.getOptions(BlazeServerStartupOptions.class).invocationPolicy));
   }
 
   OptionsParser parser;