mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix compile fixed in test file

Browse Source
This commit is contained in:
Alexander Bock
2014-05-08 23:50:41 +02:00
parent 1851f55c35
commit 60fcb964d5
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/openspace/tests/test_scenegraph.inl
View File

@@ -50,9 +50,10 @@ protected:
};
TEST_F(SceneGraphTest, SceneGraphNode) {
openspace::SceneGraphNode* node = new openspace::SceneGraphNode(ghoul::Dictionary());
openspace::SceneGraphNode *node =
openspace::SceneGraphNode::createFromDictionary(ghoul::Dictionary());
// Should not have a renderable and position should be 0,0,0,0 (undefined).
EXPECT_EQ(nullptr, node->getRenderable());
EXPECT_EQ(openspace::psc(), node->getPosition());
@@ -78,7 +79,8 @@ TEST_F(SceneGraphTest, SceneGraphNode) {
nodeDictionary.setValue("Position", positionDictionary);
nodeDictionary.setValue("Renderable", renderableDictionary);
node = new openspace::SceneGraphNode(nodeDictionary);
node =
openspace::SceneGraphNode::createFromDictionary(nodeDictionary);
// This node should have a renderable (probably no good values but an existing one)
EXPECT_TRUE(node->getRenderable());
@@ -93,26 +95,26 @@ TEST_F(SceneGraphTest, Loading) {
// Should not successfully load a non existing scenegraph
EXPECT_FALSE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTestNonExisting")));
EXPECT_FALSE(_scenegraph->loadScene(absPath("${TESTDIR}/ScenegraphTestNonExisting"), absPath("${TESTDIR}")));
// Existing scenegraph should load
EXPECT_TRUE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
EXPECT_TRUE(_scenegraph->loadScene(absPath("${TESTDIR}/ScenegraphTest"), absPath("${TESTDIR}")));
// TODO need to check for correctness
// This loading should fail regardless of existing or not since the
// scenegraph is already loaded
EXPECT_FALSE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
EXPECT_FALSE(_scenegraph->loadScene(absPath("${TESTDIR}/ScenegraphTest"), absPath("${TESTDIR}")));
}
TEST_F(SceneGraphTest, Reinitializing) {
// Existing scenegraph should load
EXPECT_TRUE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
EXPECT_TRUE(_scenegraph->loadScene(absPath("${TESTDIR}/ScenegraphTest"), absPath("${TESTDIR}")));
_scenegraph->deinitialize();
// Existing scenegraph should load
EXPECT_TRUE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
EXPECT_TRUE(_scenegraph->loadScene(absPath("${TESTDIR}/ScenegraphTest"), absPath("${TESTDIR}")));
// TODO need to check for correctness
}