diff --git a/src/test/org/apache/commons/graph/algorithm/dataflow/DataFlowSolutionsTest.java b/src/test/org/apache/commons/graph/algorithm/dataflow/DataFlowSolutionsTest.java
new file mode 100644
index 0000000..8a657f7
--- /dev/null
+++ b/src/test/org/apache/commons/graph/algorithm/dataflow/DataFlowSolutionsTest.java
@@ -0,0 +1,344 @@
+package org.apache.commons.graph.algorithm.dataflow;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Commons" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Commons", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ */
+
+import org.apache.commons.graph.*;
+
+import java.util.BitSet;
+
+import junit.framework.*;
+
+public class DataFlowSolutionsTest extends GraphTest {
+ private static BitSet BS_000 = null;
+ private static BitSet BS_001 = null;
+ private static BitSet BS_010 = null;
+ private static BitSet BS_011 = null;
+ private static BitSet BS_100 = null;
+ private static BitSet BS_101 = null;
+ private static BitSet BS_110 = null;
+ private static BitSet BS_111 = null;
+
+ static {
+ BS_000 = new BitSet();
+ BS_001 = new BitSet();
+ BS_010 = new BitSet();
+ BS_011 = new BitSet();
+ BS_100 = new BitSet();
+ BS_101 = new BitSet();
+ BS_110 = new BitSet();
+ BS_111 = new BitSet();
+
+ BS_001.set( 3 );
+ BS_011.set( 3 );
+ BS_101.set( 3 );
+ BS_111.set( 3 );
+
+ BS_010.set( 2 );
+ BS_011.set( 2 );
+ BS_110.set( 2 );
+ BS_111.set( 2 );
+
+ BS_100.set( 1 );
+ BS_101.set( 1 );
+ BS_110.set( 1 );
+ BS_111.set( 1 );
+ }
+
+ public DataFlowSolutionsTest( String name ) {
+ super( name );
+ }
+
+ public void testBitSetEquals() throws Throwable {
+ BitSet one = new BitSet();
+ BitSet two = new BitSet();
+
+ one.set( 15 );
+ two.set( 15 );
+
+ assertTrue( one.equals( two ));
+ }
+
+ /**
+ * Test a single Vertex.
+ *
+ * @ [ gen (1) ] --> [ leaves(1) ]
+ *
+ * @ [ gen (1) kill(1) ] --> [ ]
+ *
+ * @ [ ] --> [ ]
+ */
+ public void testOneGraph() throws Throwable {
+ DirectedGraph graph = makeDirSingleVertex();
+
+ BitSet clear = new BitSet();
+ BitSet gen = new BitSet();
+ BitSet kill = new BitSet();
+ BitSet leaves = new BitSet();
+
+ DataFlowSolutions IUT = null;
+ MockDataFlowEq dfe = null;
+
+ dfe = new MockDataFlowEq();
+
+ dfe.addVertex( V1, BS_100, BS_000 );
+
+ IUT = new DataFlowSolutions( graph, dfe );
+ assertEquals( "Expected nothing to reach V1.",
+ BS_000, IUT.reaches( V1 ));
+ assertEquals( "Expected 1 to leave V1.",
+ BS_100, IUT.leaves( V1 ) );
+
+
+ dfe = new MockDataFlowEq();
+ dfe.addVertex( V1, BS_100, BS_100 );
+
+ IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals( "Expected nothing to reach V1.",
+ BS_000, IUT.reaches( V1 ));
+ assertEquals( "Expected nothing to leave V1.",
+ BS_000, IUT.leaves( V1 ) );
+
+ dfe = new MockDataFlowEq();
+ dfe.addVertex( V1, BS_000, BS_100 );
+
+ IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals( "Expected nothing to leave V1.",
+ BS_000, IUT.leaves( V1 ) );
+ assertEquals( "Expected nothing to reach V1.",
+ BS_000, IUT.reaches( V1 ) );
+ }
+
+ /**
+ * Test two vertices
+ *
+ * gen(V1) = (1,2)
+ * kill(V2) = (1,2)
+ * leaves(V1) = (1,2)
+ * reaches(V1) = ()
+ * leaves(V2) = ()
+ * reaches(V2) = (1,2)
+ */
+ public void testTwoVerts0()
+ throws Throwable
+ {
+ DirectedGraph graph = makeDirectedEdge();
+ MockDataFlowEq dfe = new MockDataFlowEq();
+
+ BitSet genV1 = new BitSet();
+ genV1.set( 1 );
+ genV1.set( 2 );
+
+ dfe.addVertex( V1, BS_110, BS_000 );
+ dfe.addVertex( V2, BS_000, BS_110 );
+
+ DataFlowSolutions IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals( "Expected 1 and 2 to leave V1",
+ BS_110, IUT.leaves( V1 ));
+ assertEquals( "Expected nothing to reach V1",
+ BS_000, IUT.reaches( V1 ));
+
+ assertEquals( "Expected 1 and 2 to reach V2",
+ BS_110, IUT.reaches( V2 ));
+ assertEquals( "Expected nothing to leave V2",
+ BS_000, IUT.leaves( V2 ));
+ }
+
+ /**
+ * Test two vertices
+ *
+ * gen(V1) = (1,2)
+ * kill(V2) = (1)
+ * leaves(V1) = (1,2)
+ * reaches(V1) = ()
+ * leaves(V2) = (2)
+ * reaches(V2) = (1,2)
+ */
+ public void testTwoVerts1()
+ throws Throwable
+ {
+ DirectedGraph graph = makeDirectedEdge();
+ MockDataFlowEq dfe = new MockDataFlowEq();
+
+ dfe.addVertex( V1, BS_110, BS_000 );
+ dfe.addVertex( V2, BS_000, BS_100 );
+
+ DataFlowSolutions IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals( "Expected 1 and 2 to leave V1",
+ BS_110, IUT.leaves( V1 ));
+ assertEquals( "Expected nothing to reach V1",
+ BS_000, IUT.reaches( V1 ));
+
+ assertEquals( "Expected 1 and 2 to reach V2",
+ BS_110, IUT.reaches( V2 ));
+ assertEquals( "Expected 2 to leave V2",
+ BS_010, IUT.leaves( V2 ));
+ }
+
+ /**
+ * Test two vertices
+ *
+ * gen(V1) = (1)
+ * kill(v1) = ()
+ *
+ * gen(V2) = (2)
+ * kill(V2) = (1)
+ *
+ * leaves(V1) = (1)
+ * reaches(V1) = ()
+ *
+ * leaves(V2) = (2)
+ * reaches(V2) = (1)
+ */
+ public void testTwoVerts2()
+ throws Throwable
+ {
+ DirectedGraph graph = makeDirectedEdge();
+ MockDataFlowEq dfe = new MockDataFlowEq();
+
+ BitSet genV1 = new BitSet();
+ genV1.set( 1 );
+
+ dfe.addVertex( V1, BS_100, BS_000 );
+ dfe.addVertex( V2, BS_010, BS_100 );
+
+ DataFlowSolutions IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals( "Expected 1 to leave V1",
+ BS_100, IUT.leaves( V1 ));
+ assertEquals( "Expected nothing to reach V1",
+ BS_000, IUT.reaches( V1 ));
+
+ assertEquals( "Expected 1 to reach V2",
+ BS_100, IUT.reaches( V2 ));
+ assertEquals( "Expected 2 to leave V2",
+ BS_010, IUT.leaves( V2 ));
+ }
+
+ /**
+ * Test with a Cycle:
+ *
+ * * +1
+ * / \
+ * +2 *---* +3
+ *
+ * 1, 2, 3 reach all and leave all.
+ */
+ public void testCycle0()
+ throws Throwable
+ {
+ DirectedGraph graph = makeDirectedCycle();
+ MockDataFlowEq dfe = new MockDataFlowEq();
+
+ dfe.addVertex( V1, BS_100, BS_000);
+ dfe.addVertex( V2, BS_010, BS_000);
+ dfe.addVertex( V3, BS_001, BS_000);
+
+ DataFlowSolutions IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals("Expecting all to reach V1",
+ BS_111, IUT.reaches( V1 ));
+ assertEquals("Expecting all to reach V2",
+ BS_111, IUT.reaches( V2 ));
+ assertEquals("Expecting all to reach V3",
+ BS_111, IUT.reaches( V3 ));
+
+ assertEquals("Expecting all to leave V1",
+ BS_111, IUT.leaves( V1 ));
+ assertEquals("Expecting all to leave V2",
+ BS_111, IUT.leaves( V2 ));
+ assertEquals("Expecting all to leave V3",
+ BS_111, IUT.leaves( V3 ));
+ }
+
+ /**
+ * Test with a Cycle:
+ *
+ * * +1 -3
+ * / \
+ * +2 -1 *---* +3 -2
+ *
+ */
+ public void testCycle1()
+ throws Throwable
+ {
+ DirectedGraph graph = makeDirectedCycle();
+ MockDataFlowEq dfe = new MockDataFlowEq();
+
+ dfe.addVertex( V1, BS_100, BS_001);
+ dfe.addVertex( V2, BS_010, BS_100);
+ dfe.addVertex( V3, BS_001, BS_010);
+
+ DataFlowSolutions IUT = new DataFlowSolutions( graph, dfe );
+
+ assertEquals("Expecting 3 to reach V1",
+ BS_001, IUT.reaches( V1 ));
+ assertEquals("Expecting 1 to reach V2",
+ BS_100, IUT.reaches( V2 ));
+ assertEquals("Expecting 2 to reach V3",
+ BS_010, IUT.reaches( V3 ));
+
+ assertEquals("Expecting 1 to leave V1",
+ BS_100, IUT.leaves( V1 ));
+ assertEquals("Expecting 2 to leave V2",
+ BS_010, IUT.leaves( V2 ));
+ assertEquals("Expecting 3 to leave V3",
+ BS_001, IUT.leaves( V3 ));
+ }
+
+}
diff --git a/src/test/org/apache/commons/graph/algorithm/dataflow/MockDataFlowEq.java b/src/test/org/apache/commons/graph/algorithm/dataflow/MockDataFlowEq.java
new file mode 100644
index 0000000..00049f9
--- /dev/null
+++ b/src/test/org/apache/commons/graph/algorithm/dataflow/MockDataFlowEq.java
@@ -0,0 +1,83 @@
+package org.apache.commons.graph.algorithm.dataflow;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Commons" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Commons", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ */
+
+import java.util.Map;
+import java.util.BitSet;
+import java.util.HashMap;
+
+import org.apache.commons.graph.*;
+
+public class MockDataFlowEq
+ implements DataFlowEquations
+{
+ private Map generates = new HashMap(); // VERTEX X BITSET
+ private Map kills = new HashMap(); // VERTEX X BITSET
+
+ public MockDataFlowEq() { }
+
+ public void addVertex( Vertex v, BitSet generate, BitSet kill ) {
+ generates.put( v, generate );
+ kills.put( v, kill );
+ }
+
+ public BitSet generates( Vertex v ) {
+ return (BitSet) generates.get( v );
+ }
+
+ public BitSet kills( Vertex v ) {
+ return (BitSet) kills.get( v );
+ }
+}