Common update:
-added multiple new function to allocate template and add entity -updated README.md (complete initial version) -empty components now don't take memory -fixedd small bug with TestRunner -added many new tests (HashMap, Vector, EntityMeta, ...) -added default hashing function to HashMap -fixed critical bug with adding entities -fixed small bug with adding entity with remplacement components -added asserts into code to better bug detection -small performance improvement for events -added ComponentRef structure which contain data pointer and componentID -remove EntityID from Event structure -now events are handled before removing entiteis -fixed GDC compilation -fixed rendering of rotated sprites -added weapons as separate entities to space ship and others -added Tower enemy to SpaceInvaders demo -added Boss to SpaceInvaders demo (boss has four tower attached to it) -Boss towers shoot multiple bullets upon death -fixed critical bug with demos switching -fixed critical bug related to adding/removing entities form inside onAdd/onRemove entity callback -added animation support -added particles sypport and particles for firing and explostions, and more -multithreaded rendering now has same rendering order as singlethreaded -application automaticallu detect host CPU threads count -added upgrades to SPaceInvaders demo -fixed texture memory freeing -improved documentation -improved multithreaded performance -improve shader code -fixed registration issue -some additional performance improvements -added depth and colors to rendering parameters -jobs now has names corresponding to their systems -change execute() -> willExecute() -added EntityMeta structure to speedup getting fetching components form entity -improved multithreading rendering -added possibility tio change number of threads runtime -added bullets collision detection in SpaceInvaders demo -some CI changes -added VBO batch rendering (current default, no render mode switch yet) -fixed camera positioning calculation -fixed buffer issue with WebGL -added viewport scalling (at least 300 pixels height). Pixels are scalled if screen is bigger. -center demos gameplay area -added fullpage html template for Emscripten build -added many new sprites to atlas -fixed critical bug with CPU usage in multithreaded mode -snake render tile coresponding to body part -snake is destroyed after collision and emit some particles -added some functionality to vectors -fixed documentation issue in Manager.d -more minor code changes and cleanup
This commit is contained in:
parent
2ddb97e9ce
commit
024356df9b
62 changed files with 5918 additions and 1673 deletions
101
tests/runner.d
101
tests/runner.d
|
|
@ -5,9 +5,22 @@ import core.stdc.stdio;
|
|||
import core.stdc.string;
|
||||
import core.sys.posix.setjmp;
|
||||
|
||||
import ecs.vector;
|
||||
import ecs.simple_vector;
|
||||
import ecs.std;
|
||||
import bubel.ecs.vector;
|
||||
import bubel.ecs.simple_vector;
|
||||
import bubel.ecs.std;
|
||||
|
||||
import std.traits;
|
||||
|
||||
import tests.time;
|
||||
|
||||
version (LDC)
|
||||
{
|
||||
import ldc.attributes;
|
||||
}
|
||||
else
|
||||
{
|
||||
enum optStrategy = 0;
|
||||
}
|
||||
|
||||
enum int ASSERTED = 123;
|
||||
enum string OUT_FILE = "test_report.xml";
|
||||
|
|
@ -95,6 +108,8 @@ struct TestRunner(Args...)
|
|||
write(test.name);
|
||||
write("\" classname=\"");
|
||||
write(suite.name);
|
||||
write("\" time=\"");
|
||||
write(cast(double)test.time*0.000001);
|
||||
write("\">");
|
||||
if (test.msg)
|
||||
{
|
||||
|
|
@ -120,42 +135,65 @@ struct TestRunner(Args...)
|
|||
write("</testsuites>");
|
||||
}
|
||||
|
||||
@(optStrategy,"none")
|
||||
void runTests(string[] include = null, string[] exclude = null)
|
||||
{
|
||||
foreach (i, module_; Args)
|
||||
{
|
||||
TestSuite* suite = &suites[i];
|
||||
suite.name = module_.stringof;
|
||||
|
||||
void function() before;
|
||||
void function() after;
|
||||
|
||||
foreach (index, unittest_; __traits(getUnitTests, module_))
|
||||
{
|
||||
enum attributes = __traits(getAttributes, unittest_);
|
||||
|
||||
static if (attributes.length != 0)
|
||||
{
|
||||
if (include.length > 0)
|
||||
foreach(attr_id, attr; attributes)
|
||||
{
|
||||
bool matched = false;
|
||||
foreach (str; include)
|
||||
static if(isFunctionPointer!(attr)){}
|
||||
else static if(attr == "_tr_before")
|
||||
{
|
||||
if (match(str, attributes[0]))
|
||||
{
|
||||
matched = true;
|
||||
break;
|
||||
}
|
||||
static assert(attr_id+1 < attributes.length);
|
||||
enum attr2 = attributes[attr_id + 1];
|
||||
//static assert(__traits(hasMember, module_, attr2));
|
||||
//alias func = __traits(getMember, module_, attr2);
|
||||
//attr2();
|
||||
before = attr2;
|
||||
//static assert(is(typeof(__traits(getMember, module_, attr2)) == void function()));
|
||||
}
|
||||
|
||||
foreach (str; exclude)
|
||||
else
|
||||
{
|
||||
if (match(str, attributes[0]))
|
||||
if (include.length > 0)
|
||||
{
|
||||
matched = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
bool matched = false;
|
||||
foreach (str; include)
|
||||
{
|
||||
if (match(str, attr))
|
||||
{
|
||||
matched = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!matched)
|
||||
{
|
||||
suite.skipped++;
|
||||
continue;
|
||||
foreach (str; exclude)
|
||||
{
|
||||
if (match(str, attr))
|
||||
{
|
||||
matched = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!matched)
|
||||
{
|
||||
suite.skipped++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -172,8 +210,9 @@ struct TestRunner(Args...)
|
|||
else
|
||||
test.name = attributes[0];
|
||||
|
||||
static if (__traits(hasMember, module_, "beforeEveryTest"))
|
||||
static if (__traits(hasMember, module_, "beforeEveryTest") && __traits(compiles, module_.beforeEveryTest()))
|
||||
module_.beforeEveryTest();
|
||||
if(before)before();
|
||||
|
||||
version(D_BetterC)
|
||||
{
|
||||
|
|
@ -189,8 +228,10 @@ struct TestRunner(Args...)
|
|||
}
|
||||
else
|
||||
{
|
||||
long time = Time.getUSecTime();
|
||||
unittest_();
|
||||
test.passed = true;
|
||||
test.time = cast(int)(Time.getUSecTime() - time);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -215,7 +256,7 @@ struct TestRunner(Args...)
|
|||
else
|
||||
suite.failed++;
|
||||
suite.tests ~= test;
|
||||
static if (__traits(hasMember, module_, "afterEveryTest"))
|
||||
static if (__traits(hasMember, module_, "afterEveryTest") && __traits(compiles, module_.beforeEveryTest()))
|
||||
module_.afterEveryTest();
|
||||
}
|
||||
passed += suite.passed;
|
||||
|
|
@ -281,6 +322,14 @@ struct TestRunner(Args...)
|
|||
junit.add(cast(ubyte[]) txt);
|
||||
}
|
||||
|
||||
void write(double num)
|
||||
{
|
||||
ubyte[40] buffer;
|
||||
int len;
|
||||
len = sprintf(cast(char*) buffer.ptr, "%2.8lf", num);
|
||||
junit.add(buffer[0 .. len]);
|
||||
}
|
||||
|
||||
void write(uint num)
|
||||
{
|
||||
ubyte[20] buffer;
|
||||
|
|
@ -304,6 +353,8 @@ version (notBetterC)
|
|||
version (D_Coverage) extern (C) void dmd_coverDestPath(string path);
|
||||
}
|
||||
|
||||
enum before = "_tr_before";
|
||||
|
||||
void extractStrings(ref Vector!string container, string str)
|
||||
{
|
||||
uint s = 0;
|
||||
|
|
@ -369,7 +420,7 @@ extern (C) int main(int argc, char** args)
|
|||
}
|
||||
}
|
||||
|
||||
TestRunner!(tests.runner, tests.id_manager, tests.vector, tests.basic) runner;
|
||||
TestRunner!(tests.id_manager, tests.vector, tests.basic, tests.perf, tests.access_perf, tests.bugs, tests.map) runner;
|
||||
|
||||
runner.runTests(include[], exclude[]);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue