[Plexus-svn] SF.net SVN: plexus:[848] trunk/plexus/src/test/java/com/phoenixst/plexus
Status: Alpha
Brought to you by:
rconner
|
From: <rc...@us...> - 2010-01-24 20:02:40
|
Revision: 848
http://plexus.svn.sourceforge.net/plexus/?rev=848&view=rev
Author: rconner
Date: 2010-01-24 20:02:33 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
Fixing the DefaultGraph deserialization tests, and adding some random graphs to be tested as well.
Modified Paths:
--------------
trunk/plexus/src/test/java/com/phoenixst/plexus/AllTests.java
trunk/plexus/src/test/java/com/phoenixst/plexus/DefaultGraphTest.java
Modified: trunk/plexus/src/test/java/com/phoenixst/plexus/AllTests.java
===================================================================
--- trunk/plexus/src/test/java/com/phoenixst/plexus/AllTests.java 2010-01-24 19:41:08 UTC (rev 847)
+++ trunk/plexus/src/test/java/com/phoenixst/plexus/AllTests.java 2010-01-24 20:02:33 UTC (rev 848)
@@ -40,6 +40,7 @@
TestSuite suite = new TestSuite( "Graph Tests" );
suite.addTest( com.phoenixst.plexus.examples.AllTests.suite() );
suite.addTest( com.phoenixst.plexus.util.AllTests.suite() );
+ suite.addTest( DefaultGraphTest.suite() );
return suite;
}
Modified: trunk/plexus/src/test/java/com/phoenixst/plexus/DefaultGraphTest.java
===================================================================
--- trunk/plexus/src/test/java/com/phoenixst/plexus/DefaultGraphTest.java 2010-01-24 19:41:08 UTC (rev 847)
+++ trunk/plexus/src/test/java/com/phoenixst/plexus/DefaultGraphTest.java 2010-01-24 20:02:33 UTC (rev 848)
@@ -27,7 +27,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import com.phoenixst.plexus.examples.RandomGraphFactory;
+
/**
* A {@link DefaultGraph} tester.
*
@@ -136,10 +138,9 @@
DefaultGraphTest copyTest = new DefaultGraphTest( (Graph) copy );
copyTest.setUp();
-// // See if the arrays are actually equal
-// assertEquals( Arrays.asList( presentNodes ), Arrays.asList( copyTest.presentNodes ) );
-// assertEquals( Arrays.asList( presentEdges ), Arrays.asList( copyTest.presentEdges ) );
-// assertEquals( Arrays.asList( notPresentEdges ), Arrays.asList( copyTest.notPresentEdges ) );
+ assertEquals( new HashSet( Arrays.asList( presentNodes ) ), new HashSet( Arrays.asList( copyTest.presentNodes ) ) );
+ assertEquals( new HashSet( Arrays.asList( presentEdges ) ), new HashSet( Arrays.asList( copyTest.presentEdges ) ) );
+ assertEquals( new HashSet( Arrays.asList( notPresentEdges ) ), new HashSet( Arrays.asList( copyTest.notPresentEdges ) ) );
}
@@ -157,4 +158,21 @@
return suite;
}
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite( "DefaultGraph Tests" );
+
+ // Use some random graphs, it's as good as anything else.
+ // DefaultGraphs that are copies of the simple examples are already
+ // covered by DefaultGraphExamplesTest.
+
+ suite.addTest( DefaultGraphTest.suite( RandomGraphFactory.createStandardGraph( 5, 0.50 ), "Random[5, 0.5]" ) );
+ suite.addTest( DefaultGraphTest.suite( RandomGraphFactory.createStandardGraph( 100, 0.01 ), "Random[100, 0.01]" ) );
+ suite.addTest( DefaultGraphTest.suite( RandomGraphFactory.createStandardGraph( 100, 0.50 ), "Random[100, 0.50]" ) );
+ suite.addTest( DefaultGraphTest.suite( RandomGraphFactory.createStandardGraph( 100, 0.99 ), "Random[100, 0.99]" ) );
+
+ return suite;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|