X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2Ftests%2Ftestthat%2Ftest.dateIndexToInteger.R;h=d3c014ac91c9f6d910fde5c9ff5c191213e18eeb;hp=18269728cb44101680644f5fe7c50725a8a9ce17;hb=af3b84f4cacade7d83221ca0249b546c50ddf340;hpb=5d83d8150dc135347d5ef39e5015b88f33fa9ee3

diff --git a/pkg/tests/testthat/test.dateIndexToInteger.R b/pkg/tests/testthat/test.dateIndexToInteger.R
index 1826972..d3c014a 100644
--- a/pkg/tests/testthat/test.dateIndexToInteger.R
+++ b/pkg/tests/testthat/test.dateIndexToInteger.R
@@ -7,50 +7,42 @@ 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, predict_at == 0",
+test_that("dateIndexToInteger",
 {
 	expect_identical( dateIndexToInteger("2007-01-01",data0),   1 )
 	expect_identical( dateIndexToInteger("2007-01-02",data0),   2 )
 	expect_identical( dateIndexToInteger("2007-02-01",data0),  32 )
 	expect_identical( dateIndexToInteger("2007-03-01",data0),  60 )
 	expect_identical( dateIndexToInteger("2007-05-31",data0), 151 )
-})
 
-test_that("dateIndexToInteger, predict_at > 0",
-{
 	expect_identical( dateIndexToInteger("2007-01-01",data7),   1 )
-	expect_identical( dateIndexToInteger("2007-01-02",data7),   3 )
-	expect_identical( dateIndexToInteger("2007-02-01",data7),  33 )
-	expect_identical( dateIndexToInteger("2007-03-01",data7),  61 )
-	expect_identical( dateIndexToInteger("2007-05-31",data7), 152 )
+	expect_identical( dateIndexToInteger("2007-01-02",data7),   2 )
+	expect_identical( dateIndexToInteger("2007-02-01",data7),  32 )
+	expect_identical( dateIndexToInteger("2007-03-01",data7),  60 )
+	expect_identical( dateIndexToInteger("2007-05-31",data7), 151 )
 })
 
-test_that("integerIndexToDate, predict_at == 0",
+test_that("integerIndexToDate",
 {
 	expect_identical( integerIndexToDate(  1,data0), as.Date("2007-01-01") )
 	expect_identical( integerIndexToDate(  2,data0), as.Date("2007-01-02") )
 	expect_identical( integerIndexToDate( 32,data0), as.Date("2007-02-01") )
 	expect_identical( integerIndexToDate( 60,data0), as.Date("2007-03-01") )
 	expect_identical( integerIndexToDate(151,data0), as.Date("2007-05-31") )
-})
 
-test_that("integerIndexToDate, predict_at > 0",
-{
 	expect_identical( integerIndexToDate(  1,data7), as.Date("2007-01-01") )
-	expect_identical( integerIndexToDate(  2,data7), as.Date("2007-01-01") )
-	expect_identical( integerIndexToDate(  3,data7), as.Date("2007-01-02") )
-	expect_identical( integerIndexToDate( 33,data7), as.Date("2007-02-01") )
-	expect_identical( integerIndexToDate( 61,data7), as.Date("2007-03-01") )
-	expect_identical( integerIndexToDate(152,data7), as.Date("2007-05-31") )
+	expect_identical( integerIndexToDate(  2,data7), as.Date("2007-01-02") )
+	expect_identical( integerIndexToDate( 32,data7), as.Date("2007-02-01") )
+	expect_identical( integerIndexToDate( 60,data7), as.Date("2007-03-01") )
+	expect_identical( integerIndexToDate(151,data7), as.Date("2007-05-31") )
 })
 
 test_that("dateIndexToInteger(integerIndexToDate) == Id",
 {
-	#always true except for second cell when predict_at>0: same date
 	expect_identical( dateIndexToInteger(integerIndexToDate(  1,data0),data0),   1 )
 	expect_identical( dateIndexToInteger(integerIndexToDate(  1,data7),data7),   1 )
 	expect_identical( dateIndexToInteger(integerIndexToDate(  2,data0),data0),   2 )
-	expect_identical( dateIndexToInteger(integerIndexToDate(  2,data7),data7),   1 )
+	expect_identical( dateIndexToInteger(integerIndexToDate(  2,data7),data7),   2 )
 	expect_identical( dateIndexToInteger(integerIndexToDate( 32,data0),data0),  32 )
 	expect_identical( dateIndexToInteger(integerIndexToDate( 32,data7),data7),  32 )
 	expect_identical( dateIndexToInteger(integerIndexToDate( 60,data0),data0),  60 )