LayerManagerService Tests: Adapt new getCurrentRenderOrder
authorNobuhiko Tanibata <ntanibata@jp.adit-jv.com>
Wed, 9 Jan 2013 04:42:19 +0000 (13:42 +0900)
committerTimo Lotterbach <timo.lotterbach@bmw-carit.de>
Wed, 9 Jan 2013 13:06:35 +0000 (05:06 -0800)
Signed-off-by: Nobuhiko Tanibata <ntanibata@jp.adit-jv.com>
LayerManagerService/tests/InputManagerTest.cpp
LayerManagerService/tests/SceneTest.cpp

index 197caaa..27332ee 100644 (file)
@@ -143,7 +143,7 @@ static Layer* createComplexLayer_1(IScene *m_pScene)
     pLayer->addSurface(pSurface);
 
 
-    m_pScene->getCurrentRenderOrder().push_back(pLayer);
+    m_pScene->getCurrentRenderOrder(0).push_back(pLayer);
     return pLayer;
 }
 
@@ -248,7 +248,7 @@ static Layer* createComplexLayer_2(IScene *m_pScene)
     pLayer->addSurface(pSurface);
 
 
-    m_pScene->getCurrentRenderOrder().push_back(pLayer);
+    m_pScene->getCurrentRenderOrder(0).push_back(pLayer);
     return pLayer;
 }
 
@@ -269,7 +269,7 @@ TEST_F(InputManagerTest, CreateComplexeScene)
 
     createComplexScene(m_pScene);
 
-    LayerList& ll = m_pScene->getCurrentRenderOrder();
+    LayerList& ll = m_pScene->getCurrentRenderOrder(0);
     EXPECT_EQ(ll.size(), (uint)2);
 
     // top layer to be rendered is LAY2
index 9db6867..b1b2a9b 100644 (file)
@@ -648,7 +648,7 @@ TEST_F(SceneTest, getCurrentRenderOrder)
     // TODO: how to test? return by typically reference can't be invalid.
 
     /// get render order
-    LayerList& llist = m_pScene->getCurrentRenderOrder();
+    LayerList& llist = m_pScene->getCurrentRenderOrder(0);
 
     /// make sure, list of layers is returned
     ASSERT_TRUE(&llist);
@@ -752,7 +752,7 @@ TEST_F(SceneTest, isLayerInCurrentRenderOrder)
     ASSERT_FALSE(m_pScene->isLayerInCurrentRenderOrder(layerId1));
 
     /// add layer to render order
-    LayerList& llist = m_pScene->getCurrentRenderOrder();
+    LayerList& llist = m_pScene->getCurrentRenderOrder(0);
     llist.push_back(l1);
 
     /// make sure, layer is in render order