Skip to content

Commit 3f698ef

Browse files
committed
Remove some occurrences of partial matching
1 parent d05280c commit 3f698ef

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tests/testthat/test-coldist.R

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
test_that("Errors", {
22
data(flowers)
33

4-
expect_error(coldist(vismodel(flowers, relative = FALSE), n = c(1, 2, 3, 4, 5), achro = FALSE), "different length")
5-
expect_error(coldist(vismodel(flowers, relative = FALSE), n = c(1, 2, 3), achro = FALSE), "different length")
6-
expect_error(coldist(vismodel(flowers, relative = FALSE), subset = c("Goodenia", "Xyris", "Eucalyptus"), achro = FALSE), "Too many")
4+
expect_error(coldist(vismodel(flowers, relative = FALSE), n = c(1, 2, 3, 4, 5), achromatic = FALSE), "different length")
5+
expect_error(coldist(vismodel(flowers, relative = FALSE), n = c(1, 2, 3), achromatic = FALSE), "different length")
6+
expect_error(coldist(vismodel(flowers, relative = FALSE), subset = c("Goodenia", "Xyris", "Eucalyptus"), achromatic = FALSE), "Too many")
77
expect_error(coldist(as.matrix(vismodel(flowers)), noise = "quantum"), "quantum receptor noise model")
88
expect_error(coldist(vismodel(flowers, qcatch = "Ei")), "not compatible with hyperbolically")
99
expect_error(coldist(as.matrix(vismodel(flowers))), "quantum catches not defined")
@@ -27,7 +27,7 @@ test_that("Messages & warnings", {
2727
visual = "apis", relative = FALSE,
2828
qcatch = "Ei", vonkries = TRUE
2929
), space = "hexagon")), "unweighted Euclidean")
30-
expect_message(coldist(as.matrix(vismodel(flowers, achro = "bt.dc")), qcatch = "Qi", achromatic = TRUE), "last column ignored for chromatic contrast")
30+
expect_message(coldist(as.matrix(vismodel(flowers, achromatic = "bt.dc")), qcatch = "Qi", achromatic = TRUE), "last column ignored for chromatic contrast")
3131
expect_message(coldist(as.matrix(vismodel(flowers)), qcatch = "Qi"), "Number of cones assumed to be 4")
3232

3333
expect_message(coldist(vismodel(flowers)), "Quantum catch are relative")
@@ -40,18 +40,18 @@ test_that("Equivalent", {
4040
data(flowers)
4141

4242
expect_identical(
43-
coldist(vismodel(flowers, relative = FALSE), weber.ref = "longest", achro = FALSE),
44-
coldist(vismodel(flowers, relative = FALSE), weber.ref = 4, achro = FALSE)
43+
coldist(vismodel(flowers, relative = FALSE), weber.ref = "longest", achromatic = FALSE),
44+
coldist(vismodel(flowers, relative = FALSE), weber.ref = 4, achromatic = FALSE)
4545
)
4646

4747
expect_identical(
48-
coldist(vismodel(flowers, relative = FALSE), weber.ref = "longest", achro = FALSE),
49-
coldist(vismodel(flowers, relative = FALSE), weber.ref = 4, achro = FALSE)
48+
coldist(vismodel(flowers, relative = FALSE), weber.ref = "longest", achromatic = FALSE),
49+
coldist(vismodel(flowers, relative = FALSE), weber.ref = 4, achromatic = FALSE)
5050
)
5151

5252
expect_equal(
5353
coldist(vismodel(flowers, relative = TRUE), achromatic = FALSE),
54-
suppressWarnings(coldist(vismodel(flowers, relative = FALSE), achro = FALSE)),
54+
suppressWarnings(coldist(vismodel(flowers, relative = FALSE), achromatic = FALSE)),
5555
ignore_attr = TRUE
5656
)
5757

0 commit comments

Comments
 (0)