From: Perttu Ahola Date: Sun, 22 Jul 2012 17:26:54 +0000 (+0300) Subject: Tweak test.c overally a bit X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=82855a04ec7a37f2c08c9f565e9d4a44faa691a1;p=zefram%2Fminetest%2Fminetest_engine.git Tweak test.c overally a bit --- diff --git a/src/test.cpp b/src/test.cpp index 9b134627..6a0e991e 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -49,9 +49,19 @@ with this program; if not, write to the Free Software Foundation, Inc., bool exception_thrown = false;\ try{ code; }\ catch(EType &e) { exception_thrown = true; }\ - assert(exception_thrown);\ + UASSERT(exception_thrown);\ } +#define UTEST(x, fmt, ...)\ +{\ + if(!(x)){\ + LOGLINEF(LMT_ERROR, "Test (%s) failed: " fmt, #x, ##__VA_ARGS__);\ + test_failed = true;\ + }\ +} + +#define UASSERT(x) UTEST(x, "UASSERT") + /* A few item and node definitions for those tests that need them */ @@ -127,30 +137,38 @@ void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *n ndef->set(i, f); } -struct TestUtilities +struct TestBase +{ + bool test_failed; + TestBase(): + test_failed(false) + {} +}; + +struct TestUtilities: public TestBase { void Run() { /*infostream<<"wrapDegrees(100.0) = "<get(n).light_propagates == true); + UASSERT(nodedef->get(n).light_propagates == true); n.setContent(LEGN(nodedef, "CONTENT_STONE")); - assert(nodedef->get(n).light_propagates == false); + UASSERT(nodedef->get(n).light_propagates == false); } }; -struct TestVoxelManipulator +struct TestVoxelManipulator: public TestBase { void Run(INodeDefManager *nodedef) { @@ -441,8 +446,8 @@ struct TestVoxelManipulator */ VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1)); - assert(a.index(0,0,0) == 1*3*3 + 1*3 + 1); - assert(a.index(-1,-1,-1) == 0); + UASSERT(a.index(0,0,0) == 1*3*3 + 1*3 + 1); + UASSERT(a.index(-1,-1,-1) == 0); VoxelArea c(v3s16(-2,-2,-2), v3s16(2,2,2)); // An area that is 1 bigger in x+ and z- @@ -456,7 +461,7 @@ struct TestVoxelManipulator results.push_back(VoxelArea(v3s16(-2,-2,-3),v3s16(3,2,-3))); results.push_back(VoxelArea(v3s16(3,-2,-2),v3s16(3,2,2))); - assert(aa.size() == results.size()); + UASSERT(aa.size() == results.size()); infostream<<"Result of diff:"<::Iterator @@ -466,7 +471,7 @@ struct TestVoxelManipulator infostream< light_sources; voxalgo::setLight(v, a, 0, ndef); voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight( v, a, false, light_sources, ndef); - assert(res.bottom_sunlight_valid == true); + UASSERT(res.bottom_sunlight_valid == true); } { MapNode n(CONTENT_AIR); @@ -598,14 +603,14 @@ struct TestVoxelAlgorithms voxalgo::setLight(v, a, 0, ndef); voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight( v, a, true, light_sources, ndef); - assert(res.bottom_sunlight_valid == false); + UASSERT(res.bottom_sunlight_valid == false); } { core::map light_sources; voxalgo::setLight(v, a, 0, ndef); voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight( v, a, false, light_sources, ndef); - assert(res.bottom_sunlight_valid == false); + UASSERT(res.bottom_sunlight_valid == false); } v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_IGNORE)); { @@ -613,7 +618,7 @@ struct TestVoxelAlgorithms voxalgo::setLight(v, a, 0, ndef); voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight( v, a, true, light_sources, ndef); - assert(res.bottom_sunlight_valid == true); + UASSERT(res.bottom_sunlight_valid == true); } } /* @@ -642,18 +647,18 @@ struct TestVoxelAlgorithms voxalgo::clearLightAndCollectSources(v, a, LIGHTBANK_DAY, ndef, light_sources, unlight_from); //v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY); - assert(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef) + UASSERT(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef) == 0); - assert(light_sources.find(v3s16(1,1,1)) != NULL); - assert(light_sources.size() == 1); - assert(unlight_from.find(v3s16(1,1,2)) != NULL); - assert(unlight_from.size() == 1); + UASSERT(light_sources.find(v3s16(1,1,1)) != NULL); + UASSERT(light_sources.size() == 1); + UASSERT(unlight_from.find(v3s16(1,1,2)) != NULL); + UASSERT(unlight_from.size() == 1); } } } }; -struct TestInventory +struct TestInventory: public TestBase { void Run(IItemDefManager *idef) { @@ -734,14 +739,14 @@ struct TestInventory Inventory inv(idef); std::istringstream is(serialized_inventory, std::ios::binary); inv.deSerialize(is); - assert(inv.getList("0")); - assert(!inv.getList("main")); + UASSERT(inv.getList("0")); + UASSERT(!inv.getList("main")); inv.getList("0")->setName("main"); - assert(!inv.getList("0")); - assert(inv.getList("main")); + UASSERT(!inv.getList("0")); + UASSERT(inv.getList("main")); std::ostringstream inv_os(std::ios::binary); inv.serialize(inv_os); - assert(inv_os.str() == serialized_inventory_2); + UASSERT(inv_os.str() == serialized_inventory_2); } }; @@ -751,7 +756,7 @@ struct TestInventory interface for Map (IMap would be fine). */ #if 0 -struct TestMapBlock +struct TestMapBlock: public TestBase { class TC : public NodeContainer { @@ -808,33 +813,33 @@ struct TestMapBlock MapBlock b(&parent, v3s16(1,1,1)); v3s16 relpos(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE); - assert(b.getPosRelative() == relpos); + UASSERT(b.getPosRelative() == relpos); - assert(b.getBox().MinEdge.X == MAP_BLOCKSIZE); - assert(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1); - assert(b.getBox().MinEdge.Y == MAP_BLOCKSIZE); - assert(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1); - assert(b.getBox().MinEdge.Z == MAP_BLOCKSIZE); - assert(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1); + UASSERT(b.getBox().MinEdge.X == MAP_BLOCKSIZE); + UASSERT(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1); + UASSERT(b.getBox().MinEdge.Y == MAP_BLOCKSIZE); + UASSERT(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1); + UASSERT(b.getBox().MinEdge.Z == MAP_BLOCKSIZE); + UASSERT(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1); - assert(b.isValidPosition(v3s16(0,0,0)) == true); - assert(b.isValidPosition(v3s16(-1,0,0)) == false); - assert(b.isValidPosition(v3s16(-1,-142,-2341)) == false); - assert(b.isValidPosition(v3s16(-124,142,2341)) == false); - assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true); - assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false); + UASSERT(b.isValidPosition(v3s16(0,0,0)) == true); + UASSERT(b.isValidPosition(v3s16(-1,0,0)) == false); + UASSERT(b.isValidPosition(v3s16(-1,-142,-2341)) == false); + UASSERT(b.isValidPosition(v3s16(-124,142,2341)) == false); + UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true); + UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false); /* TODO: this method should probably be removed if the block size isn't going to be set variable */ - /*assert(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE, + /*UASSERT(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE));*/ // Changed flag should be initially set - assert(b.getModified() == MOD_STATE_WRITE_NEEDED); + UASSERT(b.getModified() == MOD_STATE_WRITE_NEEDED); b.resetModified(); - assert(b.getModified() == MOD_STATE_CLEAN); + UASSERT(b.getModified() == MOD_STATE_CLEAN); // All nodes should have been set to // .d=CONTENT_IGNORE and .getLight() = 0 @@ -842,10 +847,10 @@ struct TestMapBlock for(u16 y=0; y light_sources; // The bottom block is invalid, because we have a shadowing node - assert(b.propagateSunlight(light_sources) == false); - assert(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); - assert(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); - assert(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0); - assert(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0); - assert(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0); - assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); - assert(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN); - assert(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0); - assert(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0); + UASSERT(b.propagateSunlight(light_sources) == false); + UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); + UASSERT(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); + UASSERT(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0); + UASSERT(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0); + UASSERT(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0); + UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); + UASSERT(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN); + UASSERT(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0); + UASSERT(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0); // According to MapBlock::getFaceLight, // The face on the z+ side should have double-diminished light - //assert(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX))); + //UASSERT(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX))); // The face on the z+ side should have diminished light - assert(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX)); + UASSERT(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX)); } /* Check how the block handles being in between blocks with some non-sunlight @@ -962,11 +967,11 @@ struct TestMapBlock core::map light_sources; // The block below should be valid because there shouldn't be // sunlight in there either - assert(b.propagateSunlight(light_sources, true) == true); + UASSERT(b.propagateSunlight(light_sources, true) == true); // Should not touch nodes that are not affected (that is, all of them) - //assert(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN); + //UASSERT(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN); // Should set light of non-sunlighted blocks to 0. - assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0); + UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0); } /* Set up a situation where: @@ -1002,12 +1007,12 @@ struct TestMapBlock parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2); core::map light_sources; // Bottom block is not valid - assert(b.propagateSunlight(light_sources) == false); + UASSERT(b.propagateSunlight(light_sources) == false); } } }; -struct TestMapSector +struct TestMapSector: public TestBase { class TC : public NodeContainer { @@ -1053,13 +1058,13 @@ struct TestMapSector // Create one with no heightmaps ServerMapSector sector(&parent, v2s16(1,1)); - assert(sector.getBlockNoCreateNoEx(0) == 0); - assert(sector.getBlockNoCreateNoEx(1) == 0); + UASSERT(sector.getBlockNoCreateNoEx(0) == 0); + UASSERT(sector.getBlockNoCreateNoEx(1) == 0); MapBlock * bref = sector.createBlankBlock(-2); - assert(sector.getBlockNoCreateNoEx(0) == 0); - assert(sector.getBlockNoCreateNoEx(-2) == bref); + UASSERT(sector.getBlockNoCreateNoEx(0) == 0); + UASSERT(sector.getBlockNoCreateNoEx(-2) == bref); //TODO: Check for AlreadyExistsException @@ -1070,13 +1075,13 @@ struct TestMapSector catch(InvalidPositionException &e){ exception_thrown = true; } - assert(exception_thrown);*/ + UASSERT(exception_thrown);*/ } }; #endif -struct TestCollision +struct TestCollision: public TestBase { void Run() { @@ -1094,38 +1099,38 @@ struct TestCollision aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1); v3f v(1, 0, 0); f32 dtime = 0; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 1.000) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 1.000) < 0.001); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1); v3f v(-1, 0, 0); f32 dtime = 0; - assert(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1); v3f v(1, 0, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1); v3f v(0.5, 0.1, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 3.000) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 3.000) < 0.001); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1); v3f v(0.5, 0.1, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 3.000) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 3.000) < 0.001); } // X+ @@ -1134,38 +1139,38 @@ struct TestCollision aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1); v3f v(-1, 0, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 1.000) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 1.000) < 0.001); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1); v3f v(1, 0, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5); v3f v(-1, 0, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1); v3f v(-0.5, 0.2, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 1); // Y, not X! - assert(fabs(dtime - 2.500) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); // Y, not X! + UASSERT(fabs(dtime - 2.500) < 0.001); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1); v3f v(-0.5, 0.3, 0); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 2.000) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 2.000) < 0.001); } // TODO: Y-, Y+, Z-, Z+ @@ -1176,54 +1181,54 @@ struct TestCollision aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 0.9) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 0.9) < 0.001); } { aabb3f s(bx, by, bz, bx+2, by+2, bz+2); aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 1); - assert(fabs(dtime - 0.9) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); + UASSERT(fabs(dtime - 0.9) < 0.001); } { aabb3f s(bx, by, bz, bx+2, by+2, bz+2); aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 2); - assert(fabs(dtime - 0.9) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2); + UASSERT(fabs(dtime - 0.9) < 0.001); } { aabb3f s(bx, by, bz, bx+2, by+2, bz+2); aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29); v3f v(1./7, 1./7, 1./7); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 0); - assert(fabs(dtime - 16.1) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(fabs(dtime - 16.1) < 0.001); } { aabb3f s(bx, by, bz, bx+2, by+2, bz+2); aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29); v3f v(1./7, 1./7, 1./7); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 1); - assert(fabs(dtime - 16.1) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); + UASSERT(fabs(dtime - 16.1) < 0.001); } { aabb3f s(bx, by, bz, bx+2, by+2, bz+2); aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3); v3f v(1./7, 1./7, 1./7); f32 dtime; - assert(axisAlignedCollision(s, m, v, 0, dtime) == 2); - assert(fabs(dtime - 16.1) < 0.001); + UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2); + UASSERT(fabs(dtime - 16.1) < 0.001); } } } }; -struct TestSocket +struct TestSocket: public TestBase { void Run() { @@ -1246,12 +1251,12 @@ struct TestSocket break; } //FIXME: This fails on some systems - assert(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer))==0); - assert(sender.getAddress() == Address(127,0,0,1, 0).getAddress()); + UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer))==0); + UASSERT(sender.getAddress() == Address(127,0,0,1, 0).getAddress()); } }; -struct TestConnection +struct TestConnection: public TestBase { void TestHelpers() { @@ -1279,10 +1284,10 @@ struct TestConnection Data: [7] u8 data1[0] */ - assert(readU32(&p1.data[0]) == proto_id); - assert(readU16(&p1.data[4]) == peer_id); - assert(readU8(&p1.data[6]) == channel); - assert(readU8(&p1.data[7]) == data1[0]); + UASSERT(readU32(&p1.data[0]) == proto_id); + UASSERT(readU16(&p1.data[4]) == peer_id); + UASSERT(readU8(&p1.data[6]) == channel); + UASSERT(readU8(&p1.data[7]) == data1[0]); //infostream<<"initial data1[0]="<<((u32)data1[0]&0xff)<