Skip to content

Commit 8161adf

Browse files
committed
change typos
1 parent e9ecf69 commit 8161adf

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

R/test.data.table.R

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,7 @@ test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,no
379379
}
380380
# Check UTF-8 requirement
381381
if (!isFALSE(requires_utf8)) {
382-
# Test string with common UTF-8 symbols that appear in tests: ñ (test 2266), ü (test 1229.3), ん (Japanese)
383-
# If requires_utf8 is TRUE, use the default test string; if it's a string, use that string
384-
if (isTRUE(requires_utf8)) {
385-
test_str = "a\u00F1o \u00FCber \u3093"
386-
} else {
387-
test_str = requires_utf8
388-
}
382+
test_str = if (isTRUE(requires_utf8)) "\u00F1\u00FC\u3093" else requires_utf8
389383
if (!utf8_check(test_str)) {
390384
last_utf8_skip = get0("last_utf8_skip", parent.frame(), ifnotfound=0, inherits=TRUE)
391385
if (num - last_utf8_skip >= 1) {

inst/tests/tests.Rraw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4346,8 +4346,8 @@ test(1163, last(x), character(0))
43464346

43474347
# Bug fix for #5159 - chmatch and character encoding (for some reason this seems to pass the test on a mac as well)
43484348
a<-c("a","\u00E4","\u00DF","z")
4349-
au<-iconv(a,"UTF8","latin1")
4350-
test(1164.1, requires_utf8=c("\u00E4", "\u00DF"), chmatch(a, au), match(a, au))
4349+
au<-iconv(a,"UTF8","latin1")
4350+
test(1164.1, requires_utf8=c("\u00E4", "\u00DF"), chmatch(a, au), match(a, au))
43514351

43524352
# Bug fix for #73 - segfault when rbindlist on empty data.tables
43534353
x <- as.data.table(BOD)
@@ -4653,7 +4653,7 @@ local(if (utf8_check("\u00e4\u00f6\u00fc")) {
46534653
"\u00FCberall"=c(0,0), "\u00FCberlegt" = c(0,0), abgeandert=c(2,1), abgebildet = c(0,2), abgelegt=c(0,3)))
46544654
'))
46554655
} else {
4656-
cat("Tests 1229.3 skipped because required UTF-8 symbols cannot be represented in native encoding.\n")
4656+
cat("Test 1229.3 skipped because required UTF-8 symbols cannot be represented in native encoding.\n")
46574657
})
46584658

46594659
# Test that ad hoc by detects if ordered and dogroups switches to memcpy if contiguous, #1050

0 commit comments

Comments
 (0)