From 50ba90fb44946fb252b7cb6fe7e3f8afdf7ebb03 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Thu, 14 Jul 2016 18:30:21 +0100 Subject: [PATCH] Moved UTC tests for public API to dali directory Change-Id: I553bc2553cab1f281da56e4fade7385e337dcb08 --- automated-tests/src/dali-devel/CMakeLists.txt | 9 --------- automated-tests/src/dali/CMakeLists.txt | 11 ++++++++++- .../src/{dali-devel => dali}/utc-Dali-FrameBuffer.cpp | 0 .../src/{dali-devel => dali}/utc-Dali-Geometry.cpp | 0 .../src/{dali-devel => dali}/utc-Dali-PixelData.cpp | 0 .../src/{dali-devel => dali}/utc-Dali-PropertyBuffer.cpp | 0 .../src/{dali-devel => dali}/utc-Dali-Renderer.cpp | 0 automated-tests/src/{dali-devel => dali}/utc-Dali-Sampler.cpp | 0 automated-tests/src/{dali-devel => dali}/utc-Dali-Shader.cpp | 0 automated-tests/src/{dali-devel => dali}/utc-Dali-Texture.cpp | 0 .../src/{dali-devel => dali}/utc-Dali-TextureSet.cpp | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename automated-tests/src/{dali-devel => dali}/utc-Dali-FrameBuffer.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-Geometry.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-PixelData.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-PropertyBuffer.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-Renderer.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-Sampler.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-Shader.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-Texture.cpp (100%) rename automated-tests/src/{dali-devel => dali}/utc-Dali-TextureSet.cpp (100%) diff --git a/automated-tests/src/dali-devel/CMakeLists.txt b/automated-tests/src/dali-devel/CMakeLists.txt index 59fca0d..6a462bd 100644 --- a/automated-tests/src/dali-devel/CMakeLists.txt +++ b/automated-tests/src/dali-devel/CMakeLists.txt @@ -12,20 +12,11 @@ SET(TC_SOURCES utc-Dali-Context.cpp utc-Dali-Constrainer.cpp utc-Dali-DistanceField.cpp - utc-Dali-FrameBuffer.cpp - utc-Dali-Geometry.cpp utc-Dali-Hash.cpp utc-Dali-HitTestAlgorithm.cpp - utc-Dali-Texture.cpp - utc-Dali-TextureSet.cpp utc-Dali-Mutex.cpp - utc-Dali-PixelData.cpp - utc-Dali-PropertyBuffer.cpp - utc-Dali-Renderer.cpp - utc-Dali-Sampler.cpp utc-Dali-SignalDelegate.cpp utc-Dali-Scripting.cpp - utc-Dali-Shader.cpp utc-Dali-Thread.cpp utc-Dali-WeakHandle.cpp ) diff --git a/automated-tests/src/dali/CMakeLists.txt b/automated-tests/src/dali/CMakeLists.txt index f5e73a5..5e888e7 100644 --- a/automated-tests/src/dali/CMakeLists.txt +++ b/automated-tests/src/dali/CMakeLists.txt @@ -22,7 +22,9 @@ SET(TC_SOURCES utc-Dali-CustomActor.cpp utc-Dali-Degree.cpp utc-Dali-EncodedBufferImage.cpp + utc-Dali-FrameBuffer.cpp utc-Dali-FrameBufferImage.cpp + utc-Dali-Geometry.cpp utc-Dali-Gesture.cpp utc-Dali-GestureDetector.cpp utc-Dali-Handle.cpp @@ -47,8 +49,10 @@ SET(TC_SOURCES utc-Dali-PinchGesture.cpp utc-Dali-PinchGestureDetector.cpp utc-Dali-Pixel.cpp - utc-Dali-PropertyMap.cpp + utc-Dali-PixelData.cpp utc-Dali-PropertyArray.cpp + utc-Dali-PropertyBuffer.cpp + utc-Dali-PropertyMap.cpp utc-Dali-PropertyNotification.cpp utc-Dali-PropertyTypes.cpp utc-Dali-PropertyValue.cpp @@ -56,14 +60,19 @@ SET(TC_SOURCES utc-Dali-Radian.cpp utc-Dali-Random.cpp utc-Dali-Rect.cpp + utc-Dali-Renderer.cpp utc-Dali-RenderTask.cpp utc-Dali-RenderTaskList.cpp utc-Dali-ResourceImage.cpp + utc-Dali-Sampler.cpp + utc-Dali-Shader.cpp utc-Dali-SignalTemplatesFunctors.cpp utc-Dali-SignalTemplates.cpp utc-Dali-Stage.cpp utc-Dali-TapGesture.cpp utc-Dali-TapGestureDetector.cpp + utc-Dali-Texture.cpp + utc-Dali-TextureSet.cpp utc-Dali-TouchEventCombiner.cpp utc-Dali-TouchProcessing.cpp utc-Dali-TouchDataProcessing.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-FrameBuffer.cpp b/automated-tests/src/dali/utc-Dali-FrameBuffer.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-FrameBuffer.cpp rename to automated-tests/src/dali/utc-Dali-FrameBuffer.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-Geometry.cpp b/automated-tests/src/dali/utc-Dali-Geometry.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-Geometry.cpp rename to automated-tests/src/dali/utc-Dali-Geometry.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-PixelData.cpp b/automated-tests/src/dali/utc-Dali-PixelData.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-PixelData.cpp rename to automated-tests/src/dali/utc-Dali-PixelData.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp b/automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp rename to automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp b/automated-tests/src/dali/utc-Dali-Renderer.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-Renderer.cpp rename to automated-tests/src/dali/utc-Dali-Renderer.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-Sampler.cpp b/automated-tests/src/dali/utc-Dali-Sampler.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-Sampler.cpp rename to automated-tests/src/dali/utc-Dali-Sampler.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-Shader.cpp b/automated-tests/src/dali/utc-Dali-Shader.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-Shader.cpp rename to automated-tests/src/dali/utc-Dali-Shader.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-Texture.cpp b/automated-tests/src/dali/utc-Dali-Texture.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-Texture.cpp rename to automated-tests/src/dali/utc-Dali-Texture.cpp diff --git a/automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp b/automated-tests/src/dali/utc-Dali-TextureSet.cpp similarity index 100% rename from automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp rename to automated-tests/src/dali/utc-Dali-TextureSet.cpp -- 2.7.4