diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2020-05-05 22:39:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 22:39:59 +0200 |
| commit | 8e2dfce84bf5e3993a910e535a51d40ebe0803d0 (patch) | |
| tree | 0f570f9f54d8afc8dac4db307d32a6fa057d15f3 /tests/Generating | |
| parent | Remove cRankManager migration code (#4714) (diff) | |
| download | cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar.gz cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar.bz2 cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar.lz cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar.xz cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.tar.zst cuberite-8e2dfce84bf5e3993a910e535a51d40ebe0803d0.zip | |
Diffstat (limited to 'tests/Generating')
| -rw-r--r-- | tests/Generating/BasicGeneratorTest.cpp | 2 | ||||
| -rw-r--r-- | tests/Generating/PieceRotationTest.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/Generating/BasicGeneratorTest.cpp b/tests/Generating/BasicGeneratorTest.cpp index 4b27f5344..10c66050b 100644 --- a/tests/Generating/BasicGeneratorTest.cpp +++ b/tests/Generating/BasicGeneratorTest.cpp @@ -186,7 +186,7 @@ static void testGenerateNether(cChunkGenerator & aDefaultNetherGen) } TEST_EQUAL_MSG(y, prevHeight, Printf("Failed: Same height across the entire chunk, at {%d, %d}: exp %d, got %d; top block: %d", x, z, prevHeight, y, chd.GetBlockType(x, y, z) - )) + )); auto blockType = chd.GetBlockType(x, y, z); TEST_EQUAL_MSG(blockType, E_BLOCK_BEDROCK, Printf("Bedrock ceiling at {%d, %d, %d}: %d", x, y, z, blockType) diff --git a/tests/Generating/PieceRotationTest.cpp b/tests/Generating/PieceRotationTest.cpp index ace3bd489..fff3655c1 100644 --- a/tests/Generating/PieceRotationTest.cpp +++ b/tests/Generating/PieceRotationTest.cpp @@ -53,11 +53,14 @@ public: -#define EXPECT(X) if (!(X)) \ - { \ - ASSERT(X); \ - throw cTestFailure(#X, __FILE__, __LINE__); \ - } +#define EXPECT(X) \ + do { \ + if (!(X)) \ + { \ + ASSERT(X); \ + throw cTestFailure(#X, __FILE__, __LINE__); \ + } \ + } while (false) |