Skip to content

Commit 2e57f7b

Browse files
fixed tests
1 parent d51458c commit 2e57f7b

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

jgrapht-core/src/test/java/org/jgrapht/intervalgraph/IntervalGraphTest.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.jgrapht.EdgeFactory;
44
import org.jgrapht.graph.ClassBasedEdgeFactory;
55
import org.jgrapht.graph.DefaultEdge;
6+
import org.jgrapht.graph.DefaultWeightedEdge;
67
import org.jgrapht.intervalgraph.interval.Interval;
78
import org.jgrapht.intervalgraph.interval.IntervalVertex;
89
import org.jgrapht.intervalgraph.interval.IntervalVertexInterface;
@@ -20,15 +21,16 @@
2021
public class IntervalGraphTest {
2122

2223
private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultEdge, Integer, Integer> intervalGraph;
23-
private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultEdge, Integer, Integer> weightedIntervalGraph;
24+
private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultWeightedEdge, Integer, Integer> weightedIntervalGraph;
2425

2526
@Before
2627
public void setUp() {
27-
EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultEdge> edgeFactory = new ClassBasedEdgeFactory<>(DefaultEdge.class);
28+
EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultEdge> edgeFactory1 = new ClassBasedEdgeFactory<>(DefaultEdge.class);
29+
EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultWeightedEdge> edgeFactory2 = new ClassBasedEdgeFactory<>(DefaultWeightedEdge.class);
2830

29-
intervalGraph = new IntervalGraph<>(edgeFactory, false);
31+
intervalGraph = new IntervalGraph<>(edgeFactory1, false);
3032

31-
weightedIntervalGraph = new IntervalGraph<>(edgeFactory, true);
33+
weightedIntervalGraph = new IntervalGraph<>(edgeFactory2, true);
3234
}
3335

3436
@Test(expected = IllegalArgumentException.class)
@@ -140,7 +142,7 @@ public void getAllEdges() {
140142
assertTrue(edgeSet.isEmpty());
141143

142144
Set<DefaultEdge> weightedEdgeSet = weightedIntervalGraph.getAllEdges(vertex1, vertex2);
143-
assertTrue(edgeSet.contains(weightedIntervalGraph.getEdge(vertex1, vertex2)));
145+
assertTrue(weightedEdgeSet.contains(weightedIntervalGraph.getEdge(vertex1, vertex2)));
144146
assertEquals(weightedEdgeSet.size(), 1);
145147

146148
weightedEdgeSet = weightedIntervalGraph.getAllEdges(vertex1, vertex4);
@@ -467,14 +469,14 @@ public void setEdgeWeight() {
467469
IntervalVertex<Integer, Integer> vertex3 = IntervalVertex.of(3, interval3);
468470
weightedIntervalGraph.addVertex(vertex3);
469471

470-
DefaultEdge edge1 = weightedIntervalGraph.getEdge(vertex1, vertex2);
471-
DefaultEdge edge2 = weightedIntervalGraph.getEdge(vertex1, vertex3);
472+
DefaultWeightedEdge edge1 = weightedIntervalGraph.getEdge(vertex1, vertex2);
473+
DefaultWeightedEdge edge2 = weightedIntervalGraph.getEdge(vertex1, vertex3);
472474

473-
intervalGraph.setEdgeWeight(edge1, 3);
474-
intervalGraph.setEdgeWeight(edge2, 93);
475+
weightedIntervalGraph.setEdgeWeight(edge1, 3.0);
476+
weightedIntervalGraph.setEdgeWeight(edge2, 93.0);
475477

476-
assertEquals(intervalGraph.getEdgeWeight(edge1), 3);
477-
assertEquals(intervalGraph.getEdgeWeight(edge2), 93);
478+
assertEquals(3.0, weightedIntervalGraph.getEdgeWeight(edge1), 0.001);
479+
assertEquals(93.0, weightedIntervalGraph.getEdgeWeight(edge2),0.001);
478480

479481
}
480482

0 commit comments

Comments
 (0)