From 1cba666d2299eac7c89b5745e99b3c9081938c19 Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Wed, 22 Jan 2020 19:39:50 +0100
Subject: [PATCH] Quick fix for crossed PR merges. (#942)
Update cable() invocations in unit tests added in #934 to match new interface from #938.
---
test/unit/test_morph_expr.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/unit/test_morph_expr.cpp b/test/unit/test_morph_expr.cpp
index dee25298..96cfae6e 100644
--- a/test/unit/test_morph_expr.cpp
+++ b/test/unit/test_morph_expr.cpp
@@ -485,8 +485,8 @@ TEST(region, thingify) {
// |----- | rhs
// |xxxxx | rand
// |xxxxx | ror
- lhs = cable({1,0,.5});
- rhs = cable({1,0,.5});
+ lhs = cable(1,0,.5);
+ rhs = cable(1,0,.5);
rand = cl{{1,0,.5}};
ror = cl{{1,0,.5}};
EXPECT_EQ(thingify(intersect(lhs, rhs), mp), rand);
@@ -498,8 +498,8 @@ TEST(region, thingify) {
// |----- | rhs
// |xxxxx | rand
// |xxxxx | ror
- lhs = cable({3,0,.5});
- rhs = cable({3,0,.5});
+ lhs = cable(3,0,.5);
+ rhs = cable(3,0,.5);
rand = cl{{3,0,.5}};
ror = cl{{3,0,.5}};
EXPECT_EQ(thingify(intersect(lhs, rhs), mp), rand);
@@ -511,8 +511,8 @@ TEST(region, thingify) {
// | |xxxxx | rhs
// x | | rand
// |xxxxx |xxxxx | ror
- lhs = cable({0,0,.5});
- rhs = cable({1,0,.5});
+ lhs = cable(0,0,.5);
+ rhs = cable(1,0,.5);
rand = cl{{0,0,0}};
ror = cl{{0,0,.5},{1,0,.5}};
EXPECT_EQ(thingify(intersect(lhs, rhs), mp), rand);
@@ -529,8 +529,8 @@ TEST(region, thingify) {
// | |xxxxx | rhs
// x | | rand
// |xxxxx |xxxxx | ror
- lhs = cable({2,0,.5});
- rhs = cable({3,0,.5});
+ lhs = cable(2,0,.5);
+ rhs = cable(3,0,.5);
rand = cl{{1,1,1}};
ror = cl{{2,0,.5},{3,0,.5}};
EXPECT_EQ(thingify(intersect(lhs, rhs), mp), rand);
@@ -547,8 +547,8 @@ TEST(region, thingify) {
// |xxxxxxx |xxx | rhs
// |xxxxx |xxx | rand
// |xxxxxxx |xxxxx | ror
- lhs = join(cable({0,0,.5}), cable({3,0,.5}));
- rhs = join(cable({0,0,.7}), cable({3,0,.3}));
+ lhs = join(cable(0,0,.5), cable(3,0,.5));
+ rhs = join(cable(0,0,.7), cable(3,0,.3));
rand = cl{{0,0,.5},{3,0,.3}};
ror = cl{{0,0,.7},{3,0,.5}};
EXPECT_EQ(thingify(intersect(lhs, rhs), mp), rand);
--
GitLab