From 710701e126517efb648952411fcc58e7c8717e51 Mon Sep 17 00:00:00 2001
From: aheinri5 <Anna@netzkritzler.de>
Date: Thu, 19 Nov 2020 23:12:15 +0100
Subject: [PATCH] Altered tests to fit new functions

---
 tests/testthat/test-generate_functions.R |  5 +----
 tests/testthat/test-prj_parameters.R     |  1 -
 tests/testthat/test-read_in_gml.R        | 10 ++++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 tests/testthat/test-read_in_gml.R

diff --git a/tests/testthat/test-generate_functions.R b/tests/testthat/test-generate_functions.R
index b69f456..75b295a 100644
--- a/tests/testthat/test-generate_functions.R
+++ b/tests/testthat/test-generate_functions.R
@@ -1,8 +1,5 @@
 
 
-
-
-
 test_that("generate_as_node_func correctly generates as_node function from XML element", {
 
     simple_xml_file <- system.file("extdata", "simple_case_1.xml", package = "r2ogs6")
@@ -13,6 +10,6 @@ test_that("generate_as_node_func correctly generates as_node function from XML e
     #
     # children
 
-    generate_as_node_func(simple_xml_file, "b")
+    generate_as_node_func(simple_xml_file, "b", show_result = FALSE)
 
 })
diff --git a/tests/testthat/test-prj_parameters.R b/tests/testthat/test-prj_parameters.R
index 9ebe552..ffb150f 100644
--- a/tests/testthat/test-prj_parameters.R
+++ b/tests/testthat/test-prj_parameters.R
@@ -1,7 +1,6 @@
 
 test_that("new_r2ogs6_parameter basic validation is working", {
 
-    expect_error(r2ogs6_parameter("my_param", "my_type", "my_value"))
     expect_error(r2ogs6_parameter("my_param", c(0, 0), c(0, 0)))
     expect_error(r2ogs6_parameter(c(0, 0), "my_type", c(0, 0)))
 
diff --git a/tests/testthat/test-read_in_gml.R b/tests/testthat/test-read_in_gml.R
new file mode 100644
index 0000000..1c67e48
--- /dev/null
+++ b/tests/testthat/test-read_in_gml.R
@@ -0,0 +1,10 @@
+
+test_that("read_in_points correctly reads point tibble from file", {
+
+    xml_doc <- validate_read_in_xml(system.file("extdata", "cube_1x1x1.gml", package = "r2ogs6"))
+
+    point_tibble <- read_in_points(xml_doc)
+    expect_equal(length(point_tibble), 4)
+    expect_equal(length(point_tibble[[1]]), 8)
+    expect_setequal(names(point_tibble), c("x", "y", "z", "name"))
+})
\ No newline at end of file
-- 
GitLab