added all unit test files for LayerManagerService to build and disabled tests, that...

diff --git a/LayerManagerService/CMakeLists.txt b/LayerManagerService/CMakeLists.txt
index 8d02d6a..8b73f03 100644 (file)
--- a/LayerManagerService/CMakeLists.txt
+++ b/LayerManagerService/CMakeLists.txt
@@ -62,12 +62,12 @@ enable_testing()
 
 add_executable(LayerManagerService_Test
     tests/SceneTest.cpp
-#    tests/LayermanagerTest.cpp
-#    tests/GraphicalObjectTest.cpp
-#    tests/GraphicalSurfaceTest.cpp
+    tests/LayermanagerTest.cpp
+    tests/GraphicalObjectTest.cpp
+    tests/GraphicalSurfaceTest.cpp
     tests/SurfaceTest.cpp
     tests/LayerTest.cpp
-#    tests/ShaderTest.cpp
+    tests/ShaderTest.cpp
     
     src/GraphicalObject.cpp
     src/GraphicalSurface.cpp

diff --git a/LayerManagerService/tests/GraphicalObjectTest.cpp b/LayerManagerService/tests/GraphicalObjectTest.cpp
index 66e1136..3e57b3b 100644 (file)
--- a/LayerManagerService/tests/GraphicalObjectTest.cpp
+++ b/LayerManagerService/tests/GraphicalObjectTest.cpp
@@ -42,44 +42,44 @@ public:
     GraphicalObject* m_pGraphicalObject;
 };
 
-TEST_F(GraphicalObjectTest, construction)
+TEST_F(GraphicalObjectTest, DISABLED_construction)
 {
     //GraphicalObject(ObjectType type, double opacity, bool visibility);
     //GraphicalObject(int externalId,ObjectType type, double opacity, bool visibility);
     //virtual ~GraphicalObject() {}
 }
 
-TEST_F(GraphicalObjectTest, setOpacity)
+TEST_F(GraphicalObjectTest, DISABLED_setOpacity)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, getOpacity)
+TEST_F(GraphicalObjectTest, DISABLED_getOpacity)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, setVisibility)
+TEST_F(GraphicalObjectTest, DISABLED_setVisibility)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, getVisibility)
+TEST_F(GraphicalObjectTest, DISABLED_getVisibility)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, getID)
+TEST_F(GraphicalObjectTest, DISABLED_getID)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, setShader)
+TEST_F(GraphicalObjectTest, DISABLED_setShader)
 {
 
 }
 
-TEST_F(GraphicalObjectTest, getShader)
+TEST_F(GraphicalObjectTest, DISABLED_getShader)
 {
 
 }

diff --git a/LayerManagerService/tests/GraphicalSurfaceTest.cpp b/LayerManagerService/tests/GraphicalSurfaceTest.cpp
index b0b250f..2edd81a 100644 (file)
--- a/LayerManagerService/tests/GraphicalSurfaceTest.cpp
+++ b/LayerManagerService/tests/GraphicalSurfaceTest.cpp
@@ -42,69 +42,69 @@ public:
     GraphicalSurface* m_pGraphicalSurface;
 };
 
-TEST_F(GraphicalSurfaceTest, construction)
+TEST_F(GraphicalSurfaceTest, DISABLED_construction)
 {
     //GraphicalSurface(ObjectType type);
     //GraphicalSurface(int externalId,ObjectType type);
     //virtual ~GraphicalSurface() {}
 }
 
-TEST_F(GraphicalSurfaceTest, setOrientation)
+TEST_F(GraphicalSurfaceTest, DISABLED_setOrientation)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, getOrientation)
+TEST_F(GraphicalSurfaceTest, DISABLED_getOrientation)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, setSourceRegion)
+TEST_F(GraphicalSurfaceTest, DISABLED_setSourceRegion)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, getSourceRegion)
+TEST_F(GraphicalSurfaceTest, DISABLED_getSourceRegion)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, setDestinationRegion)
+TEST_F(GraphicalSurfaceTest, DISABLED_setDestinationRegion)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, setPosition)
+TEST_F(GraphicalSurfaceTest, DISABLED_setPosition)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, getPosition)
+TEST_F(GraphicalSurfaceTest, DISABLED_getPosition)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, setDimension)
+TEST_F(GraphicalSurfaceTest, DISABLED_setDimension)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, getDestinationRegion)
+TEST_F(GraphicalSurfaceTest, DISABLED_getDestinationRegion)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, getDimension)
+TEST_F(GraphicalSurfaceTest, DISABLED_getDimension)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, isInside)
+TEST_F(GraphicalSurfaceTest, DISABLED_isInside)
 {
 
 }
 
-TEST_F(GraphicalSurfaceTest, DestToSourceCoordinates)
+TEST_F(GraphicalSurfaceTest, DISABLED_DestToSourceCoordinates)
 {
 
 }

diff --git a/LayerManagerService/tests/LayermanagerTest.cpp b/LayerManagerService/tests/LayermanagerTest.cpp
index 8fe52de..0fb105d 100644 (file)
--- a/LayerManagerService/tests/LayermanagerTest.cpp
+++ b/LayerManagerService/tests/LayermanagerTest.cpp
@@ -42,87 +42,87 @@ public:
     ICommandExecutor* m_pLayermanager;
 };
 
-TEST_F(LayermanagerTest, execute)
+TEST_F(LayermanagerTest, DISABLED_execute)
 {
 
 }
 
-TEST_F(LayermanagerTest, startManagement)
+TEST_F(LayermanagerTest, DISABLED_startManagement)
 {
 
 }
 
-TEST_F(LayermanagerTest, stopManagement)
+TEST_F(LayermanagerTest, DISABLED_stopManagement)
 {
 
 }
 
-TEST_F(LayermanagerTest, getScene)
+TEST_F(LayermanagerTest, DISABLED_getScene)
 {
 
 }
 
-TEST_F(LayermanagerTest, getRendererList)
+TEST_F(LayermanagerTest, DISABLED_getRendererList)
 {
 
 }
 
-TEST_F(LayermanagerTest, addRenderer)
+TEST_F(LayermanagerTest, DISABLED_addRenderer)
 {
 
 }
 
-TEST_F(LayermanagerTest, removeRenderer)
+TEST_F(LayermanagerTest, DISABLED_removeRenderer)
 {
 
 }
 
-TEST_F(LayermanagerTest, getCommunicatorList)
+TEST_F(LayermanagerTest, DISABLED_getCommunicatorList)
 {
 
 }
 
-TEST_F(LayermanagerTest, addCommunicator)
+TEST_F(LayermanagerTest, DISABLED_addCommunicator)
 {
 
 }
 
-TEST_F(LayermanagerTest, removeCommunicator)
+TEST_F(LayermanagerTest, DISABLED_removeCommunicator)
 {
 
 }
 
-TEST_F(LayermanagerTest, getSceneProviderList)
+TEST_F(LayermanagerTest, DISABLED_getSceneProviderList)
 {
 
 }
 
-TEST_F(LayermanagerTest, addSceneProvider)
+TEST_F(LayermanagerTest, DISABLED_addSceneProvider)
 {
 
 }
 
-TEST_F(LayermanagerTest, removeSceneProvider)
+TEST_F(LayermanagerTest, DISABLED_removeSceneProvider)
 {
 
 }
 
-TEST_F(LayermanagerTest, getLayerTypeCapabilities)
+TEST_F(LayermanagerTest, DISABLED_getLayerTypeCapabilities)
 {
 
 }
 
-TEST_F(LayermanagerTest, getNumberOfHardwareLayers)
+TEST_F(LayermanagerTest, DISABLED_getNumberOfHardwareLayers)
 {
 
 }
 
-TEST_F(LayermanagerTest, getScreenResolution)
+TEST_F(LayermanagerTest, DISABLED_getScreenResolution)
 {
 
 }
 
-TEST_F(LayermanagerTest, getScreenIDs)
+TEST_F(LayermanagerTest, DISABLED_getScreenIDs)
 {
 
 }

diff --git a/LayerManagerService/tests/SceneTest.cpp b/LayerManagerService/tests/SceneTest.cpp
index a326fc1..39449c3 100644 (file)
--- a/LayerManagerService/tests/SceneTest.cpp
+++ b/LayerManagerService/tests/SceneTest.cpp
@@ -433,10 +433,10 @@ TEST_F(SceneTest, getLayerIDs)
 TEST_F(SceneTest, getLayerIDsOfScreen)
 {
     unsigned int screenId = 0;
-    unsigned int layerId1 = 101;
-    unsigned int layerId2 = 102;
-    unsigned int layerId3 = 103;
-    unsigned int layerId4 = 104;
+    unsigned int layerId1 = 121;
+    unsigned int layerId2 = 122;
+    unsigned int layerId3 = 123;
+    unsigned int layerId4 = 124;
     unsigned int size;
     unsigned int* array;
     Layer* l1;
@@ -493,44 +493,116 @@ TEST_F(SceneTest, getLayerIDsOfScreen)
 
 TEST_F(SceneTest, getSurfaceIDs)
 {
+    unsigned int surfaceId1 = 141;
+    unsigned int surfaceId2 = 142;
+    unsigned int surfaceId3 = 143;
+    unsigned int surfaceId4 = 144;
+    unsigned int size;
+    unsigned int* array;
+
+    /// make sure, scene contains no surfaces
+    m_pScene->getSurfaceIDs(&size, &array);
+    ASSERT_EQ(0, size);
+
+    /// create 4 surfaces in scene
+    m_pScene->createSurface(surfaceId1);
+    m_pScene->createSurface(surfaceId2);
+    m_pScene->createSurface(surfaceId3);
+    m_pScene->createSurface(surfaceId4);
+
+    /// make sure, scene contains these 4 surfaces
+    m_pScene->getSurfaceIDs(&size, &array);
+    ASSERT_EQ(4, size);
+    EXPECT_EQ(surfaceId1, array[0]);
+    EXPECT_EQ(surfaceId2, array[1]);
+    EXPECT_EQ(surfaceId3, array[2]);
+    EXPECT_EQ(surfaceId4, array[3]);
 }
 
 TEST_F(SceneTest, getLayerGroupIDs)
 {
+    unsigned int layergroupId1 = 201;
+    unsigned int layergroupId2 = 202;
+    unsigned int layergroupId3 = 203;
+    unsigned int layergroupId4 = 204;
+    unsigned int size;
+    unsigned int* array;
+
+    /// make sure, scene contains no layergroups
+    m_pScene->getLayerGroupIDs(&size, &array);
+    ASSERT_EQ(0, size);
+
+    /// create 4 layergroups in scene
+    m_pScene->createLayerGroup(layergroupId1);
+    m_pScene->createLayerGroup(layergroupId2);
+    m_pScene->createLayerGroup(layergroupId3);
+    m_pScene->createLayerGroup(layergroupId4);
+
+    /// make sure, scene contains these 4 layergroups
+    m_pScene->getLayerGroupIDs(&size, &array);
+    ASSERT_EQ(4, size);
+    EXPECT_EQ(layergroupId1, array[0]);
+    EXPECT_EQ(layergroupId2, array[1]);
+    EXPECT_EQ(layergroupId3, array[2]);
+    EXPECT_EQ(layergroupId4, array[3]);
 }
 
 TEST_F(SceneTest, getSurfaceGroupIDs)
 {
+    unsigned int surfacegroupId1 = 201;
+    unsigned int surfacegroupId2 = 202;
+    unsigned int surfacegroupId3 = 203;
+    unsigned int surfacegroupId4 = 204;
+    unsigned int size;
+    unsigned int* array;
+
+    /// make sure, scene contains no surfacegroups
+    m_pScene->getSurfaceGroupIDs(&size, &array);
+    ASSERT_EQ(0, size);
+
+    /// create 4 surfacegroups in scene
+    m_pScene->createSurfaceGroup(surfacegroupId1);
+    m_pScene->createSurfaceGroup(surfacegroupId2);
+    m_pScene->createSurfaceGroup(surfacegroupId3);
+    m_pScene->createSurfaceGroup(surfacegroupId4);
+
+    /// make sure, scene contains these 4 surfacegroups
+    m_pScene->getSurfaceGroupIDs(&size, &array);
+    ASSERT_EQ(4, size);
+    EXPECT_EQ(surfacegroupId1, array[0]);
+    EXPECT_EQ(surfacegroupId2, array[1]);
+    EXPECT_EQ(surfacegroupId3, array[2]);
+    EXPECT_EQ(surfacegroupId4, array[3]);
 }
 
-TEST_F(SceneTest, lockScene)
+TEST_F(SceneTest, DISABLED_lockScene)
 {
 }
 
-TEST_F(SceneTest, unlockScene)
+TEST_F(SceneTest, DISABLED_unlockScene)
 {
 }
 
-TEST_F(SceneTest, getCurrentRenderOrder)
+TEST_F(SceneTest, DISABLED_getCurrentRenderOrder)
 {
 }
 
-TEST_F(SceneTest, removeSurfaceGroup)
+TEST_F(SceneTest, DISABLED_removeSurfaceGroup)
 {
 }
 
-TEST_F(SceneTest, removeLayerGroup)
+TEST_F(SceneTest, DISABLED_removeLayerGroup)
 {
 }
 
-TEST_F(SceneTest, getAllSurfaces)
+TEST_F(SceneTest, DISABLED_getAllSurfaces)
 {
 }
 
-TEST_F(SceneTest, getSurfaceAt)
+TEST_F(SceneTest, DISABLED_getSurfaceAt)
 {
 }
 
-TEST_F(SceneTest, isLayerInCurrentRenderOrder)
+TEST_F(SceneTest, DISABLED_isLayerInCurrentRenderOrder)
 {
 }

diff --git a/LayerManagerService/tests/ShaderTest.cpp b/LayerManagerService/tests/ShaderTest.cpp
index 6d6f3fd..f19a592 100644 (file)
--- a/LayerManagerService/tests/ShaderTest.cpp
+++ b/LayerManagerService/tests/ShaderTest.cpp
@@ -45,33 +45,33 @@ public:
     Shader* m_pShader;
 };
 
-TEST_F(ShaderTest, construction)
+TEST_F(ShaderTest, DISABLED_construction)
 {
     //static Shader* createShader(const string& vertFileName, const string& fragFileName);
     //~Shader();
 }
 
-TEST_F(ShaderTest, getId)
+TEST_F(ShaderTest, DISABLED_getId)
 {
 
 }
 
-TEST_F(ShaderTest, use)
+TEST_F(ShaderTest, DISABLED_use)
 {
 
 }
 
-TEST_F(ShaderTest, setUniform)
+TEST_F(ShaderTest, DISABLED_setUniform)
 {
 
 }
 
-TEST_F(ShaderTest, loadUniforms)
+TEST_F(ShaderTest, DISABLED_loadUniforms)
 {
 
 }
 
-TEST_F(ShaderTest, loadCommonUniforms)
+TEST_F(ShaderTest, DISABLED_loadCommonUniforms)
 {
 
 }