diff options
Diffstat (limited to 'src/test.cpp')
| -rw-r--r-- | src/test.cpp | 212 |
1 files changed, 152 insertions, 60 deletions
diff --git a/src/test.cpp b/src/test.cpp index 6cd7983fc..6454f8a28 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -418,29 +418,88 @@ struct TestPath: public TestBase } }; +#define TEST_CONFIG_TEXT_BEFORE \ + "leet = 1337\n" \ + "leetleet = 13371337\n" \ + "leetleet_neg = -13371337\n" \ + "floaty_thing = 1.1\n" \ + "stringy_thing = asd /( ¤%&(/\" BLÖÄRP\n" \ + "coord = (1, 2, 4.5)\n" \ + " # this is just a comment\n" \ + "this is an invalid line\n" \ + "asdf = {\n" \ + " a = 5\n" \ + " b = 2.5\n" \ + " c = \"\"\"\n" \ + "testy\n" \ + " testa \n" \ + "\"\"\"\n" \ + "\n" \ + "}\n" \ + "blarg = \"\"\" \n" \ + "some multiline text\n" \ + " with leading whitespace!\n" \ + "\"\"\"\n" \ + "zoop = true" + +#define TEST_CONFIG_TEXT_AFTER \ + "leet = 1337\n" \ + "leetleet = 13371337\n" \ + "leetleet_neg = -13371337\n" \ + "floaty_thing = 1.1\n" \ + "stringy_thing = asd /( ¤%&(/\" BLÖÄRP\n" \ + "coord = (1, 2, 4.5)\n" \ + " # this is just a comment\n" \ + "this is an invalid line\n" \ + "asdf = {\n" \ + " a = 5\n" \ + " b = 2.5\n" \ + " c = \"\"\"\n" \ + "testy\n" \ + " testa \n" \ + "\"\"\"\n" \ + "\n" \ + "}\n" \ + "blarg = \"\"\"\n" \ + "some multiline text\n" \ + " with leading whitespace!\n" \ + "\"\"\"\n" \ + "zoop = true\n" \ + "coord2 = (1,2,3.3)\n" \ + "floaty_thing_2 = 1.2\n" \ + "groupy_thing = \n" \ + "groupy_thing = {\n" \ + " animals = \n" \ + " animals = {\n" \ + " cat = meow\n" \ + " dog = woof\n" \ + " }\n" \ + " num_apples = 4\n" \ + " num_oranges = 53\n" \ + "}\n" + + struct TestSettings: public TestBase { void Run() { Settings s; + // Test reading of settings - std::istringstream is( - "leet = 1337\n" - "leetleet = 13371337\n" - "leetleet_neg = -13371337\n" - "floaty_thing = 1.1\n" - "stringy_thing = asd /( ¤%&(/\" BLÖÄRP\n" - "coord = (1, 2, 4.5)"); + std::istringstream is(TEST_CONFIG_TEXT_BEFORE); s.parseConfigLines(is); + UASSERT(s.getS32("leet") == 1337); UASSERT(s.getS16("leetleet") == 32767); UASSERT(s.getS16("leetleet_neg") == -32768); + // Not sure if 1.1 is an exact value as a float, but doesn't matter UASSERT(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001); UASSERT(s.get("stringy_thing") == "asd /( ¤%&(/\" BLÖÄRP"); UASSERT(fabs(s.getV3F("coord").X - 1.0) < 0.001); UASSERT(fabs(s.getV3F("coord").Y - 2.0) < 0.001); UASSERT(fabs(s.getV3F("coord").Z - 4.5) < 0.001); + // Test the setting of settings too s.setFloat("floaty_thing_2", 1.2); s.setV3F("coord2", v3f(1, 2, 3.3)); @@ -449,6 +508,39 @@ struct TestSettings: public TestBase UASSERT(fabs(s.getV3F("coord2").X - 1.0) < 0.001); UASSERT(fabs(s.getV3F("coord2").Y - 2.0) < 0.001); UASSERT(fabs(s.getV3F("coord2").Z - 3.3) < 0.001); + + // Test settings groups + Settings *group = s.getGroup("asdf"); + UASSERT(group != NULL); + UASSERT(s.getGroup("zoop") == NULL); + UASSERT(group->getS16("a") == 5); + UASSERT(fabs(group->getFloat("b") - 2.5) < 0.001); + + Settings *group3 = new Settings; + group3->set("cat", "meow"); + group3->set("dog", "woof"); + + Settings *group2 = new Settings; + group2->setS16("num_apples", 4); + group2->setS16("num_oranges", 53); + group2->setGroup("animals", group3); + s.setGroup("groupy_thing", group2); + + // Test multiline settings + UASSERT(group->get("c") == "testy\n testa "); + UASSERT(s.get("blarg") == + "some multiline text\n" + " with leading whitespace!"); + + // Test writing + std::ostringstream os(std::ios_base::binary); + is.clear(); + is.seekg(0); + + UASSERT(s.updateConfigObject(is, os, "", 0) == true); + //printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER); + //printf(">>>> actual config:\n%s\n", os.str().c_str()); + UASSERT(os.str() == TEST_CONFIG_TEXT_AFTER); } }; @@ -470,7 +562,7 @@ struct TestSerialization: public TestBase UASSERT(serializeWideString(L"") == mkstr("\0\0")); UASSERT(serializeLongString("") == mkstr("\0\0\0\0")); UASSERT(serializeJsonString("") == "\"\""); - + std::string teststring = "Hello world!"; UASSERT(serializeString(teststring) == mkstr("\0\14Hello world!")); @@ -596,12 +688,12 @@ struct TestCompress: public TestBase fromdata[1]=5; fromdata[2]=5; fromdata[3]=1; - + std::ostringstream os(std::ios_base::binary); compress(fromdata, os, 0); std::string str_out = os.str(); - + infostream<<"str_out.size()="<<str_out.size()<<std::endl; infostream<<"TestCompress: 1,5,5,1 -> "; for(u32 i=0; i<str_out.size(); i++) @@ -652,12 +744,12 @@ struct TestCompress: public TestBase fromdata[1]=5; fromdata[2]=5; fromdata[3]=1; - + std::ostringstream os(std::ios_base::binary); compress(fromdata, os, SER_FMT_VER_HIGHEST_READ); std::string str_out = os.str(); - + infostream<<"str_out.size()="<<str_out.size()<<std::endl; infostream<<"TestCompress: 1,5,5,1 -> "; for(u32 i=0; i<str_out.size(); i++) @@ -733,7 +825,7 @@ struct TestMapNode: public TestBase UASSERT(n.getContent() == CONTENT_AIR); UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0); UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0); - + // Transparency n.setContent(CONTENT_AIR); UASSERT(nodedef->get(n).light_propagates == true); @@ -753,28 +845,28 @@ struct TestVoxelManipulator: public TestBase VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1)); 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- VoxelArea d(v3s16(-2,-2,-3), v3s16(3,2,2)); - + std::list<VoxelArea> aa; d.diff(c, aa); - + // Correct results std::vector<VoxelArea> results; results.push_back(VoxelArea(v3s16(-2,-2,-3),v3s16(3,2,-3))); results.push_back(VoxelArea(v3s16(3,-2,-2),v3s16(3,2,2))); UASSERT(aa.size() == results.size()); - + infostream<<"Result of diff:"<<std::endl; for(std::list<VoxelArea>::const_iterator i = aa.begin(); i != aa.end(); ++i) { i->print(infostream); infostream<<std::endl; - + std::vector<VoxelArea>::iterator j = std::find(results.begin(), results.end(), *i); UASSERT(j != results.end()); results.erase(j); @@ -784,13 +876,13 @@ struct TestVoxelManipulator: public TestBase /* VoxelManipulator */ - + VoxelManipulator v; v.print(infostream, nodedef); infostream<<"*** Setting (-1,0,-1)=2 ***"<<std::endl; - + v.setNodeNoRef(v3s16(-1,0,-1), MapNode(CONTENT_GRASS)); v.print(infostream, nodedef); @@ -806,7 +898,7 @@ struct TestVoxelManipulator: public TestBase infostream<<"*** Adding area ***"<<std::endl; v.addArea(a); - + v.print(infostream, nodedef); UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS); @@ -1004,7 +1096,7 @@ struct TestInventory: public TestBase "Empty\n" "EndInventoryList\n" "EndInventory\n"; - + std::string serialized_inventory_2 = "List main 32\n" "Width 5\n" @@ -1042,7 +1134,7 @@ struct TestInventory: public TestBase "Empty\n" "EndInventoryList\n" "EndInventory\n"; - + Inventory inv(idef); std::istringstream is(serialized_inventory, std::ios::binary); inv.deSerialize(is); @@ -1118,7 +1210,7 @@ struct TestMapBlock: public TestBase void Run() { TC parent; - + MapBlock b(&parent, v3s16(1,1,1)); v3s16 relpos(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE); @@ -1130,7 +1222,7 @@ struct TestMapBlock: public TestBase 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); - + UASSERT(b.isValidPosition(v3s16(0,0,0)) == true); UASSERT(b.isValidPosition(v3s16(-1,0,0)) == false); UASSERT(b.isValidPosition(v3s16(-1,-142,-2341)) == false); @@ -1144,7 +1236,7 @@ struct TestMapBlock: public TestBase */ /*UASSERT(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE));*/ - + // Changed flag should be initially set UASSERT(b.getModified() == MOD_STATE_WRITE_NEEDED); b.resetModified(); @@ -1161,7 +1253,7 @@ struct TestMapBlock: public TestBase UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0); UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0); } - + { MapNode n(CONTENT_AIR); for(u16 z=0; z<MAP_BLOCKSIZE; z++) @@ -1171,7 +1263,7 @@ struct TestMapBlock: public TestBase b.setNode(v3s16(x,y,z), n); } } - + /* Parent fetch functions */ @@ -1179,7 +1271,7 @@ struct TestMapBlock: public TestBase parent.node.setContent(5); MapNode n; - + // Positions in the block should still be valid UASSERT(b.isValidPositionParent(v3s16(0,0,0)) == true); UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true); @@ -1190,7 +1282,7 @@ struct TestMapBlock: public TestBase UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == false); UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == false); UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false); - + { bool exception_thrown = false; try{ @@ -1222,7 +1314,7 @@ struct TestMapBlock: public TestBase //TODO: Update to new system /*UASSERT(b.getNodeTile(p) == 4); UASSERT(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/ - + /* propagateSunlight() */ @@ -1352,29 +1444,29 @@ struct TestMapSector: public TestBase if(position_valid == false) throw InvalidPositionException(); }; - + virtual u16 nodeContainerId() const { return 666; } }; - + void Run() { TC parent; parent.position_valid = false; - + // Create one with no heightmaps ServerMapSector sector(&parent, v2s16(1,1)); - + UASSERT(sector.getBlockNoCreateNoEx(0) == 0); UASSERT(sector.getBlockNoCreateNoEx(1) == 0); MapBlock * bref = sector.createBlankBlock(-2); - + UASSERT(sector.getBlockNoCreateNoEx(0) == 0); UASSERT(sector.getBlockNoCreateNoEx(-2) == bref); - + //TODO: Check for AlreadyExistsException /*bool exception_thrown = false; @@ -1645,7 +1737,7 @@ struct TestConnection: public TestBase 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)<<std::endl; SharedBuffer<u8> p2 = con::makeReliablePacket(data1, seqnum); @@ -1707,29 +1799,29 @@ struct TestConnection: public TestBase Handler hand_server("server"); Handler hand_client("client"); - + infostream<<"** Creating server Connection"<<std::endl; con::Connection server(proto_id, 512, 5.0, false, &hand_server); Address address(0,0,0,0, 30001); server.Serve(address); - + infostream<<"** Creating client Connection"<<std::endl; con::Connection client(proto_id, 512, 5.0, false, &hand_client); - + UASSERT(hand_server.count == 0); UASSERT(hand_client.count == 0); - + sleep_ms(50); - + Address server_address(127,0,0,1, 30001); infostream<<"** running client.Connect()"<<std::endl; client.Connect(server_address); sleep_ms(50); - + // Client should not have added client yet UASSERT(hand_client.count == 0); - + try { u16 peer_id; @@ -1749,7 +1841,7 @@ struct TestConnection: public TestBase UASSERT(hand_client.last_id == 1); // Server should not have added client yet UASSERT(hand_server.count == 0); - + sleep_ms(100); try @@ -1767,14 +1859,14 @@ struct TestConnection: public TestBase // No actual data received, but the client has // probably been connected } - + // Client should be the same UASSERT(hand_client.count == 1); UASSERT(hand_client.last_id == 1); // Server should have the client UASSERT(hand_server.count == 1); UASSERT(hand_server.last_id == 2); - + //sleep_ms(50); while(client.Connected() == false) @@ -1796,7 +1888,7 @@ struct TestConnection: public TestBase } sleep_ms(50); - + try { u16 peer_id; @@ -1849,10 +1941,10 @@ struct TestConnection: public TestBase Address client_address = server.GetPeerAddress(peer_id_client); - + infostream<<"*** Sending packets in wrong order (2,1,2)" <<std::endl; - + u8 chn = 0; con::Channel *ch = &server.getPeer(peer_id_client)->channels[chn]; u16 sn = ch->next_outgoing_seqnum; @@ -1881,7 +1973,7 @@ struct TestConnection: public TestBase UASSERT(size == data1.getSize()); UASSERT(memcmp(*data1, *recvdata, data1.getSize()) == 0); UASSERT(peer_id == PEER_ID_SERVER); - + infostream<<"** running client.Receive()"<<std::endl; peer_id = 132; size = client.Receive(peer_id, recvdata); @@ -1892,7 +1984,7 @@ struct TestConnection: public TestBase UASSERT(size == data2.getSize()); UASSERT(memcmp(*data2, *recvdata, data2.getSize()) == 0); UASSERT(peer_id == PEER_ID_SERVER); - + bool got_exception = false; try { @@ -1926,14 +2018,14 @@ struct TestConnection: public TestBase SharedBuffer<u8> data1(datasize); for(u16 i=0; i<datasize; i++) data1[i] = i/4; - + int sendtimes = myrand_range(1,10); for(int i=0; i<sendtimes; i++){ server.Send(peer_id_client, 0, data1, true); sendcount++; } infostream<<"sendcount="<<sendcount<<std::endl; - + //int receivetimes = myrand_range(1,20); int receivetimes = 20; for(int i=0; i<receivetimes; i++){ @@ -1970,11 +2062,11 @@ struct TestConnection: public TestBase if(datasize>20) infostream<<"..."; infostream<<std::endl; - + server.Send(peer_id_client, 0, data1, true); //sleep_ms(3000); - + SharedBuffer<u8> recvdata; infostream<<"** running client.Receive()"<<std::endl; u16 peer_id = 132; @@ -2010,13 +2102,13 @@ struct TestConnection: public TestBase UASSERT(memcmp(*data1, *recvdata, data1.getSize()) == 0); UASSERT(peer_id == PEER_ID_SERVER); } - + // Check peer handlers UASSERT(hand_client.count == 1); UASSERT(hand_client.last_id == 1); UASSERT(hand_server.count == 1); UASSERT(hand_server.last_id == 2); - + //assert(0); } }; @@ -2043,7 +2135,7 @@ void run_tests() int tests_run = 0; int tests_failed = 0; - + // Create item and node definitions IWritableItemDefManager *idef = createItemDefManager(); IWritableNodeDefManager *ndef = createNodeDefManager(); |