reenable testNulls()

Author: fluentfuture

dot-parse/src/main/java/com/google/common/labs/parse/Parser.java

@@ -497,23 +497,23 @@ public static Parser<Integer> bmpCodeUnit() {
   /**
    * Sequentially matches {@code left} then {@code right}, and then combines the results using the
    * {@code combiner} function.
-   *
-   * @since 10.0
    */
   public static <A, B, C> Parser<C> sequence(
-      Parser<A> left, Production<B> right, BiFunction<? super A, ? super B, ? extends C> combiner) {
-    return sequence(left, maybeZeroWidth(right), combiner);
+      Parser<A> left, Parser<B> right, BiFunction<? super A, ? super B, ? extends C> combiner) {
+    requireNonNull(right);
+    requireNonNull(combiner);
+    return left.flatMap(v1 -> right.map(v2 -> combiner.apply(v1, v2)));
   }
 
   /**
    * Sequentially matches {@code left} then {@code right}, and then combines the results using the
    * {@code combiner} function.
+   *
+   * @since 10.0
    */
   public static <A, B, C> Parser<C> sequence(
-      Parser<A> left, Parser<B> right, BiFunction<? super A, ? super B, ? extends C> combiner) {
-    requireNonNull(right);
-    requireNonNull(combiner);
-    return left.flatMap(v1 -> right.map(v2 -> combiner.apply(v1, v2)));
+      Parser<A> left, Production<B> right, BiFunction<? super A, ? super B, ? extends C> combiner) {
+    return sequence(left, maybeZeroWidth(right), combiner);
   }
 
   /**

dot-parse/src/main/java/com/google/common/labs/parse/Production.java

@@ -3,7 +3,6 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import com.google.common.labs.parse.Parser.OrEmpty;
 import com.google.common.labs.parse.Parser.ParseException;
 import com.google.mu.util.CharPredicate;
 
@@ -16,7 +15,7 @@
  *
  * @since 10.0
  */
-public sealed interface Production<T> permits Parser, OrEmpty {
+public sealed interface Production<T> permits Parser, Parser.OrEmpty {
 
   /**
    * Parses the entire input string and returns the result. Upon successful return, the {@code

dot-parse/src/test/java/com/google/common/labs/parse/ParserTest.java

@@ -36,11 +36,11 @@
 import java.io.StringReader;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collector;
 import java.util.stream.Stream;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -52,7 +52,10 @@
 import com.google.common.labs.parse.Parser.ParseException;
 import com.google.common.testing.NullPointerTester;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.mu.function.Function4;
+import com.google.mu.function.TriFunction;
 import com.google.mu.util.CharPredicate;
+import com.google.mu.util.stream.BiCollector;
 
 @RunWith(JUnit4.class)
 public class ParserTest {
@@ -536,15 +539,19 @@ public void bmpCodeUnit_emoji() {
   }
 
   @Test
-  @Ignore("Production is a sealed interface, unsupported by NPT")
   public void testNulls() throws Exception {
     NullPointerTester tester =
         new NullPointerTester()
             .setDefault(Parser.class, string("a"))
             .setDefault(Parser.OrEmpty.class, string("a").orElse("default"))
             .setDefault(String.class, "test")
             .setDefault(char.class, '`');
-    tester.testAllPublicStaticMethods(Parser.class);
+    tester
+        .ignore(Parser.class.getMethod("sequence", Parser.class, Production.class, BiFunction.class))
+        .ignore(Parser.class.getMethod("sequence", Parser.class, Production.class, Production.class, TriFunction.class))
+        .ignore(Parser.class.getMethod("sequence", Parser.class, Production.class, Production.class, Production.class, Function4.class))
+        .ignore(Parser.class.getMethod("zeroOrMoreDelimited", Parser.class, Production.class, String.class, BiCollector.class))
+        .testAllPublicStaticMethods(Parser.class);
     tester
         .ignore(Parser.class.getMethod("orElse", Object.class))
         .ignore(Parser.class.getMethod("thenReturn", Object.class))