fix tests reacting to changes of fcwt argument default values

lschneiderbauer · Jan 5, 2025 · df55bda · df55bda
1 parent d62a1d8
commit df55bda
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/tests/testthat/test-fcwt_batch.R b/tests/testthat/test-fcwt_batch.R
@@ -17,9 +17,7 @@ test_that("fcwt batching yields identical result in single-batch case", {
       freq_begin = 50,
       freq_end = 1000,
       n_freqs = 10,
-      sigma = 1,
-      # no aggregation
-      y_sample_freq = 44100
+      sigma = 1
     )
 
   res_batch_2 <-
@@ -47,31 +45,31 @@ test_that("fcwt batching yields identical result in single-batch case", {
     )
 
   expect_equal(
-    sc_dim_time(res0), sc_dim_time(res_batch)
+    sc_dim_time(res_batch), sc_dim_time(res0)
   )
   expect_equal(
-    sc_dim_time(res0), sc_dim_time(res_batch_2)
+    sc_dim_time(res_batch_2), sc_dim_time(res0)
   )
   expect_equal(
-    sc_dim_time(res0), sc_dim_time(res_batch_3)
+    sc_dim_time(res_batch_3), sc_dim_time(res0)
   )
 
   expect_equal(
-    res0,
-    res_batch
+    res_batch,
+    res0
   )
 
   expect_equal(
-    res0,
     res_batch_2,
+    res0,
     # we still have boundary effects that influence the values
     # to some degree
     tolerance = 10^-3
   )
 
   expect_equal(
-    res0,
     res_batch_3,
+    res0,
     # we still have boundary effects that influence the values
     # to some degree
     tolerance = 10^-3

diff --git a/tests/testthat/test-fcwtr_scalogram.R b/tests/testthat/test-fcwtr_scalogram.R
@@ -25,6 +25,7 @@ test_that("rbind() for fcwtr_scalogram", {
     fcwt(
       ts_sin_440[1:1000],
       x_sample_freq = 22100,
+      y_sample_freq = 22100,
       freq_begin = 50,
       freq_end = 1000,
       n_freqs = 10,
@@ -109,6 +110,7 @@ test_that("[] works", {
     fcwt(
       ts_sin_440[1:1000],
       x_sample_freq = 44100,
+      y_sample_freq = 44100,
       freq_begin = 50,
       freq_end = 1000,
       n_freqs = 10,
@@ -209,6 +211,7 @@ test_that("`agg()` gives the same result as c++ aggregation", {
     fcwt(
       ts_sin_440[1:1000],
       x_sample_freq = 44100,
+      y_sample_freq = 44100,
       freq_begin = 50,
       freq_end = 1000,
       n_freqs = 1,

diff --git a/tests/testthat/test-wnd.R b/tests/testthat/test-wnd.R
@@ -32,6 +32,7 @@ test_that("wnd_from_target_size works", {
     fcwt(
       ts_sin_440[1:1000],
       x_sample_freq = 44100,
+      y_sample_freq = 44100,
       freq_begin = 50,
       freq_end = 1000,
       n_freqs = 10,