fix tests on R-devel 4.2

rte-antares-rpackage · Oct 5, 2021 · 3f9f6f2 · 3f9f6f2
1 parent 7802d8c
commit 3f9f6f2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: manipulateWidget
 Type: Package
 Title: Add Even More Interactivity to Interactive Charts
-Version: 0.11.0
+Version: 0.11.1
 Authors@R: c(
     person("Veronique", "Bachelier", email = "veronique.bachelier@rte-france.com", role = c("aut", "cre")),
     person("Jalal-Edine", "ZAWAM", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,10 @@
 <!-- Copyright © 2016 RTE Réseau de transport d’électricité --->
 
+# manipulateWidget 0.11.1 (2021-10-05)
+
+## Bug Fixes
+* fix tests on R-devel 4.2
+
 # manipulateWidget 0.11.0 (2020-03-21)
 
 ## New features

diff --git a/inst/examples/example-reactive_values.R b/inst/examples/example-reactive_values.R
@@ -1,5 +1,13 @@
 require(manipulateWidget)
 require(dygraphs)
+mydata <- data.frame(
+  year = 2000+1:100,
+  series1 = rnorm(100),
+  series2 = rnorm(100),
+  series3 = rnorm(100)
+)
+
+
 
 ui <- fillPage(
   fillRow(
@@ -14,12 +22,6 @@ ui <- fillPage(
 
 Range = 2001
 server <- function(input, output, session) {
-  mydata <- data.frame(
-    year = 2000+1:100,
-    series1 = rnorm(100),
-    series2 = rnorm(100),
-    series3 = rnorm(100)
-  )
 
   c <- manipulateWidget(
     {
@@ -29,7 +31,7 @@ server <- function(input, output, session) {
     series = mwSharedValue(),
     title = mwSharedValue(
       {"init"}
-    ), .runApp = FALSE, .showCompare = FALSE,
+    ), .runApp = FALSE,
     .compare = "range"
   )
 

diff --git a/tests/testthat/test-inputs.R b/tests/testthat/test-inputs.R
@@ -23,8 +23,8 @@ test_input(mwPassword(), list("1", 1, NULL), list("1", "1", ""))
 test_input(mwSelect(1:4), list(1, 2, 5, NULL), list(1, 2, 1, 1))
 test_input(
   mwSelect(1:4, multiple = TRUE),
-  list(1, 5, NULL, 3:5),
-  list(1, integer(0), integer(0), 3:4)
+  list(1, 5, 3:5),
+  list(1, integer(0), 3:4)
 )
 # Select where choices have distinct label and values
 test_input(
@@ -34,8 +34,8 @@ test_input(
 )
 test_input(
   mwSelect(list(a = 1, b = 2), multiple = TRUE),
-  list(1, 2, 5, NULL, 1:3),
-  list(1, 2, integer(0), integer(0), 1:2)
+  list(1, 2, 5, 1:3),
+  list(1, 2, integer(0), 1:2)
 )
 
 # Checkbox
@@ -84,13 +84,13 @@ test_input(
 # Checkbox group
 test_input(
   mwCheckboxGroup(1:4),
-  list(1, 5, NULL, 3:5),
-  list(1, integer(0), integer(0), 3:4)
+  list(1, 5, 3:5),
+  list(1, integer(0), 3:4)
 )
 test_input(
   mwCheckboxGroup(list(a = 1, b = 2)),
-  list(1, 2, 5, NULL, 1:3),
-  list(1, 2, integer(0), integer(0), 1:2)
+  list(1, 2, 5, 1:3),
+  list(1, 2, integer(0), 1:2)
 )
 
 # Groups of input