Diff
Modified: trunk/Tools/ChangeLog (160793 => 160794)
--- trunk/Tools/ChangeLog 2013-12-18 21:08:35 UTC (rev 160793)
+++ trunk/Tools/ChangeLog 2013-12-18 21:36:19 UTC (rev 160794)
@@ -1,3 +1,12 @@
+2013-12-18 Anders Carlsson <[email protected]>
+
+ Remove now useless test.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm: Removed.
+ * TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm: Removed.
+ * TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Shared.h: Removed.
+
2013-12-18 Gavin Barraclough <[email protected]>
Fix page visibility api test, initialization in WebKit2
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (160793 => 160794)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2013-12-18 21:08:35 UTC (rev 160793)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2013-12-18 21:36:19 UTC (rev 160794)
@@ -23,8 +23,6 @@
1A7BFC0C171A0BDB00BC5F64 /* WillSendSubmitEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */; };
1A7E8B34181208DE00AEB74A /* FragmentNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */; };
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
- 1A9E3291182187F800F5D04C /* WKRemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E328F182187F800F5D04C /* WKRemoteObjectRegistry.mm */; };
- 1A9E32941821945C00F5D04C /* WKRemoteObjectRegistry_Bundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E32921821945C00F5D04C /* WKRemoteObjectRegistry_Bundle.mm */; };
1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
1AA9BAE418500450003B6BC6 /* WeakObjCPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */; };
1AA9E55914980A9900001A8A /* Functional.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA9E55714980A9900001A8A /* Functional.cpp */; };
@@ -349,9 +347,6 @@
1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WillSendSubmitEvent.mm; sourceTree = "<group>"; };
1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
- 1A9E328F182187F800F5D04C /* WKRemoteObjectRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKRemoteObjectRegistry.mm; path = WebKit2ObjC/WKRemoteObjectRegistry.mm; sourceTree = "<group>"; };
- 1A9E32921821945C00F5D04C /* WKRemoteObjectRegistry_Bundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKRemoteObjectRegistry_Bundle.mm; path = mac/WKRemoteObjectRegistry_Bundle.mm; sourceTree = "<group>"; };
- 1A9E329518219AE100F5D04C /* WKRemoteObjectRegistry_Shared.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKRemoteObjectRegistry_Shared.h; path = mac/WKRemoteObjectRegistry_Shared.h; sourceTree = "<group>"; };
1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WeakObjCPtr.mm; sourceTree = "<group>"; };
1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
1ADBEFAD130C689C00D61D19 /* ForceRepaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceRepaint.cpp; sourceTree = "<group>"; };
@@ -714,9 +709,6 @@
2943BE84161DFEB800999E3D /* UserContentTest.mm */,
BC3C4C7D14587AA60025FB62 /* WKBrowsingContextGroupTest.mm */,
BC3C4C7014575B6A0025FB62 /* WKBrowsingContextLoadDelegateTest.mm */,
- 1A9E328F182187F800F5D04C /* WKRemoteObjectRegistry.mm */,
- 1A9E32921821945C00F5D04C /* WKRemoteObjectRegistry_Bundle.mm */,
- 1A9E329518219AE100F5D04C /* WKRemoteObjectRegistry_Shared.h */,
);
name = "WebKit2 Objective-C";
sourceTree = "<group>";
@@ -1292,7 +1284,6 @@
BC3C4C7214575B6A0025FB62 /* WKBrowsingContextLoadDelegateTest.mm in Sources */,
BC901E241492ADCE0074A667 /* WKConnection.cpp in Sources */,
51E93017156B13E1004C99DF /* WKPageGetScaleFactorNotZero.cpp in Sources */,
- 1A9E3291182187F800F5D04C /* WKRemoteObjectRegistry.mm in Sources */,
BC7B61AA129A038700D174A4 /* WKPreferences.cpp in Sources */,
BC90995E12567BC100083756 /* WKString.cpp in Sources */,
BC9099941256ACF100083756 /* WKStringJSString.cpp in Sources */,
@@ -1338,7 +1329,6 @@
BC22D31914DC68B900FFB1DD /* UserMessage_Bundle.cpp in Sources */,
520BCF4C141EB09E00937EA8 /* WebArchive_Bundle.cpp in Sources */,
76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */,
- 1A9E32941821945C00F5D04C /* WKRemoteObjectRegistry_Bundle.mm in Sources */,
BC901E331492AF390074A667 /* WKConnection_Bundle.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Deleted: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm (160793 => 160794)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm 2013-12-18 21:08:35 UTC (rev 160793)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm 2013-12-18 21:36:19 UTC (rev 160794)
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. 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.
- */
-
-#import "config.h"
-#import "Test.h"
-
-#import "WKRemoteObjectRegistry_Shared.h"
-#import "PlatformUtilities.h"
-#import "PlatformWebView.h"
-#import <WebKit2/WKRetainPtr.h>
-#import <WebKit2/WKRemoteObjectInterface.h>
-#import <WebKit2/WKRemoteObjectRegistryPrivate.h>
-
-#if WK_API_ENABLED
-
-namespace TestWebKitAPI {
-
-static bool connectionEstablished;
-static WKRemoteObjectRegistry *remoteObjectRegistry;
-static bool testFinished;
-
-/* WKConnectionClient */
-static void connectionDidReceiveMessage(WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo)
-{
- // FIXME: Implement this.
-}
-
-static void connectionDidClose(WKConnectionRef connection, const void* clientInfo)
-{
- // FIXME: Implement this.
-}
-
-/* WKContextConnectionClient */
-static void didCreateConnection(WKContextRef context, WKConnectionRef connection, const void* clientInfo)
-{
- connectionEstablished = true;
-
- // Setup a client on the connection so we can listen for messages and
- // tear down notifications.
- WKConnectionClientV0 connectionClient;
- memset(&connectionClient, 0, sizeof(connectionClient));
-
- connectionClient.base.version = 0;
- connectionClient.didReceiveMessage = connectionDidReceiveMessage;
- connectionClient.didClose = connectionDidClose;
-
- WKConnectionSetConnectionClient(connection, &connectionClient.base);
-
- // Store off the conneciton to use.
- remoteObjectRegistry = [[WKRemoteObjectRegistry alloc] _initWithConnectionRef:connection];
-}
-
-TEST(WebKit2, WKRemoteObjectRegistryTest)
-{
- WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("WKRemoteObjectRegistry"));
-
- // Set up the context's connection client so that we can access the connection when
- // it is created.
- WKContextConnectionClientV0 contextConnectionClient;
- memset(&contextConnectionClient, 0, sizeof(contextConnectionClient));
-
- contextConnectionClient.base.version = 0;
- contextConnectionClient.didCreateConnection = didCreateConnection;
-
- WKContextSetConnectionClient(context.get(), &contextConnectionClient.base);
-
- // Load a simple page to start the WebProcess and establish a connection.
- PlatformWebView webView(context.get());
- WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
- WKPageLoadURL(webView.page(), url.get());
-
- // Wait until the connection is established.
- Util::run(&connectionEstablished);
- ASSERT_NOT_NULL(remoteObjectRegistry);
-
- WKRemoteObjectInterface *bundleInterface = [WKRemoteObjectInterface remoteObjectInterfaceWithProtocol:@protocol(BundleInterface)];
-
- id <BundleInterface> remoteObjectProxy = [remoteObjectRegistry remoteObjectProxyWithInterface:bundleInterface];
- EXPECT_TRUE([remoteObjectProxy conformsToProtocol:@protocol(BundleInterface)]);
-
- [remoteObjectProxy sayHello];
- [remoteObjectProxy testMethodWithString:@"Hello" double:123.456 integer:789];
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.webkit.org/" relativeToURL:[NSURL URLWithString:@"http://www.webkit.org/"]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:123.456];
-
- [remoteObjectProxy testMethodWithArray:@[ @1, @2, @3 ] dictionary:@{ @"Key" : @"Value", @123 : @456 } request:request];
-#endif
-
- // FIXME: Set this once the test actually is finished.
- testFinished = true;
-
- Util::run(&testFinished);
-}
-
-} // namespace TestWebKitAPI
-
-#endif // WK_API_ENABLED
-
Deleted: trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm (160793 => 160794)
--- trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm 2013-12-18 21:08:35 UTC (rev 160793)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm 2013-12-18 21:36:19 UTC (rev 160794)
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. 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.
- */
-
-#import "config.h"
-#import "InjectedBundleTest.h"
-
-#import "PlatformUtilities.h"
-#import "WKRemoteObjectRegistry_Shared.h"
-#import <WebKit2/WKRemoteObjectRegistryPrivate.h>
-#import <WebKit2/WKRemoteObjectInterface.h>
-#import <WebKit2/WKRetainPtr.h>
-#import <wtf/RetainPtr.h>
-
-#if WK_API_ENABLED
-
-@interface BundleObject : NSObject <BundleInterface>
-@end
-
-@implementation BundleObject
-
-- (void)sayHello
-{
- // FIXME: Implement.
-}
-
-- (void)testMethodWithString:(NSString *)string double:(double)d integer:(int)i
-{
- // FIXME: Implement.
-}
-
-- (void)testMethodWithArray:(NSArray *)array dictionary:(NSDictionary *)dictinoary request:(NSURLRequest *)request
-{
- // FIXME: Implement.
-}
-
-@end
-
-namespace TestWebKitAPI {
-
-class WKRemoteObjectRegistryTest : public InjectedBundleTest {
-public:
- WKRemoteObjectRegistryTest(const std::string& identifier)
- : InjectedBundleTest(identifier)
- {
- }
-
- virtual void initialize(WKBundleRef bundle, WKTypeRef) override
- {
- m_objectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:WKBundleGetApplicationConnection(bundle)]);
-
- WKRemoteObjectInterface *bundleInterface = [WKRemoteObjectInterface remoteObjectInterfaceWithProtocol:@protocol(BundleInterface)];
-
- BundleObject *bundleObject = [[BundleObject alloc] init];
- [m_objectRegistry registerExportedObject:bundleObject interface:bundleInterface];
-
- WKConnectionClientV0 connectionClient;
- memset(&connectionClient, 0, sizeof(connectionClient));
-
- connectionClient.base.version = WKConnectionClientCurrentVersion;
- connectionClient.base.clientInfo = this;
- connectionClient.didReceiveMessage = [](WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo) {
- const WKRemoteObjectRegistryTest* test = static_cast<const WKRemoteObjectRegistryTest*>(clientInfo);
-
- [test->m_objectRegistry.get() _handleMessageWithName:messageName body:messageBody];
- };
-
- WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient.base);
- }
-
-private:
- RetainPtr<WKRemoteObjectRegistry> m_objectRegistry;
-};
-
-static InjectedBundleTest::Register<WKRemoteObjectRegistryTest> registrar("WKRemoteObjectRegistry");
-
-} // namespace TestWebKitAPI
-
-#endif // WK_API_ENABLED
Deleted: trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Shared.h (160793 => 160794)
--- trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Shared.h 2013-12-18 21:08:35 UTC (rev 160793)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Shared.h 2013-12-18 21:36:19 UTC (rev 160794)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. 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.
- */
-
-@protocol BundleInterface <NSObject>
-
-- (void)sayHello;
-- (void)testMethodWithString:(NSString *)string double:(double)d integer:(int)i;
-- (void)testMethodWithArray:(NSArray *)array dictionary:(NSDictionary *)dictinoary request:(NSURLRequest *)request;
-
-@end
