Commit 14a8c553014a582aaf88ae0a1b81c0e3bcf40953
Committed by
Henry Schreiner
1 parent
f0a29087
Fixing test error with clang + stdlibc++
Showing
1 changed file
with
12 additions
and
6 deletions
tests/NewParseTest.cpp
| @@ -36,7 +36,8 @@ TEST_F(TApp, AddingComplexParser) { | @@ -36,7 +36,8 @@ TEST_F(TApp, AddingComplexParser) { | ||
| 36 | 36 | ||
| 37 | run(); | 37 | run(); |
| 38 | 38 | ||
| 39 | - EXPECT_EQ(cx(1.5, 2.5), comp); | 39 | + EXPECT_EQ(1.5, comp.real()); |
| 40 | + EXPECT_EQ(2.5, comp.imag()); | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | TEST_F(TApp, DefaultComplex) { | 43 | TEST_F(TApp, DefaultComplex) { |
| @@ -49,11 +50,13 @@ TEST_F(TApp, DefaultComplex) { | @@ -49,11 +50,13 @@ TEST_F(TApp, DefaultComplex) { | ||
| 49 | EXPECT_THAT(help, HasSubstr("1")); | 50 | EXPECT_THAT(help, HasSubstr("1")); |
| 50 | EXPECT_THAT(help, HasSubstr("2")); | 51 | EXPECT_THAT(help, HasSubstr("2")); |
| 51 | 52 | ||
| 52 | - EXPECT_EQ(cx(1, 2), comp); | 53 | + EXPECT_EQ(1, comp.real()); |
| 54 | + EXPECT_EQ(2, comp.imag()); | ||
| 53 | 55 | ||
| 54 | run(); | 56 | run(); |
| 55 | 57 | ||
| 56 | - EXPECT_EQ(cx(4, 3), comp); | 58 | + EXPECT_EQ(4, comp.real()); |
| 59 | + EXPECT_EQ(3, comp.imag()); | ||
| 57 | } | 60 | } |
| 58 | 61 | ||
| 59 | TEST_F(TApp, BuiltinComplex) { | 62 | TEST_F(TApp, BuiltinComplex) { |
| @@ -67,11 +70,13 @@ TEST_F(TApp, BuiltinComplex) { | @@ -67,11 +70,13 @@ TEST_F(TApp, BuiltinComplex) { | ||
| 67 | EXPECT_THAT(help, HasSubstr("2")); | 70 | EXPECT_THAT(help, HasSubstr("2")); |
| 68 | EXPECT_THAT(help, HasSubstr("COMPLEX")); | 71 | EXPECT_THAT(help, HasSubstr("COMPLEX")); |
| 69 | 72 | ||
| 70 | - EXPECT_EQ(cx(1, 2), comp); | 73 | + EXPECT_EQ(1, comp.real()); |
| 74 | + EXPECT_EQ(2, comp.imag()); | ||
| 71 | 75 | ||
| 72 | run(); | 76 | run(); |
| 73 | 77 | ||
| 74 | - EXPECT_EQ(cx(4, 3), comp); | 78 | + EXPECT_EQ(4, comp.real()); |
| 79 | + EXPECT_EQ(3, comp.imag()); | ||
| 75 | } | 80 | } |
| 76 | 81 | ||
| 77 | TEST_F(TApp, BuiltinComplexIgnoreI) { | 82 | TEST_F(TApp, BuiltinComplexIgnoreI) { |
| @@ -82,7 +87,8 @@ TEST_F(TApp, BuiltinComplexIgnoreI) { | @@ -82,7 +87,8 @@ TEST_F(TApp, BuiltinComplexIgnoreI) { | ||
| 82 | 87 | ||
| 83 | run(); | 88 | run(); |
| 84 | 89 | ||
| 85 | - EXPECT_EQ(cx(4, 3), comp); | 90 | + EXPECT_EQ(4, comp.real()); |
| 91 | + EXPECT_EQ(3, comp.imag()); | ||
| 86 | } | 92 | } |
| 87 | 93 | ||
| 88 | TEST_F(TApp, BuiltinComplexFail) { | 94 | TEST_F(TApp, BuiltinComplexFail) { |