Add Generators: Simplified builders for generator set elements.

Author: kerrykimbrough

tcases-io/src/test/java/org/cornutum/tcases/generator/io/GeneratorsTest.java

@@ -0,0 +1,55 @@
+//////////////////////////////////////////////////////////////////////////////
+// 
+//                    Copyright 2023, Cornutum Project
+//                             www.cornutum.org
+//
+//////////////////////////////////////////////////////////////////////////////
+
+package org.cornutum.tcases.generator.io;
+
+import org.cornutum.tcases.generator.Generators;
+import org.cornutum.tcases.generator.IGeneratorSet;
+import static org.cornutum.tcases.generator.Generators.*;
+
+import org.junit.Test;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * Runs tests for the builder interfaces in {@link Generators}
+ */
+public class GeneratorsTest
+  {
+  @Test
+  public void buildExample()
+    {
+    // Given...
+    IGeneratorSet expected = generatorSetResources_.readJson( "generator-example.json");
+    
+    // When...
+    IGeneratorSet generators =
+      generators()
+
+      .generatingByDefault(
+        tuples( 2)
+        .seed( 123456789)
+        .combining(
+          tuplesOf( 3)
+          .include( "V-0.**", "V-1")
+          .exclude( "V-0.V-0-1")
+          .using(
+            once(
+              whenVar( "V-0.V-0-2").is( "L-0-2_2"),
+              whenVar( "V-0.V-0-3").is( "L-0-3_2"),
+              whenVar( "V-0.V-0-0").is( "L-0-0_2")))))
+
+      .generatingFor( "F", tuples().combining( tuplesOf( 2).include( "V-0.V-0-0", "V-1")))
+
+      .build();
+
+    // Then...
+    assertThat( "Generators", generators, is( expected));
+    }
+
+  private GeneratorSetResources generatorSetResources_ = new GeneratorSetResources( TestGeneratorSetJson.class);
+  }

tcases-io/src/test/resources/org/cornutum/tcases/generator/io/generator-example.json

@@ -0,0 +1,37 @@
+{
+    "*": {
+        "tuples": 2,
+        "seed": 123456789,
+        "combiners": [
+            {
+                "tuples": 3,
+                "include": [
+                    "V-0.**",
+                    "V-1"
+                ],
+                "exclude": [
+                    "V-0.V-0-1"
+                ],
+                "once": [
+                    {
+                        "V-0.V-0-2": "L-0-2_2",
+                        "V-0.V-0-3": "L-0-3_2",
+                        "V-0.V-0-0": "L-0-0_2"
+                    }
+                ]
+            }
+        ]
+    },
+
+    "F": {
+        "combiners": [
+            {
+                "tuples": 2,
+                "include": [
+                    "V-0.V-0-0",
+                    "V-1"
+                ]
+            }
+        ]
+    }
+}

tcases-lib/src/main/java/org/cornutum/tcases/VarBindingBuilder.java

@@ -95,6 +95,14 @@ public VarBindingBuilder var( String var)
     return this;
     }
 
+  /**
+   * Changes the binding variable value.
+   */
+  public VarBindingBuilder is( Object value)
+    {
+    return value( value);
+    }
+
   /**
    * Changes the binding variable value.
    */
@@ -143,6 +151,14 @@ public VarBindingBuilder notApplicable( boolean na)
     return this;
     }
 
+  /**
+   * Changes this binding to "not applicable".
+   */
+  public VarBindingBuilder isNA()
+    {
+    return notApplicable();
+    }
+
   /**
    * Changes this binding to "not applicable".
    */

tcases-lib/src/main/java/org/cornutum/tcases/generator/GeneratorSetBuilder.java

@@ -70,6 +70,22 @@ public GeneratorSetBuilder start( GeneratorSet generatorSet)
     return this;
     }
 
+  /**
+   * Adds a generator to this set for the given function.
+   */
+  public GeneratorSetBuilder generatingFor( String functionName, TupleGeneratorBuilder generator)
+    {
+    return generator( functionName, generator.build());
+    }
+
+  /**
+   * Adds a default generator to this set.
+   */
+  public GeneratorSetBuilder generatingByDefault( TupleGeneratorBuilder generator)
+    {
+    return defaultGenerator( generator.build());
+    }
+
   /**
    * Adds a generator to this set for the given function.
    */

tcases-lib/src/main/java/org/cornutum/tcases/generator/Generators.java

@@ -0,0 +1,75 @@
+//////////////////////////////////////////////////////////////////////////////
+// 
+//                    Copyright 2023, Cornutum Project
+//                             www.cornutum.org
+//
+//////////////////////////////////////////////////////////////////////////////
+
+package org.cornutum.tcases.generator;
+
+import org.cornutum.tcases.VarBindingBuilder;
+
+import java.util.Arrays;
+
+/**
+ * Defines methods to build elements of a {@link GeneratorSet}.
+ */
+public final class Generators
+  {
+  /**
+   * Creates a new Generators instance.
+   */
+  private Generators()
+    {
+    // Static methods only
+    }
+
+  /**
+   * Returns a new {@link GeneratorSetBuilder}.
+   */
+  public static GeneratorSetBuilder generators()
+    {
+    return new GeneratorSetBuilder();
+    }
+
+  /**
+   * Returns a new {@link TupleGeneratorBuilder} with the given default tuple size.
+   */
+  public static TupleGeneratorBuilder tuples( int tupleSize)
+    {
+    return new TupleGeneratorBuilder().tuples( tupleSize);
+    }
+
+  /**
+   * Returns a new {@link TupleGeneratorBuilder} with default tuple size 1.
+   */
+  public static TupleGeneratorBuilder tuples()
+    {
+    return tuples( 1);
+    }
+
+  /**
+   * Returns a new {@link TupleCombinerBuilder} with the given tuple size.
+   */
+  public static TupleCombinerBuilder tuplesOf( int tupleSize)
+    {
+    return new TupleCombinerBuilder().tuples( tupleSize);
+    }
+
+  /**
+   * Returns a {@link TupleRefBuilder} for new "once" tuple.
+   */
+  public static TupleRefBuilder once( VarBindingBuilder... bindings)
+    {
+    return new TupleRefBuilder().bindings( Arrays.stream( bindings).map( VarBindingBuilder::build));
+    }
+
+  /**
+   * Returns a {@link VarBindingBuilder} for the given variable.
+   */
+  public static VarBindingBuilder whenVar( String varPath)
+    {
+    return VarBindingBuilder.with( varPath);
+    }
+
+  }

tcases-lib/src/main/java/org/cornutum/tcases/generator/TupleCombinerBuilder.java

@@ -8,6 +8,7 @@
 
 package org.cornutum.tcases.generator;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -158,6 +159,14 @@ public TupleCombinerBuilder once( TupleRef... tupleRefs)
     return this;
     }
 
+  /**
+   * Adds the given once-only tuples to this combiner.
+   */
+  public TupleCombinerBuilder using( TupleRefBuilder... tupleRefs)
+    {
+    return once( Arrays.stream( tupleRefs).map( TupleRefBuilder::build));
+    }
+
   /**
    * Adds the given once-only tuples to this combiner.
    */

tcases-lib/src/main/java/org/cornutum/tcases/generator/TupleGeneratorBuilder.java

@@ -8,6 +8,7 @@
 
 package org.cornutum.tcases.generator;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -89,6 +90,22 @@ public TupleGeneratorBuilder seed( Long seed)
     return this;
     }
 
+  /**
+   * Changes the random number sequence seed for this generator.
+   */
+  public TupleGeneratorBuilder seed( int seed)
+    {
+    return seed( (long) seed);
+    }
+
+  /**
+   * Add the given {@link TupleCombiner} instances to this generator.
+   */
+  public TupleGeneratorBuilder combining( TupleCombinerBuilder... combiners)
+    {
+    return combiners( Arrays.stream( combiners).map( TupleCombinerBuilder::build));
+    }
+
   /**
    * Add the given {@link TupleCombiner} instances to this generator.
    */