fix test, NAMESPACE

mlr-org · Jun 26, 2017 · a3d2c6a · a3d2c6a
1 parent e94c9ee
commit a3d2c6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -137,8 +137,8 @@ export(isSpecialValue)
 export(isVector)
 export(isVectorTypeString)
 export(makeCharacterLearnerParam)
-export(makeCharacterLearnerVectorParam)
 export(makeCharacterParam)
+export(makeCharacterVectorLearnerParam)
 export(makeCharacterVectorParam)
 export(makeDiscreteLearnerParam)
 export(makeDiscreteParam)

diff --git a/man/LearnerParam.Rd b/man/LearnerParam.Rd
diff --git a/tests/testthat/test_LearnerParam.R b/tests/testthat/test_LearnerParam.R
@@ -72,7 +72,7 @@ test_that("disc vec", {
 
 test_that("function", {
   p = makeFunctionLearnerParam("f1")
-  expect_equal(p$id, "x")
+  expect_equal(p$id, "f1")
   expect_true(!isFeasible(p, "a"))
   expect_true(isFeasible(p, identity))
   expect_true(isFeasible(p, function(x) x^2))
@@ -84,16 +84,17 @@ test_that("function", {
 test_that("character", {
   p = makeCharacterLearnerParam("c")
   expect_equal(p$id, "c")
-  expect_true(isFeasible(p, "a"))
-  expect_true(!isFeasible(p, "ab"))
+  expect_true(isFeasible(p, "ab"))
+  expect_true(!isFeasible(p, c("a","b")))
+  expect_true(!isFeasible(p, 1))
 })
 
 test_that("character vec", {
   p = makeCharacterVectorLearnerParam("cv")
   expect_equal(p$id, "cv")
   expect_true(isFeasible(p, "a"))
-  expect_true(isFeasible(p, c("a","b")))
-  expect_true(!isFeasible(p, "ab"))
+  expect_true(isFeasible(p, c("a","b","a")))
+  expect_true(!isFeasible(p, 1:3))
 })
 
 test_that("untyped", {