#include <sstream>
#include "porting.h"
#include "content_mapnode.h"
+#include "mapsector.h"
+#include "settings.h"
+#include "log.h"
/*
Asserts that the exception occurs
{
void Run()
{
- /*dstream<<"wrapDegrees(100.0) = "<<wrapDegrees(100.0)<<std::endl;
- dstream<<"wrapDegrees(720.5) = "<<wrapDegrees(720.5)<<std::endl;
- dstream<<"wrapDegrees(-0.5) = "<<wrapDegrees(-0.5)<<std::endl;*/
+ /*infostream<<"wrapDegrees(100.0) = "<<wrapDegrees(100.0)<<std::endl;
+ infostream<<"wrapDegrees(720.5) = "<<wrapDegrees(720.5)<<std::endl;
+ infostream<<"wrapDegrees(-0.5) = "<<wrapDegrees(-0.5)<<std::endl;*/
assert(fabs(wrapDegrees(100.0) - 100.0) < 0.001);
assert(fabs(wrapDegrees(720.5) - 0.5) < 0.001);
assert(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
assert(is_yes("FAlse") == false);
}
};
+
+struct TestSettings
+{
+ void Run()
+ {
+ Settings s;
+ // Test reading of settings
+ s.parseConfigLine("leet = 1337");
+ s.parseConfigLine("leetleet = 13371337");
+ s.parseConfigLine("leetleet_neg = -13371337");
+ s.parseConfigLine("floaty_thing = 1.1");
+ s.parseConfigLine("stringy_thing = asd /( ¤%&(/\" BLÖÄRP");
+ s.parseConfigLine("coord = (1, 2, 4.5)");
+ assert(s.getS32("leet") == 1337);
+ assert(s.getS16("leetleet") == 32767);
+ assert(s.getS16("leetleet_neg") == -32768);
+ // Not sure if 1.1 is an exact value as a float, but doesn't matter
+ assert(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
+ assert(s.get("stringy_thing") == "asd /( ¤%&(/\" BLÖÄRP");
+ assert(fabs(s.getV3F("coord").X - 1.0) < 0.001);
+ assert(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
+ assert(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));
+ assert(s.get("floaty_thing_2").substr(0,3) == "1.2");
+ assert(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
+ assert(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
+ assert(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
+ assert(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
+ }
+};
struct TestCompress
{
std::string str_out = os.str();
- dstream<<"str_out.size()="<<str_out.size()<<std::endl;
- dstream<<"TestCompress: 1,5,5,1 -> ";
+ infostream<<"str_out.size()="<<str_out.size()<<std::endl;
+ infostream<<"TestCompress: 1,5,5,1 -> ";
for(u32 i=0; i<str_out.size(); i++)
{
- dstream<<(u32)str_out[i]<<",";
+ infostream<<(u32)str_out[i]<<",";
}
- dstream<<std::endl;
+ infostream<<std::endl;
assert(str_out.size() == 10);
decompress(is, os2, 0);
std::string str_out2 = os2.str();
- dstream<<"decompress: ";
+ infostream<<"decompress: ";
for(u32 i=0; i<str_out2.size(); i++)
{
- dstream<<(u32)str_out2[i]<<",";
+ infostream<<(u32)str_out2[i]<<",";
}
- dstream<<std::endl;
+ infostream<<std::endl;
assert(str_out2.size() == fromdata.getSize());
std::string str_out = os.str();
- dstream<<"str_out.size()="<<str_out.size()<<std::endl;
- dstream<<"TestCompress: 1,5,5,1 -> ";
+ infostream<<"str_out.size()="<<str_out.size()<<std::endl;
+ infostream<<"TestCompress: 1,5,5,1 -> ";
for(u32 i=0; i<str_out.size(); i++)
{
- dstream<<(u32)str_out[i]<<",";
+ infostream<<(u32)str_out[i]<<",";
}
- dstream<<std::endl;
+ infostream<<std::endl;
/*assert(str_out.size() == 10);
decompress(is, os2, SER_FMT_VER_HIGHEST);
std::string str_out2 = os2.str();
- dstream<<"decompress: ";
+ infostream<<"decompress: ";
for(u32 i=0; i<str_out2.size(); i++)
{
- dstream<<(u32)str_out2[i]<<",";
+ infostream<<(u32)str_out2[i]<<",";
}
- dstream<<std::endl;
+ infostream<<std::endl;
assert(str_out2.size() == fromdata.getSize());
MapNode n;
// Default values
- assert(n.d == CONTENT_AIR);
+ assert(n.getContent() == CONTENT_AIR);
assert(n.getLight(LIGHTBANK_DAY) == 0);
assert(n.getLight(LIGHTBANK_NIGHT) == 0);
// Transparency
- n.d = CONTENT_AIR;
+ n.setContent(CONTENT_AIR);
assert(n.light_propagates() == true);
- n.d = CONTENT_STONE;
+ n.setContent(CONTENT_STONE);
assert(n.light_propagates() == false);
}
};
assert(aa.size() == results.size());
- dstream<<"Result of diff:"<<std::endl;
+ infostream<<"Result of diff:"<<std::endl;
for(core::list<VoxelArea>::Iterator
i = aa.begin(); i != aa.end(); i++)
{
- i->print(dstream);
- dstream<<std::endl;
+ i->print(infostream);
+ infostream<<std::endl;
s32 j = results.linear_search(*i);
assert(j != -1);
VoxelManipulator v;
- v.print(dstream);
+ v.print(infostream);
- dstream<<"*** Setting (-1,0,-1)=2 ***"<<std::endl;
+ infostream<<"*** Setting (-1,0,-1)=2 ***"<<std::endl;
v.setNodeNoRef(v3s16(-1,0,-1), MapNode(2));
- v.print(dstream);
+ v.print(infostream);
- assert(v.getNode(v3s16(-1,0,-1)).d == 2);
+ assert(v.getNode(v3s16(-1,0,-1)).getContent() == 2);
- dstream<<"*** Reading from inexistent (0,0,-1) ***"<<std::endl;
+ infostream<<"*** Reading from inexistent (0,0,-1) ***"<<std::endl;
EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,0,-1)));
- v.print(dstream);
+ v.print(infostream);
- dstream<<"*** Adding area ***"<<std::endl;
+ infostream<<"*** Adding area ***"<<std::endl;
v.addArea(a);
- v.print(dstream);
+ v.print(infostream);
- assert(v.getNode(v3s16(-1,0,-1)).d == 2);
+ assert(v.getNode(v3s16(-1,0,-1)).getContent() == 2);
EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,1,1)));
#if 0
MapNode n;
//n.pressure = size.Y - y;
if(*p == '#')
- n.d = CONTENT_STONE;
+ n.setContent(CONTENT_STONE);
else if(*p == '.')
- n.d = CONTENT_WATER;
+ n.setContent(CONTENT_WATER);
else if(*p == ' ')
- n.d = CONTENT_AIR;
+ n.setContent(CONTENT_AIR);
else
assert(0);
v.setNode(v3s16(x,y,z), n);
p++;
}
- v.print(dstream, VOXELPRINT_WATERPRESSURE);
+ v.print(infostream, VOXELPRINT_WATERPRESSURE);
core::map<v3s16, u8> active_nodes;
v.updateAreaWaterPressure(area, active_nodes);
- v.print(dstream, VOXELPRINT_WATERPRESSURE);
+ v.print(infostream, VOXELPRINT_WATERPRESSURE);
//s16 highest_y = -32768;
/*
//v.flowWater(active_nodes, 0, true, 1000);
v.flowWater(active_nodes, 0, false, 1000);
- dstream<<"Final result of flowWater:"<<std::endl;
- v.print(dstream, VOXELPRINT_WATERPRESSURE);
+ infostream<<"Final result of flowWater:"<<std::endl;
+ v.print(infostream, VOXELPRINT_WATERPRESSURE);
#endif
//assert(0);
}
};
+/*
+ NOTE: These tests became non-working then NodeContainer was removed.
+ These should be redone, utilizing some kind of a virtual
+ interface for Map (IMap would be fine).
+*/
+#if 0
struct TestMapBlock
{
class TC : public NodeContainer
assert(b.getChangedFlag() == false);
// All nodes should have been set to
- // .d=CONTENT_AIR and .getLight() = 0
+ // .d=CONTENT_IGNORE and .getLight() = 0
for(u16 z=0; z<MAP_BLOCKSIZE; z++)
for(u16 y=0; y<MAP_BLOCKSIZE; y++)
for(u16 x=0; x<MAP_BLOCKSIZE; x++)
{
- assert(b.getNode(v3s16(x,y,z)).d == CONTENT_AIR);
+ //assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
+ assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
}
+ {
+ MapNode n(CONTENT_AIR);
+ for(u16 z=0; z<MAP_BLOCKSIZE; z++)
+ for(u16 y=0; y<MAP_BLOCKSIZE; y++)
+ for(u16 x=0; x<MAP_BLOCKSIZE; x++)
+ {
+ b.setNode(v3s16(x,y,z), n);
+ }
+ }
+
/*
Parent fetch functions
*/
parent.position_valid = false;
- parent.node.d = 5;
+ parent.node.setContent(5);
MapNode n;
assert(b.isValidPositionParent(v3s16(0,0,0)) == true);
assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
n = b.getNodeParent(v3s16(0,MAP_BLOCKSIZE-1,0));
- assert(n.d == CONTENT_AIR);
+ assert(n.getContent() == CONTENT_AIR);
// ...but outside the block they should be invalid
assert(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
assert(b.isValidPositionParent(v3s16(-1,0,0)) == true);
assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
n = b.getNodeParent(v3s16(0,0,MAP_BLOCKSIZE));
- assert(n.d == 5);
+ assert(n.getContent() == 5);
/*
Set a node
*/
v3s16 p(1,2,0);
- n.d = 4;
+ n.setContent(4);
b.setNode(p, n);
- assert(b.getNode(p).d == 4);
+ assert(b.getNode(p).getContent() == 4);
//TODO: Update to new system
/*assert(b.getNodeTile(p) == 4);
assert(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
*/
parent.position_valid = true;
b.setIsUnderground(false);
- parent.node.d = CONTENT_AIR;
+ parent.node.setContent(CONTENT_AIR);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN);
parent.node.setLight(LIGHTBANK_NIGHT, 0);
core::map<v3s16, bool> light_sources;
for(u16 y=0; y<MAP_BLOCKSIZE; y++){
for(u16 x=0; x<MAP_BLOCKSIZE; x++){
MapNode n;
- n.d = CONTENT_AIR;
+ n.setContent(CONTENT_AIR);
n.setLight(LIGHTBANK_DAY, 0);
b.setNode(v3s16(x,y,z), n);
}
// Create one with no heightmaps
ServerMapSector sector(&parent, v2s16(1,1));
- EXCEPTION_CHECK(InvalidPositionException, sector.getBlockNoCreate(0));
- EXCEPTION_CHECK(InvalidPositionException, sector.getBlockNoCreate(1));
+ assert(sector.getBlockNoCreateNoEx(0) == 0);
+ assert(sector.getBlockNoCreateNoEx(1) == 0);
MapBlock * bref = sector.createBlankBlock(-2);
- EXCEPTION_CHECK(InvalidPositionException, sector.getBlockNoCreate(0));
- assert(sector.getBlockNoCreate(-2) == bref);
+ assert(sector.getBlockNoCreateNoEx(0) == 0);
+ assert(sector.getBlockNoCreateNoEx(-2) == bref);
//TODO: Check for AlreadyExistsException
}
};
+#endif
struct TestSocket
{
assert(readU8(&p1.data[6]) == channel);
assert(readU8(&p1.data[7]) == data1[0]);
- //dstream<<"initial data1[0]="<<((u32)data1[0]&0xff)<<std::endl;
+ //infostream<<"initial data1[0]="<<((u32)data1[0]&0xff)<<std::endl;
SharedBuffer<u8> p2 = con::makeReliablePacket(data1, seqnum);
- /*dstream<<"p2.getSize()="<<p2.getSize()<<", data1.getSize()="
+ /*infostream<<"p2.getSize()="<<p2.getSize()<<", data1.getSize()="
<<data1.getSize()<<std::endl;
- dstream<<"readU8(&p2[3])="<<readU8(&p2[3])
+ infostream<<"readU8(&p2[3])="<<readU8(&p2[3])
<<" p2[3]="<<((u32)p2[3]&0xff)<<std::endl;
- dstream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
+ infostream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
assert(p2.getSize() == 3 + data1.getSize());
assert(readU8(&p2[0]) == TYPE_RELIABLE);
}
void peerAdded(con::Peer *peer)
{
- dstream<<"Handler("<<name<<")::peerAdded(): "
+ infostream<<"Handler("<<name<<")::peerAdded(): "
"id="<<peer->id<<std::endl;
last_id = peer->id;
count++;
}
void deletingPeer(con::Peer *peer, bool timeout)
{
- dstream<<"Handler("<<name<<")::deletingPeer(): "
+ infostream<<"Handler("<<name<<")::deletingPeer(): "
"id="<<peer->id
<<", timeout="<<timeout<<std::endl;
last_id = peer->id;
Handler hand_server("server");
Handler hand_client("client");
- dstream<<"** Creating server Connection"<<std::endl;
+ infostream<<"** Creating server Connection"<<std::endl;
con::Connection server(proto_id, 512, 5.0, &hand_server);
server.Serve(30001);
- dstream<<"** Creating client Connection"<<std::endl;
+ infostream<<"** Creating client Connection"<<std::endl;
con::Connection client(proto_id, 512, 5.0, &hand_client);
assert(hand_server.count == 0);
sleep_ms(50);
Address server_address(127,0,0,1, 30001);
- dstream<<"** running client.Connect()"<<std::endl;
+ infostream<<"** running client.Connect()"<<std::endl;
client.Connect(server_address);
sleep_ms(50);
{
u16 peer_id;
u8 data[100];
- dstream<<"** running server.Receive()"<<std::endl;
+ infostream<<"** running server.Receive()"<<std::endl;
u32 size = server.Receive(peer_id, data, 100);
- dstream<<"** Server received: peer_id="<<peer_id
+ infostream<<"** Server received: peer_id="<<peer_id
<<", size="<<size
<<std::endl;
}
{
u16 peer_id;
u8 data[100];
- dstream<<"** running client.Receive()"<<std::endl;
+ infostream<<"** running client.Receive()"<<std::endl;
u32 size = client.Receive(peer_id, data, 100);
- dstream<<"** Client received: peer_id="<<peer_id
+ infostream<<"** Client received: peer_id="<<peer_id
<<", size="<<size
<<std::endl;
}
{
u16 peer_id;
u8 data[100];
- dstream<<"** running server.Receive()"<<std::endl;
+ infostream<<"** running server.Receive()"<<std::endl;
u32 size = server.Receive(peer_id, data, 100);
- dstream<<"** Server received: peer_id="<<peer_id
+ infostream<<"** Server received: peer_id="<<peer_id
<<", size="<<size
<<std::endl;
}
u32 datasize = sizeof(data);*/
SharedBuffer<u8> data = SharedBufferFromString("Hello World!");
- dstream<<"** running client.Send()"<<std::endl;
+ infostream<<"** running client.Send()"<<std::endl;
client.Send(PEER_ID_SERVER, 0, data, true);
sleep_ms(50);
u16 peer_id;
u8 recvdata[100];
- dstream<<"** running server.Receive()"<<std::endl;
+ infostream<<"** running server.Receive()"<<std::endl;
u32 size = server.Receive(peer_id, recvdata, 100);
- dstream<<"** Server received: peer_id="<<peer_id
+ infostream<<"** Server received: peer_id="<<peer_id
<<", size="<<size
<<", data="<<*data
<<std::endl;
Address client_address =
server.GetPeer(peer_id_client)->address;
- dstream<<"*** Sending packets in wrong order (2,1,2)"
+ infostream<<"*** Sending packets in wrong order (2,1,2)"
<<std::endl;
u8 chn = 0;
sleep_ms(50);
- dstream<<"*** Receiving the packets"<<std::endl;
+ infostream<<"*** Receiving the packets"<<std::endl;
u16 peer_id;
u8 recvdata[20];
u32 size;
- dstream<<"** running client.Receive()"<<std::endl;
+ infostream<<"** running client.Receive()"<<std::endl;
peer_id = 132;
size = client.Receive(peer_id, recvdata, 20);
- dstream<<"** Client received: peer_id="<<peer_id
+ infostream<<"** Client received: peer_id="<<peer_id
<<", size="<<size
<<", data="<<recvdata
<<std::endl;
assert(memcmp(*data1, recvdata, data1.getSize()) == 0);
assert(peer_id == PEER_ID_SERVER);
- dstream<<"** running client.Receive()"<<std::endl;
+ infostream<<"** running client.Receive()"<<std::endl;
peer_id = 132;
size = client.Receive(peer_id, recvdata, 20);
- dstream<<"** Client received: peer_id="<<peer_id
+ infostream<<"** Client received: peer_id="<<peer_id
<<", size="<<size
<<", data="<<recvdata
<<std::endl;
bool got_exception = false;
try
{
- dstream<<"** running client.Receive()"<<std::endl;
+ infostream<<"** running client.Receive()"<<std::endl;
peer_id = 132;
size = client.Receive(peer_id, recvdata, 20);
- dstream<<"** Client received: peer_id="<<peer_id
+ infostream<<"** Client received: peer_id="<<peer_id
<<", size="<<size
<<", data="<<recvdata
<<std::endl;
}
catch(con::NoIncomingDataException &e)
{
- dstream<<"** No incoming data for client"<<std::endl;
+ infostream<<"** No incoming data for client"<<std::endl;
got_exception = true;
}
assert(got_exception);
data1[i] = i/4;
}
- dstream<<"Sending data (size="<<datasize<<"):";
+ infostream<<"Sending data (size="<<datasize<<"):";
for(int i=0; i<datasize && i<20; i++){
if(i%2==0) DEBUGPRINT(" ");
DEBUGPRINT("%.2X", ((int)((const char*)*data1)[i])&0xff);
}
if(datasize>20)
- dstream<<"...";
- dstream<<std::endl;
+ infostream<<"...";
+ infostream<<std::endl;
server.Send(peer_id_client, 0, data1, true);
sleep_ms(50);
u8 recvdata[datasize + 1000];
- dstream<<"** running client.Receive()"<<std::endl;
+ infostream<<"** running client.Receive()"<<std::endl;
u16 peer_id = 132;
u16 size = client.Receive(peer_id, recvdata, datasize + 1000);
- dstream<<"** Client received: peer_id="<<peer_id
+ infostream<<"** Client received: peer_id="<<peer_id
<<", size="<<size
<<std::endl;
- dstream<<"Received data (size="<<size<<"):";
+ infostream<<"Received data (size="<<size<<"):";
for(int i=0; i<size && i<20; i++){
if(i%2==0) DEBUGPRINT(" ");
DEBUGPRINT("%.2X", ((int)((const char*)recvdata)[i])&0xff);
}
if(size>20)
- dstream<<"...";
- dstream<<std::endl;
+ infostream<<"...";
+ infostream<<std::endl;
assert(memcmp(*data1, recvdata, data1.getSize()) == 0);
assert(peer_id == PEER_ID_SERVER);
#define TEST(X)\
{\
X x;\
- dstream<<"Running " #X <<std::endl;\
+ infostream<<"Running " #X <<std::endl;\
x.Run();\
}
void run_tests()
{
DSTACK(__FUNCTION_NAME);
- dstream<<"run_tests() started"<<std::endl;
+ infostream<<"run_tests() started"<<std::endl;
TEST(TestUtilities);
+ TEST(TestSettings);
TEST(TestCompress);
TEST(TestMapNode);
TEST(TestVoxelManipulator);
- TEST(TestMapBlock);
- TEST(TestMapSector);
+ //TEST(TestMapBlock);
+ //TEST(TestMapSector);
if(INTERNET_SIMULATOR == false){
TEST(TestSocket);
dout_con<<"=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
TEST(TestConnection);
dout_con<<"=== END RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
}
- dstream<<"run_tests() passed"<<std::endl;
+ infostream<<"run_tests() passed"<<std::endl;
}