# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
-# utc-Dali-Alignment.cpp
-# utc-Dali-BloomView.cpp
-# utc-Dali-BubbleEmitter.cpp
-# utc-Dali-Builder.cpp
-# utc-Dali-CheckBoxButton.cpp
-# utc-Dali-ConfirmationPopup.cpp
-# utc-Dali-CubeTransitionEffect.cpp
-# utc-Dali-EffectsView.cpp
-# utc-Dali-FlexContainer.cpp
-# utc-Dali-GaussianBlurView.cpp
-# utc-Dali-ImageView.cpp
-# utc-Dali-JsonParser.cpp
-# utc-Dali-KeyInputFocusManager.cpp
-# utc-Dali-PageTurnView.cpp
-# utc-Dali-Script.cpp
-# utc-Dali-ScrollBar.cpp
-# utc-Dali-ScrollView.cpp
-# utc-Dali-ShaderEffects.cpp
-# utc-Dali-ShadowView.cpp
-# utc-Dali-Slider.cpp
-# utc-Dali-TableView.cpp
-# utc-Dali-TextEditor.cpp
-# utc-Dali-TextField.cpp
-# utc-Dali-TextLabel.cpp
-# utc-Dali-TextSelectionPopup.cpp
-# utc-Dali-ToolBar.cpp
-# utc-Dali-Button.cpp
-# utc-Dali-Control.cpp
-# utc-Dali-ControlImpl.cpp
-# utc-Dali-AccessibilityManager.cpp
-# utc-Dali-ItemLayout.cpp
-# utc-Dali-ItemView.cpp
-# utc-Dali-KeyboardFocusManager.cpp
-# utc-Dali-Magnifier.cpp
-# utc-Dali-Popup.cpp
-# utc-Dali-PushButton.cpp
-# utc-Dali-RadioButton.cpp
-# utc-Dali-ScrollViewEffect.cpp
-# utc-Dali-SuperBlurView.cpp
-# utc-Dali-Toolkit.cpp
-# utc-Dali-Model3dView.cpp
-# utc-Dali-ControlRenderer.cpp
-# utc-Dali-RendererFactory.cpp
-# utc-Dali-DebugRenderer.cpp
-# utc-Dali-ImageAtlas.cpp
+ utc-Dali-Alignment.cpp
+ utc-Dali-BloomView.cpp
+ utc-Dali-BubbleEmitter.cpp
+ utc-Dali-Builder.cpp
+ utc-Dali-CheckBoxButton.cpp
+ utc-Dali-ConfirmationPopup.cpp
+ utc-Dali-CubeTransitionEffect.cpp
+ utc-Dali-EffectsView.cpp
+ utc-Dali-FlexContainer.cpp
+ utc-Dali-GaussianBlurView.cpp
+ utc-Dali-ImageView.cpp
+ utc-Dali-JsonParser.cpp
+ utc-Dali-KeyInputFocusManager.cpp
+ utc-Dali-PageTurnView.cpp
+ utc-Dali-Script.cpp
+ utc-Dali-ScrollBar.cpp
+ utc-Dali-ScrollView.cpp
+ utc-Dali-ShaderEffects.cpp
+ utc-Dali-ShadowView.cpp
+ utc-Dali-Slider.cpp
+ utc-Dali-TableView.cpp
+ utc-Dali-TextEditor.cpp
+ utc-Dali-TextField.cpp
+ utc-Dali-TextLabel.cpp
+ utc-Dali-TextSelectionPopup.cpp
+ utc-Dali-ToolBar.cpp
+ utc-Dali-Button.cpp
+ utc-Dali-Control.cpp
+ utc-Dali-ControlImpl.cpp
+ utc-Dali-AccessibilityManager.cpp
+ utc-Dali-ItemLayout.cpp
+ utc-Dali-ItemView.cpp
+ utc-Dali-KeyboardFocusManager.cpp
+ utc-Dali-Magnifier.cpp
+ utc-Dali-Popup.cpp
+ utc-Dali-PushButton.cpp
+ utc-Dali-RadioButton.cpp
+ utc-Dali-ScrollViewEffect.cpp
+ utc-Dali-SuperBlurView.cpp
+ utc-Dali-Toolkit.cpp
+ utc-Dali-Model3dView.cpp
+ utc-Dali-ControlRenderer.cpp
+ utc-Dali-RendererFactory.cpp
+ utc-Dali-DebugRenderer.cpp
+ utc-Dali-ImageAtlas.cpp
utc-Dali-VideoView.cpp
)
{
std::stringstream out;
out << program << ", " << shader;
- mShaderTrace.PushCall("AttachShader", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["program"] = ToString(program);
+ namedParams["shader"] = ToString(shader);
+ mShaderTrace.PushCall("AttachShader", out.str(), namedParams);
}
inline void BindAttribLocation( GLuint program, GLuint index, const char* name )
std::stringstream out;
out << target << ", " << texture;
- mTextureTrace.PushCall("BindTexture", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["texture"] = ToString(texture);
+
+ mTextureTrace.PushCall("BindTexture", out.str(), namedParams);
}
inline void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
{
std::stringstream out;
out << shader;
- mShaderTrace.PushCall("CompileShader", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["shader"] = ToString(shader);
+
+ mShaderTrace.PushCall("CompileShader", out.str(), namedParams);
}
inline void CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
{
std::stringstream out;
out << type;
- mShaderTrace.PushCall("CreateShader", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["type"] = ToString(type);
+ mShaderTrace.PushCall("CreateShader", out.str(), namedParams);
return ++mLastShaderIdUsed;
}
{
std::stringstream out;
out << mode;
- mCullFaceTrace.PushCall("CullFace", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["program"] = ToString(mode);
+
+ mCullFaceTrace.PushCall("CullFace", out.str(), namedParams);
}
inline void DeleteBuffers(GLsizei n, const GLuint* buffers)
{
std::stringstream out;
out << program;
- mShaderTrace.PushCall("DeleteProgram", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["program"] = ToString(program);
+
+ mShaderTrace.PushCall("DeleteProgram", out.str(), namedParams);
}
inline void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
{
std::stringstream out;
out << shader;
- mShaderTrace.PushCall("DeleteShader", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["shader"] = ToString(shader);
+
+ mShaderTrace.PushCall("DeleteShader", out.str(), namedParams);
}
inline void DeleteTextures(GLsizei n, const GLuint* textures)
std::stringstream out;
out << n << ", " << textures << " = [";
+ TraceCallStack::NamedParams namedParams;
+
for(GLsizei i=0; i<n; i++)
{
out << textures[i] << ", ";
+ std::stringstream paramName;
+ paramName<<"texture["<<i<<"]";
+ namedParams[paramName.str()] = ToString(textures[i]);
mDeletedTextureIds.push_back(textures[i]);
}
out << "]";
- mTextureTrace.PushCall("DeleteTextures", out.str());
+
+ mTextureTrace.PushCall("DeleteTextures", out.str(), namedParams);
}
inline bool CheckNoTexturesDeleted()
{
std::stringstream out;
out << func;
- mDepthFunctionTrace.PushCall("DepthFunc", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["func"] = ToString(func);
+
+ mDepthFunctionTrace.PushCall("DepthFunc", out.str(), namedParams);
}
inline void DepthMask(GLboolean flag)
{
std::stringstream out;
out << program << ", " << shader;
- mShaderTrace.PushCall("DetachShader", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["program"] = ToString(program);
+ namedParams["shader"] = ToString(shader);
+ mShaderTrace.PushCall("DetachShader", out.str(), namedParams);
}
inline void Disable(GLenum cap)
{
std::stringstream out;
out << cap;
- mEnableDisableTrace.PushCall("Disable", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["cap"] = ToString(cap);
+ mEnableDisableTrace.PushCall("Disable", out.str(), namedParams);
}
inline void DisableVertexAttribArray(GLuint index)
{
std::stringstream out;
out << mode << ", " << first << ", " << count;
- mDrawTrace.PushCall("DrawArrays", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["mode"] = ToString(mode);
+ namedParams["first"] = ToString(first);
+ namedParams["count"] = ToString(count);
+ mDrawTrace.PushCall("DrawArrays", out.str(), namedParams);
}
inline void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices)
{
std::stringstream out;
out << mode << ", " << count << ", " << type << ", indices";
- mDrawTrace.PushCall("DrawElements", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["mode"] = ToString(mode);
+ namedParams["count"] = ToString(count);
+ namedParams["type"] = ToString(type);
+ // Skip void pointers - are they of any use?
+ mDrawTrace.PushCall("DrawElements", out.str(), namedParams);
}
inline void Enable(GLenum cap)
{
std::stringstream out;
out << cap;
- mEnableDisableTrace.PushCall("Enable", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["cap"] = ToString(cap);
+ mEnableDisableTrace.PushCall("Enable", out.str(), namedParams);
}
inline void EnableVertexAttribArray(GLuint index)
{
std::stringstream out;
out<<target;
- mTextureTrace.PushCall("GenerateMipmap", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+
+ mTextureTrace.PushCall("GenerateMipmap", out.str(), namedParams);
}
inline void GenFramebuffers(GLsizei n, GLuint* framebuffers)
return mNextTextureIds;
}
- inline void GenTextures(GLsizei n, GLuint* textures)
+ inline void GenTextures(GLsizei count, GLuint* textures)
{
- for( int i=0; i<n; ++i )
+ for( int i=0; i<count; ++i )
{
if( !mNextTextureIds.empty() )
{
}
}
+ TraceCallStack::NamedParams namedParams;
+ namedParams["count"] = ToString(count);
+
std::stringstream out;
- for(int i=0; i<n; i++)
+ for(int i=0; i<count; i++)
{
out << textures[i];
- if(i<n-1)
+ if(i<count-1)
{
out << ", ";
}
+ std::ostringstream oss;
+ oss<<"indices["<<i<<"]";
+ namedParams[oss.str()] = ToString(textures[i]);
}
- mTextureTrace.PushCall("GenTextures", out.str());
+
+ mTextureTrace.PushCall("GenTextures", out.str(), namedParams);
}
inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
{
std::stringstream out;
out << program;
- mShaderTrace.PushCall("LinkProgram", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["program"] = ToString(program);
+ mShaderTrace.PushCall("LinkProgram", out.str(), namedParams);
mNumberOfActiveUniforms=2;
GetUniformLocation(program, "sTexture");
{
std::stringstream out;
out << target<<", "<<level<<", "<<width << ", " << height;
- mTextureTrace.PushCall("TexImage2D", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["level"] = ToString(level);
+ namedParams["internalformat"] = ToString(internalformat);
+ namedParams["width"] = ToString(width);
+ namedParams["height"] = ToString(height);
+ namedParams["border"] = ToString(border);
+ namedParams["format"] = ToString(format);
+ namedParams["type"] = ToString(type);
+
+ mTextureTrace.PushCall("TexImage2D", out.str(), namedParams);
}
inline void TexParameterf(GLenum target, GLenum pname, GLfloat param)
{
std::stringstream out;
out << target << ", " << pname << ", " << param;
- mTexParamaterTrace.PushCall("TexParameterf", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["pname"] = ToString(pname);
+ namedParams["param"] = ToString(param);
+
+ mTexParamaterTrace.PushCall("TexParameterf", out.str(), namedParams);
}
inline void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
{
std::stringstream out;
out << target << ", " << pname << ", " << params[0];
- mTexParamaterTrace.PushCall("TexParameterfv", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["pname"] = ToString(pname);
+ namedParams["params[0]"] = ToString(params[0]);
+
+ mTexParamaterTrace.PushCall("TexParameterfv", out.str(), namedParams);
}
inline void TexParameteri(GLenum target, GLenum pname, GLint param)
{
std::stringstream out;
out << target << ", " << pname << ", " << param;
- mTexParamaterTrace.PushCall("TexParameteri", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["pname"] = ToString(pname);
+ namedParams["param"] = ToString(param);
+ mTexParamaterTrace.PushCall("TexParameteri", out.str(), namedParams);
}
inline void TexParameteriv(GLenum target, GLenum pname, const GLint* params)
{
std::stringstream out;
out << target << ", " << pname << ", " << params[0];
- mTexParamaterTrace.PushCall("TexParameteriv", out.str());
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["pname"] = ToString(pname);
+ namedParams["params[0]"] = ToString(params[0]);
+ mTexParamaterTrace.PushCall("TexParameteriv", out.str(), namedParams);
}
inline void TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels)
{
std::stringstream out;
out << target << ", "<<level <<", " << xoffset << ", " << yoffset << ", " << width << ", " << height;
- mTextureTrace.PushCall("TexSubImage2D", out.str());
+
+ TraceCallStack::NamedParams namedParams;
+ namedParams["target"] = ToString(target);
+ namedParams["level"] = ToString(level);
+ namedParams["xoffset"] = ToString(xoffset);
+ namedParams["yoffset"] = ToString(yoffset);
+ namedParams["width"] = ToString(width);
+ namedParams["height"] = ToString(height);
+ mTextureTrace.PushCall("TexSubImage2D", out.str(), namedParams);
}
inline void Uniform1f(GLint location, GLfloat x)
*/
#include "test-trace-call-stack.h"
+#include <sstream>
namespace Dali
{
+
+std::string ToString(int x)
+{
+ std::stringstream out;
+ out << x;
+ return out.str();
+}
+
+std::string ToString(unsigned int x)
+{
+ std::stringstream out;
+ out << x;
+ return out.str();
+}
+
+std::string ToString(float x)
+{
+ std::stringstream out;
+ out << x;
+ return out.str();
+}
+
/**
* Constructor
*/
{
if(mTraceActive)
{
- std::vector< std::string > functionCall;
- functionCall.push_back(method);
- functionCall.push_back(params);
- mCallStack.push_back( functionCall );
+ FunctionCall stackFrame(method, params);
+ mCallStack.push_back( stackFrame );
+ }
+}
+
+void TraceCallStack::PushCall(std::string method, std::string params, const TraceCallStack::NamedParams& altParams)
+{
+ if(mTraceActive)
+ {
+ FunctionCall stackFrame(method, params, altParams);
+ mCallStack.push_back( stackFrame );
}
}
bool found = false;
for( size_t i=0; i < mCallStack.size(); i++ )
{
- if( 0 == mCallStack[i][0].compare(method) )
+ if( 0 == mCallStack[i].method.compare(method) )
{
found = true;
break;
int numCalls = 0;
for( size_t i=0; i < mCallStack.size(); i++ )
{
- if( 0 == mCallStack[i][0].compare(method) )
+ if( 0 == mCallStack[i].method.compare(method) )
{
numCalls++;
}
return FindIndexFromMethodAndParams( method, params ) > -1;
}
+bool TraceCallStack::FindMethodAndParams(std::string method, const NamedParams& params) const
+{
+ return FindIndexFromMethodAndParams( method, params ) > -1;
+}
+
+
/**
* Search for a method in the stack with the given parameter list
* @param[in] method The name of the method
int index = -1;
for( size_t i=0; i < mCallStack.size(); i++ )
{
- if( 0 == mCallStack[i][0].compare(method) && 0 == mCallStack[i][1].compare(params) )
+ if( 0 == mCallStack[i].method.compare(method) && 0 == mCallStack[i].paramList.compare(params) )
{
index = i;
break;
return index;
}
+int TraceCallStack::FindIndexFromMethodAndParams(std::string method, const TraceCallStack::NamedParams& params) const
+{
+ int index = -1;
+ for( size_t i=0; i < mCallStack.size(); i++ )
+ {
+ if( 0 == mCallStack[i].method.compare(method) )
+ {
+ // Test each of the passed in parameters:
+ bool match = true;
+ for( NamedParams::const_iterator iter = params.begin() ; iter != params.end() ; ++iter )
+ {
+ NamedParams::const_iterator paramIter = mCallStack[i].namedParams.find(iter->first);
+ if( paramIter == params.end() || paramIter->second.compare(iter->second) != 0 )
+ {
+ match = false;
+ break;
+ }
+ }
+ if( match == true )
+ {
+ index = i;
+ break;
+ }
+ }
+ }
+ return index;
+}
+
+
/**
* Test if the given method and parameters are at a given index in the stack
* @param[in] index Index in the call stack
*/
bool TraceCallStack::TestMethodAndParams(int index, std::string method, std::string params) const
{
- return ( 0 == mCallStack[index][0].compare(method) && 0 == mCallStack[index][1].compare(params) );
+ return ( 0 == mCallStack[index].method.compare(method) && 0 == mCallStack[index].paramList.compare(params) );
}
/**
#include <string>
#include <vector>
+#include <map>
namespace Dali
{
+std::string ToString(int x);
+std::string ToString(unsigned int x);
+std::string ToString(float x);
/**
* Helper class to track method calls in the abstraction and search for them in test cases
class TraceCallStack
{
public:
+ /// Typedef for passing and storing named parameters
+ typedef std::map< std::string, std::string > NamedParams;
+
/**
* Constructor
*/
*/
void PushCall(std::string method, std::string params);
+ /**
+ * Push a call onto the stack if the trace is active
+ * @param[in] method The name of the method
+ * @param[in] params A comma separated list of parameter values
+ * @param[in] altParams A map of named parameter values
+ */
+ void PushCall(std::string method, std::string params, const NamedParams& altParams);
/**
* Search for a method in the stack
/**
* Search for a method in the stack with the given parameter list
* @param[in] method The name of the method
+ * @param[in] params A map of named parameters to test for
+ * @return true if the method was in the stack
+ */
+ bool FindMethodAndParams(std::string method, const NamedParams& params) const;
+
+ /**
+ * Search for a method in the stack with the given parameter list
+ * @param[in] method The name of the method
* @param[in] params A comma separated list of parameter values
* @return index in the stack where the method was found or -1 otherwise
*/
int FindIndexFromMethodAndParams(std::string method, std::string params) const;
/**
+ * Search for a method in the stack with the given parameter list
+ * @param[in] method The name of the method
+ * @param[in] params A map of named parameter values to match
+ * @return index in the stack where the method was found or -1 otherwise
+ */
+ int FindIndexFromMethodAndParams(std::string method, const NamedParams& params) const;
+
+ /**
* Test if the given method and parameters are at a given index in the stack
* @param[in] index Index in the call stack
* @param[in] method Name of method to test
*/
void Reset();
- /**
- * Get the call stack
- * @return The call stack object (Vector of vector[2] of method/paramlist strings)
- */
- inline const std::vector< std::vector< std::string > >& GetCallStack() { return mCallStack; }
-
private:
bool mTraceActive; ///< True if the trace is active
- std::vector< std::vector< std::string > > mCallStack; ///< The call stack
+
+ struct FunctionCall
+ {
+ std::string method;
+ std::string paramList;
+ NamedParams namedParams;
+ FunctionCall( const std::string& aMethod, const std::string& aParamList )
+ : method( aMethod ), paramList( aParamList )
+ {
+ }
+ FunctionCall( const std::string& aMethod, const std::string& aParamList, const NamedParams& altParams )
+ : method( aMethod ), paramList( aParamList ), namedParams( altParams )
+ {
+ }
+ };
+
+ std::vector< FunctionCall > mCallStack; ///< The call stack
};
} // namespace dali
&& rect2.y < rect1.y+rect1.height;
}
-}
+} // anonymous namespace
void dali_image_atlas_startup(void)
{
Rect<int> pixelArea1 = TextureCoordinateToPixelArea(textureRect1, size);
DALI_TEST_EQUALS( pixelArea1.width, 34, TEST_LOCATION );
DALI_TEST_EQUALS( pixelArea1.height, 34, TEST_LOCATION );
- std::stringstream out;
- out<<pixelArea1.x<<", "<<pixelArea1.y<<", "<<pixelArea1.width<<", "<<pixelArea1.height;
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+ TraceCallStack::NamedParams params;
+ params["width"] = ToString(pixelArea1.width);
+ params["height"] = ToString(pixelArea1.height);
+ params["xoffset"] = ToString(pixelArea1.x);
+ params["yoffset"] = ToString(pixelArea1.y);
+ DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ));
Rect<int> pixelArea2 = TextureCoordinateToPixelArea(textureRect2, size);
DALI_TEST_EQUALS( pixelArea2.width, 50, TEST_LOCATION );
DALI_TEST_EQUALS( pixelArea2.height, 50, TEST_LOCATION );
- out.str("");
- out<<pixelArea2.x<<", "<<pixelArea2.y<<", "<<pixelArea2.width<<", "<<pixelArea2.height;
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+ params["width"] = ToString(pixelArea2.width);
+ params["height"] = ToString(pixelArea2.height);
+ params["xoffset"] = ToString(pixelArea2.x);
+ params["yoffset"] = ToString(pixelArea2.y);
+ DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
Rect<int> pixelArea3 = TextureCoordinateToPixelArea(textureRect3, size);
DALI_TEST_EQUALS( pixelArea3.width, 128, TEST_LOCATION );
DALI_TEST_EQUALS( pixelArea3.height, 128, TEST_LOCATION );
- out.str("");
- out<<pixelArea3.x<<", "<<pixelArea3.y<<", "<<pixelArea3.width<<", "<<pixelArea3.height;
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+ params["width"] = ToString(pixelArea3.width);
+ params["height"] = ToString(pixelArea3.height);
+ params["xoffset"] = ToString(pixelArea3.x);
+ params["yoffset"] = ToString(pixelArea3.y);
+ DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea2) );
DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea3) );
callStack.Enable(false);
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", "0, 0, 34, 34" ) );
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", "0, 34, 50, 50" ) );
+ TraceCallStack::NamedParams params1;
+ params1["width"] = "34";
+ params1["height"] = "34";
+ params1["xoffset"] = "0";
+ params1["yoffset"] = "0";
+
+ TraceCallStack::NamedParams params2;
+ params2["width"] = "50";
+ params2["height"] = "50";
+ params2["xoffset"] = "0";
+ params2["yoffset"] = "34";
+
+ DALI_TEST_EQUALS( callStack.FindMethodAndParams("TexSubImage2D", params1 ), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( callStack.FindMethodAndParams("TexSubImage2D", params2 ), true, TEST_LOCATION );
callStack.Reset();
callStack.Enable(true);
application.Render(RENDER_FRAME_INTERVAL);
callStack.Enable(false);
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", "0, 34, 100, 100" ) );
+
+ TraceCallStack::NamedParams params3;
+ params3["width"] = "100";
+ params3["height"] = "100";
+ params3["xoffset"] = "0";
+ params3["yoffset"] = "34";
+
+ DALI_TEST_EQUALS( callStack.FindMethodAndParams("TexSubImage2D", params3 ), true, TEST_LOCATION );
END_TEST;
}
callStack.Enable(false);
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", "0, 0, 34, 34" ) );
-
+ TraceCallStack::NamedParams params;
+ params["width"] = ToString(34);
+ params["height"] = ToString(34);
+ DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
END_TEST;
}
Stage::GetCurrent().Add( imageView );
application.SendNotification();
application.Render(16);
- DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", "0, 0, 34, 34" ) );
- }
+ TraceCallStack::NamedParams params;
+ params["width"] = ToString(34);
+ params["height"] = ToString(34);
+ DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
+ true, TEST_LOCATION );
+ }
END_TEST;
}
END_TEST;
}
-
projects / platform / core / uifw / dali-toolkit.git / commitdiff