22
22
from pprint import pformat
23
23
from typing import Generic , TypeVar
24
24
25
+ import pytest
26
+
25
27
T = TypeVar ("T" )
26
28
27
29
@@ -185,42 +187,42 @@ def __assert_graph_edge_exists_check(
185
187
directed_graph : GraphAdjacencyList ,
186
188
edge : list [int ],
187
189
) -> None :
188
- self . assertTrue ( undirected_graph .contains_edge (edge [0 ], edge [1 ]) )
189
- self . assertTrue ( undirected_graph .contains_edge (edge [1 ], edge [0 ]) )
190
- self . assertTrue ( directed_graph .contains_edge (edge [0 ], edge [1 ]) )
190
+ assert undirected_graph .contains_edge (edge [0 ], edge [1 ])
191
+ assert undirected_graph .contains_edge (edge [1 ], edge [0 ])
192
+ assert directed_graph .contains_edge (edge [0 ], edge [1 ])
191
193
192
194
def __assert_graph_edge_does_not_exist_check (
193
195
self ,
194
196
undirected_graph : GraphAdjacencyList ,
195
197
directed_graph : GraphAdjacencyList ,
196
198
edge : list [int ],
197
199
) -> None :
198
- self . assertFalse ( undirected_graph .contains_edge (edge [0 ], edge [1 ]) )
199
- self . assertFalse ( undirected_graph .contains_edge (edge [1 ], edge [0 ]) )
200
- self . assertFalse ( directed_graph .contains_edge (edge [0 ], edge [1 ]) )
200
+ assert not undirected_graph .contains_edge (edge [0 ], edge [1 ])
201
+ assert not undirected_graph .contains_edge (edge [1 ], edge [0 ])
202
+ assert not directed_graph .contains_edge (edge [0 ], edge [1 ])
201
203
202
204
def __assert_graph_vertex_exists_check (
203
205
self ,
204
206
undirected_graph : GraphAdjacencyList ,
205
207
directed_graph : GraphAdjacencyList ,
206
208
vertex : int ,
207
209
) -> None :
208
- self . assertTrue ( undirected_graph .contains_vertex (vertex ) )
209
- self . assertTrue ( directed_graph .contains_vertex (vertex ) )
210
+ assert undirected_graph .contains_vertex (vertex )
211
+ assert directed_graph .contains_vertex (vertex )
210
212
211
213
def __assert_graph_vertex_does_not_exist_check (
212
214
self ,
213
215
undirected_graph : GraphAdjacencyList ,
214
216
directed_graph : GraphAdjacencyList ,
215
217
vertex : int ,
216
218
) -> None :
217
- self . assertFalse ( undirected_graph .contains_vertex (vertex ) )
218
- self . assertFalse ( directed_graph .contains_vertex (vertex ) )
219
+ assert not undirected_graph .contains_vertex (vertex )
220
+ assert not directed_graph .contains_vertex (vertex )
219
221
220
222
def __generate_random_edges (
221
223
self , vertices : list [int ], edge_pick_count : int
222
224
) -> list [list [int ]]:
223
- self . assertTrue ( edge_pick_count <= len (vertices ) )
225
+ assert edge_pick_count <= len (vertices )
224
226
225
227
random_source_vertices : list [int ] = random .sample (
226
228
vertices [0 : int (len (vertices ) / 2 )], edge_pick_count
@@ -281,8 +283,8 @@ def test_init_check(self) -> None:
281
283
self .__assert_graph_edge_exists_check (
282
284
undirected_graph , directed_graph , edge
283
285
)
284
- self . assertFalse ( undirected_graph .directed )
285
- self . assertTrue ( directed_graph .directed )
286
+ assert not undirected_graph .directed
287
+ assert directed_graph .directed
286
288
287
289
def test_contains_vertex (self ) -> None :
288
290
random_vertices : list [int ] = random .sample (range (101 ), 20 )
@@ -297,12 +299,8 @@ def test_contains_vertex(self) -> None:
297
299
298
300
# Test contains_vertex
299
301
for num in range (101 ):
300
- self .assertEqual (
301
- num in random_vertices , undirected_graph .contains_vertex (num )
302
- )
303
- self .assertEqual (
304
- num in random_vertices , directed_graph .contains_vertex (num )
305
- )
302
+ assert (num in random_vertices ) == undirected_graph .contains_vertex (num )
303
+ assert (num in random_vertices ) == directed_graph .contains_vertex (num )
306
304
307
305
def test_add_vertices (self ) -> None :
308
306
random_vertices : list [int ] = random .sample (range (101 ), 20 )
@@ -507,9 +505,9 @@ def test_add_vertex_exception_check(self) -> None:
507
505
) = self .__generate_graphs (20 , 0 , 100 , 4 )
508
506
509
507
for vertex in random_vertices :
510
- with self . assertRaises (ValueError ):
508
+ with pytest . raises (ValueError ):
511
509
undirected_graph .add_vertex (vertex )
512
- with self . assertRaises (ValueError ):
510
+ with pytest . raises (ValueError ):
513
511
directed_graph .add_vertex (vertex )
514
512
515
513
def test_remove_vertex_exception_check (self ) -> None :
@@ -522,9 +520,9 @@ def test_remove_vertex_exception_check(self) -> None:
522
520
523
521
for i in range (101 ):
524
522
if i not in random_vertices :
525
- with self . assertRaises (ValueError ):
523
+ with pytest . raises (ValueError ):
526
524
undirected_graph .remove_vertex (i )
527
- with self . assertRaises (ValueError ):
525
+ with pytest . raises (ValueError ):
528
526
directed_graph .remove_vertex (i )
529
527
530
528
def test_add_edge_exception_check (self ) -> None :
@@ -536,9 +534,9 @@ def test_add_edge_exception_check(self) -> None:
536
534
) = self .__generate_graphs (20 , 0 , 100 , 4 )
537
535
538
536
for edge in random_edges :
539
- with self . assertRaises (ValueError ):
537
+ with pytest . raises (ValueError ):
540
538
undirected_graph .add_edge (edge [0 ], edge [1 ])
541
- with self . assertRaises (ValueError ):
539
+ with pytest . raises (ValueError ):
542
540
directed_graph .add_edge (edge [0 ], edge [1 ])
543
541
544
542
def test_remove_edge_exception_check (self ) -> None :
@@ -560,9 +558,9 @@ def test_remove_edge_exception_check(self) -> None:
560
558
more_random_edges .append (edge )
561
559
562
560
for edge in more_random_edges :
563
- with self . assertRaises (ValueError ):
561
+ with pytest . raises (ValueError ):
564
562
undirected_graph .remove_edge (edge [0 ], edge [1 ])
565
- with self . assertRaises (ValueError ):
563
+ with pytest . raises (ValueError ):
566
564
directed_graph .remove_edge (edge [0 ], edge [1 ])
567
565
568
566
def test_contains_edge_exception_check (self ) -> None :
@@ -574,14 +572,14 @@ def test_contains_edge_exception_check(self) -> None:
574
572
) = self .__generate_graphs (20 , 0 , 100 , 4 )
575
573
576
574
for vertex in random_vertices :
577
- with self . assertRaises (ValueError ):
575
+ with pytest . raises (ValueError ):
578
576
undirected_graph .contains_edge (vertex , 102 )
579
- with self . assertRaises (ValueError ):
577
+ with pytest . raises (ValueError ):
580
578
directed_graph .contains_edge (vertex , 102 )
581
579
582
- with self . assertRaises (ValueError ):
580
+ with pytest . raises (ValueError ):
583
581
undirected_graph .contains_edge (103 , 102 )
584
- with self . assertRaises (ValueError ):
582
+ with pytest . raises (ValueError ):
585
583
directed_graph .contains_edge (103 , 102 )
586
584
587
585
0 commit comments