Modified: trunk/Source/WebKit2/ChangeLog (133303 => 133304)
--- trunk/Source/WebKit2/ChangeLog 2012-11-02 16:02:08 UTC (rev 133303)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-02 16:09:54 UTC (rev 133304)
@@ -1,3 +1,21 @@
+2012-11-02 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
+
+ [EFL][WK2] Add API unit tests for Ewk_Object
+ https://bugs.webkit.org/show_bug.cgi?id=101037
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Added API unit tests for Ewk_Object.
+
+ * PlatformEfl.cmake:
+ * UIProcess/API/efl/tests/test_ewk2_object.cpp: Added.
+ (TestEwkObject1):
+ (TestEwkObject1::create):
+ (TestEwkObject1::~TestEwkObject1):
+ (TestEwkObject2):
+ (TestEwkObject2::create):
+ (TEST_F):
+
2012-11-02 Sudarsana Nagineni <sudarsana.nagin...@intel.com>
REGRESSION (r133075): plugins/plugin-_javascript_-access.html is failing
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (133303 => 133304)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-11-02 16:02:08 UTC (rev 133303)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-11-02 16:09:54 UTC (rev 133304)
@@ -363,9 +363,10 @@
test_ewk2_eina_shared_string
test_ewk2_favicon_database
test_ewk2_file_chooser_request
- test_ewk2_refptr_evas_object
test_ewk2_intents
+ test_ewk2_object
test_ewk2_popup_menu
+ test_ewk2_refptr_evas_object
test_ewk2_settings
test_ewk2_storage_manager
test_ewk2_text_checker
Added: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_object.cpp (0 => 133304)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_object.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_object.cpp 2012-11-02 16:09:54 UTC (rev 133304)
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "UnitTestUtils/EWK2UnitTestBase.h"
+#include "UnitTestUtils/EWK2UnitTestEnvironment.h"
+#include "UnitTestUtils/EWK2UnitTestServer.h"
+#include "WKEinaSharedString.h"
+#include "ewk_object_private.h"
+#include <EWebKit2.h>
+#include <gtest/gtest.h>
+#include <wtf/PassRefPtr.h>
+
+using namespace EWK2UnitTest;
+using namespace WTF;
+
+extern EWK2UnitTestEnvironment* environment;
+
+class TestEwkObject1 : public Ewk_Object {
+public:
+ EWK_OBJECT_DECLARE(TestEwkObject)
+
+ static PassRefPtr<TestEwkObject1> create()
+ {
+ wasDeleted = false;
+ return adoptRef(new TestEwkObject1());
+ }
+
+ static bool wasDeleted; // We always test only one instance of TestEwkObject.
+
+ ~TestEwkObject1()
+ {
+ wasDeleted = true;
+ }
+};
+
+bool TestEwkObject1::wasDeleted = false;
+
+class TestEwkObject2 : public Ewk_Object {
+public:
+ EWK_OBJECT_DECLARE(TestEwkObject2)
+
+ static PassRefPtr<TestEwkObject2> create()
+ {
+ return adoptRef(new TestEwkObject2());
+ }
+};
+
+TEST_F(EWK2UnitTestBase, ewk_object_ref)
+{
+ Ewk_Object* objectRef = 0;
+
+ {
+ RefPtr<Ewk_Object> object = TestEwkObject1::create();
+ ASSERT_FALSE(TestEwkObject1::wasDeleted);
+ ASSERT_EQ(1, object->refCount());
+
+ objectRef = object.get();
+ ewk_object_ref(objectRef);
+ ASSERT_EQ(2, objectRef->refCount());
+ }
+
+ ASSERT_FALSE(TestEwkObject1::wasDeleted);
+ ASSERT_EQ(1, objectRef->refCount());
+
+ ewk_object_unref(objectRef);
+ ASSERT_TRUE(TestEwkObject1::wasDeleted);
+}
+
+TEST_F(EWK2UnitTestBase, ewk_object_is_of_type)
+{
+ RefPtr<Ewk_Object> object1 = TestEwkObject1::create();
+ RefPtr<Ewk_Object> object2 = TestEwkObject2::create();
+
+ ASSERT_TRUE(ewk_object_is_of_type<TestEwkObject1*>(object1.get()));
+ ASSERT_TRUE(ewk_object_is_of_type<TestEwkObject2*>(object2.get()));
+
+ ASSERT_FALSE(ewk_object_is_of_type<TestEwkObject1*>(object2.get()));
+ ASSERT_FALSE(ewk_object_is_of_type<TestEwkObject2*>(object1.get()));
+}
+
+TEST_F(EWK2UnitTestBase, ewk_object_cast)
+{
+ RefPtr<Ewk_Object> object1 = TestEwkObject1::create();
+ RefPtr<Ewk_Object> object2 = TestEwkObject2::create();
+
+ TestEwkObject1* objectRef1 = ewk_object_cast<TestEwkObject1*>(object1.get());
+ ASSERT_TRUE(objectRef1);
+
+ TestEwkObject2* objectRef2 = ewk_object_cast<TestEwkObject2*>(object2.get());
+ ASSERT_TRUE(objectRef2);
+}
