[webkit-changes] [152765] trunk/Source/WebKit2

Wed, 17 Jul 2013 00:15:55 -0700

Title: [152765] trunk/Source/WebKit2
Revision
152765
Author
[email protected]
Date
2013-07-17 00:16:42 -0700 (Wed, 17 Jul 2013)

Log Message

[EFL][WK2] EWK2EinaSharedStringTest should be defined by inheriting from EWK2UnitTestBase.
https://bugs.webkit.org/show_bug.cgi?id=118771

Patch by Dong-Gwan Kim <[email protected]> on 2013-07-17
Reviewed by Christophe Dumez.

It should be defined as relevant test class specific to each test file for more readability.
It could be helpful to remove unnecessary static methods.

* UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
(EWK2EinaSharedStringTest::checkString):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (152764 => 152765)


--- trunk/Source/WebKit2/ChangeLog	2013-07-17 07:15:09 UTC (rev 152764)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-17 07:16:42 UTC (rev 152765)
@@ -1,5 +1,19 @@
 2013-07-17  Dong-Gwan Kim  <[email protected]>
 
+        [EFL][WK2] EWK2EinaSharedStringTest should be defined by inheriting from EWK2UnitTestBase.
+        https://bugs.webkit.org/show_bug.cgi?id=118771
+
+        Reviewed by Christophe Dumez.
+
+        It should be defined as relevant test class specific to each test file for more readability.
+        It could be helpful to remove unnecessary static methods.
+
+        * UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
+        (EWK2EinaSharedStringTest::checkString):
+        (TEST_F):
+
+2013-07-17  Dong-Gwan Kim  <[email protected]>
+
         [EFL][WK2] EWK2DownloadJobTest should be defined by inheriting from EWK2UnitTestBase.
         https://bugs.webkit.org/show_bug.cgi?id=118769

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp (152764 => 152765)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp	2013-07-17 07:15:09 UTC (rev 152764)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp	2013-07-17 07:16:42 UTC (rev 152765)
@@ -39,39 +39,42 @@
 #define anotherTestString "I'm another test string!"
 #define testUrl "file:///path/somewhere"
 
-static inline void checkString(const WKEinaSharedString& string, const char* pattern)
-{
-    ASSERT_EQ(string.isNull(), pattern ? false : true);
-    ASSERT_EQ(string.length(), pattern ? strlen(pattern) : 0); // Compare length.
-    ASSERT_EQ(string, pattern); // Compare values. Check '==' operator with WKEinaSharedString and plain string.
-    ASSERT_STREQ(string, pattern); // Compare values. Check 'const char*' operator.
-}
+class EWK2EinaSharedStringTest : public EWK2UnitTestBase {
+protected:
+    void checkString(const WKEinaSharedString& string, const char* pattern)
+    {
+        ASSERT_EQ(string.isNull(), pattern ? false : true);
+        ASSERT_EQ(string.length(), pattern ? strlen(pattern) : 0); // Compare length.
+        ASSERT_EQ(string, pattern); // Compare values. Check '==' operator with WKEinaSharedString and plain string.
+        ASSERT_STREQ(string, pattern); // Compare values. Check 'const char*' operator.
+    }
+};
 
-TEST_F(EWK2UnitTestBase, constructEmpty)
+TEST_F(EWK2EinaSharedStringTest, constructEmpty)
 {
     WKEinaSharedString emptyString;
     checkString(emptyString, 0);
 }
 
-TEST_F(EWK2UnitTestBase, constructFromPlainString)
+TEST_F(EWK2EinaSharedStringTest, constructFromPlainString)
 {
     WKEinaSharedString emptyString(testString);
     checkString(emptyString, testString);
 }
 
-TEST_F(EWK2UnitTestBase, constructFromWKString)
+TEST_F(EWK2EinaSharedStringTest, constructFromWKString)
 {
     WKEinaSharedString string(AdoptWK, WKStringCreateWithUTF8CString(testString));
     checkString(string, testString);
 }
 
-TEST_F(EWK2UnitTestBase, constructFromWKURL)
+TEST_F(EWK2EinaSharedStringTest, constructFromWKURL)
 {
     WKEinaSharedString string(AdoptWK, WKURLCreateWithUTF8CString(testUrl));
     checkString(string, testUrl);
 }
 
-TEST_F(EWK2UnitTestBase, constructFromEinaStringShare)
+TEST_F(EWK2EinaSharedStringTest, constructFromEinaStringShare)
 {
     WKEinaSharedString string(WKEinaSharedString::adopt(eina_stringshare_add(testString)));
     checkString(string, testString);
@@ -83,7 +86,7 @@
     checkString(string, anotherTestString);
 }
 
-TEST_F(EWK2UnitTestBase, costructCopy)
+TEST_F(EWK2EinaSharedStringTest, costructCopy)
 {
     WKEinaSharedString string(testString);
     WKEinaSharedString copyString(string);
@@ -92,7 +95,7 @@
     ASSERT_EQ(string, copyString); // Check '==' operator with two instances of WKEinaSharedString.
 }
 
-TEST_F(EWK2UnitTestBase, comparisonOperators)
+TEST_F(EWK2EinaSharedStringTest, comparisonOperators)
 {
     WKEinaSharedString string(testString);
     WKEinaSharedString sameString(testString);
@@ -109,7 +112,7 @@
     ASSERT_EQ(string, string); // Self-comparison.
 }
 
-TEST_F(EWK2UnitTestBase, assignmentOperators)
+TEST_F(EWK2EinaSharedStringTest, assignmentOperators)
 {
     WKEinaSharedString string;
 
@@ -125,7 +128,7 @@
     checkString(string, anotherTestString);
 }
 
-TEST_F(EWK2UnitTestBase, leakString)
+TEST_F(EWK2EinaSharedStringTest, leakString)
 {
     WKEinaSharedString string;
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to