From: Paul Wisbey
Date: Sun, 22 Mar 2015 13:34:38 +0000 (+0000)
Subject: Fixed some TCT issues
X-Git-Tag: dali_1.0.38~11^2~36
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8769fcefa8c4cbb99037d1ab5344869d0f80c683
Fixed some TCT issues
Change-Id: I933caca09e5b4817216112aa187ccd485c963742
---
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
index 7568a11..3d4d1d5 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
@@ -160,6 +160,23 @@ bool TestPlatformAbstraction::IsLoading()
}
/**
+ * @copydoc PlatformAbstraction::GetDefaultFontDescription()
+ */
+void TestPlatformAbstraction::GetDefaultFontDescription( std::string& family, std::string& style ) const
+{
+ // TODO
+}
+
+/**
+ * @copydoc PlatformAbstraction::GetDefaultFontSize()
+ */
+int TestPlatformAbstraction::GetDefaultFontSize() const
+{
+ // TODO
+ return int();
+}
+
+/**
* @copydoc PlatformAbstraction::SetDpi()
*/
void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index bd9b592..a4ec8d3 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@ -136,6 +136,16 @@ public:
virtual bool IsLoading();
/**
+ * @copydoc PlatformAbstraction::GetDefaultFontDescription()
+ */
+ virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const;
+
+ /**
+ * @copydoc PlatformAbstraction::GetDefaultFontSize()
+ */
+ virtual int GetDefaultFontSize() const;
+
+ /**
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
index b3cb881..4e81bf6 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
@@ -332,6 +332,9 @@ int UtcDaliNavigationControlCreateNavigationTitleBar(void)
NavigationControl naviControl = NavigationControl::New();
stage.Add( naviControl );
+ Toolkit::NaviTitleBarStyle titleBarStyle( background, 720, 111, 68, 48, 34, 16, 11, 45, 63, 26, 14, 22 );
+ naviControl.CreateNavigationTitleBar( titleBarStyle, titleBarStyle );
+
Page naviItem = Page::New();
PushButton firstControl = PushButton::New();