fixed unit tests for get_trackdata(resultType = "tibble") default

uncaneton · Mar 15, 2019 · e0c8e91 · e0c8e91
1 parent 73181ba
commit e0c8e91
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: emuR
-Version: 1.9.9.9003
+Version: 1.9.9.9001
 Title: Main Package of the EMU Speech Database Management System
 Authors@R: c(
     person("Raphael", "Winkelmann", , "[email protected]", c("aut", "cre")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# emuR 1.9.9.9000
+# emuR 1.9.9.9001
 
 ## new features / performance tweaks / improvements
 
@@ -7,6 +7,7 @@
 * `serve()` doesn't block the R console any more
 * suppressing requery differing length warnings in `runBASwebservice_*` functions
 * `requery_hier()` now persists the input segment list length by inserting NA rows for missing segments
+* depricated vignettes are now stubs only (== empty containing notice pointing to the EMU-SDMS manual)
 
 ## bug fixes
 

diff --git a/tests/testthat/test_emuR-emuRtrackdata.R b/tests/testthat/test_emuR-emuRtrackdata.R
@@ -28,10 +28,12 @@ test_that("emuRtrackdata functions work", {
   ##############################
   test_that("correct classes are returned", {
 
-    sl = query(ae, "Phonetic == @ | i:")
+    sl = query(ae, "Phonetic == @ | i:", 
+               resultType = "emuRsegs")
     td = get_trackdata(ae, 
                        seglist = sl, 
                        ssffTrackName = 'fm',
+                       resultType = "trackdata",
                        verbose = F)
 
     newTd = create_emuRtrackdata(sl, td)

diff --git a/tests/testthat/test_emuR-get_trackdata.R b/tests/testthat/test_emuR-get_trackdata.R
@@ -39,13 +39,15 @@ test_that("correct classes are returned", {
                        n, 
                        'fm', 
                        consistentOutputType = F, 
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(class(td), equals('trackdata'))
 
     td = get_trackdata(ae, 
                        n, 
                        'fm', 
                        cut = .5, 
+                       resultType = "trackdata",
                        consistentOutputType = F, 
                        verbose = F)
     expect_that(class(td), equals('data.frame'))
@@ -55,6 +57,7 @@ test_that("correct classes are returned", {
                        'fm', 
                        cut = .5, 
                        npoints = 3, 
+                       resultType = "trackdata",
                        consistentOutputType = F, 
                        verbose = F)
     expect_that(class(td), 
@@ -65,13 +68,15 @@ test_that("correct classes are returned", {
                        'fm', 
                        cut = .5, 
                        npoints = 1, 
+                       resultType = "trackdata",
                        consistentOutputType = F, 
                        verbose = F)
     expect_that(class(td), equals('data.frame'))
 
     td = get_trackdata(ae, 
                        hStar, 
                        'fm',
+                       resultType = "trackdata",
                        consistentOutputType = F, 
                        verbose = F)
     expect_that(class(td), equals('data.frame'))
@@ -80,6 +85,7 @@ test_that("correct classes are returned", {
                        hStar, 
                        'fm', 
                        npoints = 3, 
+                       resultType = "trackdata",
                        consistentOutputType = F, 
                        verbose = F)
     expect_that(class(td), equals('trackdata'))
@@ -139,6 +145,7 @@ test_that("correct classes are returned", {
                        'fm',
                        cut = .5, 
                        npoints = 3, 
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(dim(td$data)[1], equals(length(n$utts)*3))
 
@@ -147,6 +154,7 @@ test_that("correct classes are returned", {
                        'fm',
                        cut = .5, 
                        npoints = 5, 
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(dim(td$data)[1], equals(length(n$utts)*5))
 
@@ -161,6 +169,7 @@ test_that("correct classes are returned", {
                          'fm',
                          cut = cutV, 
                          consistentOutputType = F, 
+                         resultType = "trackdata",
                          verbose = F)
       expect_that(class(td), equals('data.frame'))
     }
@@ -174,6 +183,7 @@ test_that("correct classes are returned", {
                        'fm', 
                        cut = 0.5, 
                        npoints = 20, 
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(class(td), equals('trackdata'))
   })
@@ -188,6 +198,7 @@ test_that("correct classes are returned", {
                            n, 
                            wrasspOutputInfos[[wrasspFun]]$tracks[1], 
                            onTheFlyFunctionName = wrasspFun, 
+                           resultType = "trackdata",
                            verbose = F)
       }
       expect_that(class(td), equals('trackdata'))
@@ -199,6 +210,7 @@ test_that("correct classes are returned", {
     td = get_trackdata(ae, 
                        n, 
                        onTheFlyFunctionName = "ksvF0", 
+                       resultType = "trackdata",
                        verbose = F)
     expect_equal(dim(td$index)[1], 12)
   })
@@ -209,6 +221,7 @@ test_that("correct classes are returned", {
     td = get_trackdata(ae, 
                        n, 
                        'fm',
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(td$data[10,1], equals(256))
     expect_that(td$data[10,2], equals(1521))
@@ -218,6 +231,7 @@ test_that("correct classes are returned", {
     td = get_trackdata(ae, 
                        n, 
                        onTheFlyFunctionName = "forest", 
+                       resultType = "trackdata",
                        verbose = F)
     expect_that(td$data[10,1], equals(256))
     expect_that(td$data[10,2], equals(1521))
@@ -235,6 +249,7 @@ test_that("correct classes are returned", {
     td = get_trackdata(ae, 
                        sl, 
                        onTheFlyFunctionName = "ksvF0", 
+                       resultType = "trackdata",
                        verbose = F)
     expect_equal(dim(td$index)[1], 12)
   })