test simplified because we don't use factors any more

Author: gustavdelius

tests/testthat/test-project.R

@@ -243,7 +243,7 @@ test_that("Final result the same when called with sim or params", {
 # This test is motivated by the bug in 
 # https://github.com/sizespectrum/mizer/issues/173
 test_that("Dimnames on effort have correct names", {
-  gear_names <- as.character(unique(gear_params(NS_params)$gear))
+  gear_names <- unique(gear_params(NS_params)$gear)
   effort <- array(1, dim = c(3, length(gear_names)), 
                   dimnames = list(1:3,
                                   gear_names))

tests/testthat/test-project_methods.R

@@ -482,7 +482,7 @@ test_that("getRDI", {
     rdi <- getRDI(params, n, n_full)
     # test dim
     expect_length(rdi, no_sp)
-    expect_named(rdi, as.character(params@species_params$species))
+    expect_named(rdi, params@species_params$species)
     # test values
     e_repro <- getERepro(params, n = n, n_pp = n_full)
     e_repro_pop <- apply(sweep(e_repro * n, 2, params@dw, "*"), 1, sum)
@@ -506,7 +506,7 @@ test_that("getRDI is proportional to volume", {
 test_that("getRDD", {
     rdd <- getRDD(params, n, n_full)
     expect_length(rdd, no_sp)
-    expect_named(rdd, as.character(params@species_params$species))
+    expect_named(rdd, params@species_params$species)
     rdi <- getRDI(params, n, n_full)
     rdd2 <- getRDD(params, n, n_full, rdi = rdi)
     expect_identical(rdd, rdd2)

tests/testthat/test-selectivity_funcs.R

@@ -12,10 +12,10 @@ test_that("knife-edge selectivity function is working properly", {
     # Chop off l25, l50, a and b columns - the trawl selectivity
     NS_species_params_gears <- NS_species_params_gears[,!(colnames(NS_species_params_gears) %in% c("l25","l50","a","b"))]
     params <- newMultispeciesParams(NS_species_params_gears, inter, info_level = 0)
-    industrial_species <- as.character(NS_species_params_gears$species[NS_species_params_gears$gear == "Industrial"])
-    pelagic_species <- as.character(NS_species_params_gears$species[NS_species_params_gears$gear == "Pelagic"])
-    beam_trawl_species <- as.character(NS_species_params_gears$species[NS_species_params_gears$gear == "Beam"])
-    otter_trawl_species <- as.character(NS_species_params_gears$species[NS_species_params_gears$gear == "Otter"])
+    industrial_species <- NS_species_params_gears$species[NS_species_params_gears$gear == "Industrial"]
+    pelagic_species <- NS_species_params_gears$species[NS_species_params_gears$gear == "Pelagic"]
+    beam_trawl_species <- NS_species_params_gears$species[NS_species_params_gears$gear == "Beam"]
+    otter_trawl_species <- NS_species_params_gears$species[NS_species_params_gears$gear == "Otter"]
 
     expect_true(all(params@selectivity["Industrial",industrial_species,params@w < 500] == 0))
     expect_true(all(params@selectivity["Industrial",industrial_species,params@w >= 500] == 1))

tests/testthat/test-setFishing.R

@@ -260,7 +260,6 @@ test_that("Duplicate gear-species pairs give error", {
 
 test_that("Non-existing species give error", {
     gp <- NS_params@gear_params
-    gp$species <- as.character(gp$species)
     gp$species[[1]] <- "test"
     expect_error(gear_params(params) <- gp,
                  "The gear_params dataframe contains species that do not exist in the model.")