@@ -214,28 +214,24 @@ test_that("t() is aliased to edge reversal for graphs", {
214214})
215215
216216test_that(" vertices() works" , {
217- g_all_unnamed <- suppressWarnings( make_empty_graph(1 ) + vertices(" a" , " b" ) )
217+ g_all_unnamed <- make_empty_graph(1 ) + vertices(" a" , " b" )
218218 expect_s3_class(V(g_all_unnamed ), " igraph.vs" )
219219 expect_identical(V(g_all_unnamed )$ name , c(NA , " a" , " b" ))
220220
221- g_mix_named_unnamed <- suppressWarnings(
222- make_empty_graph(1 ) + vertices(" a" , " b" , foo = 5 )
223- )
221+ g_mix_named_unnamed <- make_empty_graph(1 ) + vertices(" a" , " b" , foo = 5 )
224222 expect_s3_class(V(g_mix_named_unnamed ), " igraph.vs" )
225223 expect_true(is.na(V(g_mix_named_unnamed )$ name [1 ]))
226224 expect_identical(V(g_mix_named_unnamed )$ name [- 1 ], c(" a" , " b" ))
227225 expect_equal(V(g_mix_named_unnamed )$ foo , c(NA , 5 , 5 ))
228226
229- g_mix_bigger_attribute <- suppressWarnings(
230- make_empty_graph(1 ) +
231- vertices(" a" , " b" , " c" , foo = 5 : 7 , bar = 8 )
232- )
227+ g_mix_bigger_attribute <- make_empty_graph(1 ) +
228+ vertices(" a" , " b" , " c" , foo = 5 : 7 , bar = 8 )
233229 expect_s3_class(V(g_mix_bigger_attribute ), " igraph.vs" )
234230 expect_identical(V(g_mix_bigger_attribute )$ name , c(NA , " a" , " b" , " c" ))
235231 expect_equal(V(g_mix_bigger_attribute )$ foo , c(NA , 5 , 6 , 7 ))
236232 expect_equal(V(g_mix_bigger_attribute )$ bar , c(NA , 8 , 8 , 8 ))
237233
238- g_one_unnamed <- suppressWarnings( make_empty_graph(1 ) + vertices(letters ) )
234+ g_one_unnamed <- make_empty_graph(1 ) + vertices(letters )
239235 expect_s3_class(V(g_one_unnamed ), " igraph.vs" )
240236 expect_identical(V(g_one_unnamed )$ name , c(NA , letters ))
241237
@@ -253,9 +249,9 @@ test_that("vertices() works", {
253249 expect_s3_class(V(g_none ), " igraph.vs" )
254250 expect_null(V(g_none )$ name )
255251
256- expect_snapshot_error(suppressWarnings(
252+ expect_snapshot_error(
257253 make_empty_graph(1 ) + vertices(" a" , " b" , foo = 5 : 7 )
258- ))
254+ )
259255})
260256
261257test_that(" vertices() errors on duplicate attribute names" , {
@@ -280,39 +276,40 @@ test_that("vertices() errors on duplicate attribute names", {
280276 )
281277})
282278
283- test_that(" adding named vertices to unnamed graphs warns " , {
279+ test_that(" adding named vertices to non-empty unnamed graphs errors " , {
284280 # Test with vertex() function
285- expect_warning(
286- make_ring(10 ) + vertex(1 ),
287- " Adding named vertices to an unnamed graph"
281+ expect_snapshot_error(
282+ make_ring(10 ) + vertex(1 )
288283 )
289284
290- expect_warning(
291- make_ring(10 ) + vertex(" a" ),
292- " Adding named vertices to an unnamed graph"
285+ expect_snapshot_error(
286+ make_ring(10 ) + vertex(" a" )
293287 )
294288
295- expect_warning(
296- make_ring(10 ) + vertices(" a" , " b" ),
297- " Adding named vertices to an unnamed graph"
289+ expect_snapshot_error(
290+ make_ring(10 ) + vertices(" a" , " b" )
298291 )
299292
300293 # Test with character vector
301- expect_warning(
302- make_ring(10 ) + c(" a" , " b" ),
303- " Adding named vertices to an unnamed graph"
294+ expect_snapshot_error(
295+ make_ring(10 ) + c(" a" , " b" )
304296 )
305297
306- # No warning when adding to named graph
298+ # No error when adding to named graph
307299 g <- make_ring(10 )
308300 V(g )$ name <- letters [1 : 10 ]
309- expect_no_warning(g + vertex(" k" ))
310- expect_no_warning(g + c(" x" , " y" ))
311-
312- # No warning when adding unnamed vertices
313- expect_no_warning(make_ring(10 ) + vertex(foo = 5 ))
314- expect_no_warning(make_ring(10 ) + vertices(foo = 1 : 3 ))
315- expect_no_warning(make_ring(10 ) + 5 )
301+ expect_no_error(g + vertex(" k" ))
302+ expect_no_error(g + c(" x" , " y" ))
303+
304+ # No error when adding unnamed vertices
305+ expect_no_error(make_ring(10 ) + vertex(foo = 5 ))
306+ expect_no_error(make_ring(10 ) + vertices(foo = 1 : 3 ))
307+ expect_no_error(make_ring(10 ) + 5 )
308+
309+ # No error when adding to empty graph
310+ expect_no_error(make_empty_graph() + vertex(" a" ))
311+ expect_no_error(make_empty_graph() + c(" a" , " b" ))
312+ expect_no_error(make_empty_graph() + vertices(" a" , " b" ))
316313})
317314
318315
0 commit comments