You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/03/08 00:58:16 UTC
svn commit: r1298233 - in
/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc:
CheriyanMehlhornGabowTestCase.java KosarajuSharirTestCase.java
TarjanTestCase.java
Author: simonetripodi
Date: Wed Mar 7 23:58:15 2012
New Revision: 1298233
URL: http://svn.apache.org/viewvc?rev=1298233&view=rev
Log:
fixed compilation issues
Modified:
commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowTestCase.java
commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/KosarajuSharirTestCase.java
commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java
Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowTestCase.java?rev=1298233&r1=1298232&r2=1298233&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowTestCase.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowTestCase.java Wed Mar 7 23:58:15 2012
@@ -45,15 +45,15 @@ public final class CheriyanMehlhornGabow
@Test( expected = NullPointerException.class )
public void testNullGraph()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph = null;
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph = null;
findStronglyConnectedComponent( graph ).applyingCheriyanMehlhornGabow();
}
@Test
public void testEmptyGraph()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- new DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer>();
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ new DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>();
findStronglyConnectedComponent( graph ).applyingCheriyanMehlhornGabow();
}
@@ -61,8 +61,8 @@ public final class CheriyanMehlhornGabow
@Test
public void testSparse()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- newDirectedMutableWeightedGraph( new AbstractGraphConnection<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>()
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ newDirectedMutableGraph( new AbstractGraphConnection<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>()
{
@Override
@@ -85,7 +85,7 @@ public final class CheriyanMehlhornGabow
assertEquals( actual.size(), expected );
}
-
+
@Test
public void verifyHasStronglyConnectedComponents()
{
@@ -140,7 +140,7 @@ public final class CheriyanMehlhornGabow
expected.add( scc3 );
Set<Set<BaseLabeledVertex>> actual = findStronglyConnectedComponent( graph ).applyingCheriyanMehlhornGabow();
-
+
assertFalse( actual.isEmpty() );
assertEquals( expected, actual );
}
Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/KosarajuSharirTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/KosarajuSharirTestCase.java?rev=1298233&r1=1298232&r2=1298233&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/KosarajuSharirTestCase.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/KosarajuSharirTestCase.java Wed Mar 7 23:58:15 2012
@@ -45,7 +45,7 @@ public final class KosarajuSharirTestCas
@Test( expected = NullPointerException.class )
public void testNullGraph()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph = null;
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph = null;
findStronglyConnectedComponent( graph ).applyingKosarajuSharir();
}
@@ -54,8 +54,8 @@ public final class KosarajuSharirTestCas
{
final BaseLabeledVertex a = null;
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- new DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer>();
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ new DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>();
findStronglyConnectedComponent( graph ).applyingKosarajuSharir( a );
}
@@ -63,8 +63,8 @@ public final class KosarajuSharirTestCas
@Test( expected = IllegalStateException.class )
public void testNotExistVertex()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- new DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer>();
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ new DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>();
findStronglyConnectedComponent( graph ).applyingKosarajuSharir( new BaseLabeledVertex( "NOT EXISTS" ) );
}
Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java?rev=1298233&r1=1298232&r2=1298233&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java Wed Mar 7 23:58:15 2012
@@ -45,15 +45,15 @@ public final class TarjanTestCase
@Test( expected = NullPointerException.class )
public void testNullGraph()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph = null;
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph = null;
findStronglyConnectedComponent( graph ).applyingTarjan();
}
@Test
public void testEmptyGraph()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- new DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer>();
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ new DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>();
findStronglyConnectedComponent( graph ).applyingTarjan();
}
@@ -61,8 +61,8 @@ public final class TarjanTestCase
@Test
public void testSparse()
{
- DirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>, Integer> graph =
- newDirectedMutableWeightedGraph( new AbstractGraphConnection<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>()
+ DirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>> graph =
+ newDirectedMutableGraph( new AbstractGraphConnection<BaseLabeledVertex, BaseLabeledWeightedEdge<Integer>>()
{
@Override
@@ -85,7 +85,7 @@ public final class TarjanTestCase
assertEquals( actual.size(), expected );
}
-
+
@Test
public void verifyHasStronglyConnectedComponents()
{
@@ -140,7 +140,7 @@ public final class TarjanTestCase
expected.add( scc3 );
Set<Set<BaseLabeledVertex>> actual = findStronglyConnectedComponent( graph ).applyingTarjan();
-
+
assertFalse( actual.isEmpty() );
assertEquals( expected, actual );
}