fix test-sc again for #190

UrbanAnalyst · Sep 14, 2022 · 3c1cb65 · 3c1cb65
1 parent 325f565
commit 3c1cb65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.2.15.072
+Version: 0.2.15.073
 Authors@R: c(
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "/~https://github.com/ATFutures/dodgr",
   "issueTracker": "/~https://github.com/ATFutures/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.2.15.072",
+  "version": "0.2.15.073",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/tests/testthat/test-sc.R b/tests/testthat/test-sc.R
@@ -170,7 +170,6 @@ test_that ("contract with turn angles", {
         ),
         "graphs with turn penalties should be submitted in full, not contracted form"
     )
-    expect_error (graphtf <- dodgr_uncontract_graph (graphtf))
     expect_silent (
         graphtf <- dodgr_flows_aggregate (
             grapht,
@@ -183,8 +182,8 @@ test_that ("contract with turn angles", {
 
     # compound junction edges are then removed, as are vertex
     # suffixes:
-    expect_true (length (grep ("_start", graphtf$.vx0)) > 0)
-    expect_true (length (grep ("_end", graphtf$.vx1)) > 0)
+    expect_true (length (grep ("_start", graphtf$.vx0)) == 0)
+    expect_true (length (grep ("_end", graphtf$.vx1)) == 0)
 
     expect_silent (graphtf <- merge_directed_graph (graphtf))
     # this test does not consistently pass: