X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2Ftests%2Ftestthat%2Ftest-DateIntegerConv.R;fp=pkg%2Ftests%2Ftestthat%2Ftest.dateIndexToInteger.R;h=99e5fa52cbbbe0c9d3f7a652a4d526220ca328c4;hp=d3c014ac91c9f6d910fde5c9ff5c191213e18eeb;hb=3ddf1c12af0c167fe7d3bb59e63258550270cfc5;hpb=102bcfda4afbb5cfee885cbee0f55545624168fd

diff --git a/pkg/tests/testthat/test.dateIndexToInteger.R b/pkg/tests/testthat/test-DateIntegerConv.R
similarity index 68%
rename from pkg/tests/testthat/test.dateIndexToInteger.R
rename to pkg/tests/testthat/test-DateIntegerConv.R
index d3c014a..99e5fa5 100644
--- a/pkg/tests/testthat/test.dateIndexToInteger.R
+++ b/pkg/tests/testthat/test-DateIntegerConv.R
@@ -1,4 +1,4 @@
-context("Check that date <--> integer indexes conversions work")
+context("Date <--> integer conversions")
 
 ts_data = system.file("testdata","ts_test.csv",package="talweg")
 exo_data = system.file("testdata","exo_test.csv",package="talweg")
@@ -7,7 +7,7 @@ data0 <<- getData(ts_data, exo_data, input_tz="GMT", date_format="%Y-%m-%d %H:%M
 data7 <<- getData(ts_data, exo_data, input_tz="GMT", date_format="%Y-%m-%d %H:%M",
 	working_tz="GMT", predict_at=7, limit=Inf)
 
-test_that("dateIndexToInteger",
+test_that("dateIndexToInteger works as expected",
 {
 	expect_identical( dateIndexToInteger("2007-01-01",data0),   1 )
 	expect_identical( dateIndexToInteger("2007-01-02",data0),   2 )
@@ -22,7 +22,7 @@ test_that("dateIndexToInteger",
 	expect_identical( dateIndexToInteger("2007-05-31",data7), 151 )
 })
 
-test_that("integerIndexToDate",
+test_that("integerIndexToDate works as expected",
 {
 	expect_identical( integerIndexToDate(  1,data0), as.Date("2007-01-01") )
 	expect_identical( integerIndexToDate(  2,data0), as.Date("2007-01-02") )
@@ -53,24 +53,24 @@ test_that("dateIndexToInteger(integerIndexToDate) == Id",
 
 test_that("integerIndexToDate(dateIndexToInteger) == Id",
 {
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-01-01",data0),data0), as.Date("2007-01-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-01-01",data7),data7), as.Date("2007-01-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-01-02",data0),data0), as.Date("2007-01-02") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-01-02",data7),data7), as.Date("2007-01-02") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-02-01",data0),data0), as.Date("2007-02-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-02-01",data0),data0), as.Date("2007-02-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-03-01",data0),data0), as.Date("2007-03-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-03-01",data0),data0), as.Date("2007-03-01") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-05-31",data0),data0), as.Date("2007-05-31") )
-	expect_identical(
-		integerIndexToDate(dateIndexToInteger("2007-05-31",data0),data0), as.Date("2007-05-31") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-01-01",data0),data0),
+		as.Date("2007-01-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-01-01",data7),data7),
+		as.Date("2007-01-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-01-02",data0),data0),
+		as.Date("2007-01-02") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-01-02",data7),data7),
+		as.Date("2007-01-02") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-02-01",data0),data0),
+		as.Date("2007-02-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-02-01",data0),data0),
+		as.Date("2007-02-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-03-01",data0),data0),
+		as.Date("2007-03-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-03-01",data0),data0),
+		as.Date("2007-03-01") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-05-31",data0),data0),
+		as.Date("2007-05-31") )
+	expect_identical(integerIndexToDate(dateIndexToInteger("2007-05-31",data0),data0),
+		as.Date("2007-05-31") )
 })