[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 11:18:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit da0c55064a604a344efa5c7b5a7b4090c0b23539
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 17 21:21:07 2010 +0000

    Move NPRuntime related tests to plugins/npruntime
    https://bugs.webkit.org/show_bug.cgi?id=42505
    
    Reviewed by Dan Bernstein.
    
    * platform/gtk/Skipped:
    * platform/mac-snowleopard/Skipped:
    * platform/win/Skipped:
    Update skipped lists.
    
    * plugins/netscape-identifier-conversion.html: Removed.
    * plugins/npruntime/bindings-test-expected.txt: Renamed from LayoutTests/plugins/bindings-test-expected.txt.
    * plugins/npruntime/bindings-test.html: Renamed from LayoutTests/plugins/bindings-test.html.
    * plugins/npruntime/browser-object-identity-expected.txt: Renamed from LayoutTests/plugins/netscape-browser-object-identity-expected.txt.
    * plugins/npruntime/browser-object-identity.html: Renamed from LayoutTests/plugins/netscape-browser-object-identity.html.
    * plugins/npruntime/construct-expected.txt: Renamed from LayoutTests/plugins/netscape-construct-expected.txt.
    * plugins/npruntime/construct.html: Renamed from LayoutTests/plugins/netscape-construct.html.
    * plugins/npruntime/embed-property-expected.txt: Renamed from LayoutTests/plugins/embed-property-expected.txt.
    * plugins/npruntime/embed-property.html: Renamed from LayoutTests/plugins/embed-property.html.
    * plugins/npruntime/enumerate-expected.txt: Renamed from LayoutTests/plugins/netscape-enumerate-expected.txt.
    * plugins/npruntime/enumerate.html: Renamed from LayoutTests/plugins/netscape-enumerate.html.
    * plugins/npruntime/get-int-identifier-special-values-expected.txt: Renamed from LayoutTests/plugins/getintidentifier-special-values-expected.txt.
    * plugins/npruntime/get-int-identifier-special-values.html: Renamed from LayoutTests/plugins/getintidentifier-special-values.html.
    * plugins/npruntime/get-property-return-value-expected.txt: Renamed from LayoutTests/plugins/netscape-get-property-return-value-expected.txt.
    * plugins/npruntime/get-property-return-value.html: Renamed from LayoutTests/plugins/netscape-get-property-return-value.html.
    * plugins/npruntime/identifier-conversion-expected.txt: Renamed from LayoutTests/plugins/netscape-identifier-conversion-expected.txt.
    * plugins/npruntime/identifier-conversion.html: Renamed from LayoutTests/plugins/netscape-identifier-conversion.html.
    * plugins/npruntime/invoke-browserfuncs-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-browserfuncs-expected.txt.
    * plugins/npruntime/invoke-browserfuncs.html: Renamed from LayoutTests/plugins/netscape-invoke-browserfuncs.html.
    * plugins/npruntime/invoke-default-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-default-expected.txt.
    * plugins/npruntime/invoke-default.html: Renamed from LayoutTests/plugins/netscape-invoke-default.html.
    * plugins/npruntime/invoke-expected.txt: Renamed from LayoutTests/plugins/invoke-expected.txt.
    * plugins/npruntime/invoke-failure-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-failure-expected.txt.
    * plugins/npruntime/invoke-failure.html: Renamed from LayoutTests/plugins/netscape-invoke-failure.html.
    * plugins/npruntime/invoke.html: Renamed from LayoutTests/plugins/invoke.html.
    * plugins/npruntime/npruntime-expected.txt: Renamed from LayoutTests/plugins/npruntime-expected.txt.
    * plugins/npruntime/npruntime.html: Renamed from LayoutTests/plugins/npruntime.html.
    * plugins/npruntime/round-trip-npobject-expected.txt: Renamed from LayoutTests/plugins/round-trip-npobject-expected.txt.
    * plugins/npruntime/round-trip-npobject.html: Renamed from LayoutTests/plugins/round-trip-npobject.html.
    * plugins/npruntime/script-tests/TEMPLATE.html: Renamed from LayoutTests/plugins/script-tests/TEMPLATE.html.
    * plugins/npruntime/script-tests/browser-object-identity.js: Renamed from LayoutTests/plugins/script-tests/netscape-browser-object-identity.js.
    (description.gc):
    * plugins/npruntime/script-tests/identifier-conversion.js: Renamed from LayoutTests/plugins/script-tests/netscape-identifier-conversion.js.
    * plugins/npruntime/set-property-expected.txt: Renamed from LayoutTests/plugins/setProperty-expected.txt.
    * plugins/npruntime/set-property.html: Renamed from LayoutTests/plugins/setProperty.html.
    * plugins/npruntime/throw-exception-expected.txt: Renamed from LayoutTests/plugins/netscape-throw-exception-expected.txt.
    * plugins/npruntime/throw-exception.html: Renamed from LayoutTests/plugins/netscape-throw-exception.html.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b46046..0e36628 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,53 @@
+2010-07-17  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Move NPRuntime related tests to plugins/npruntime
+        https://bugs.webkit.org/show_bug.cgi?id=42505
+
+        * platform/gtk/Skipped:
+        * platform/mac-snowleopard/Skipped:
+        * platform/win/Skipped:
+        Update skipped lists.
+
+        * plugins/netscape-identifier-conversion.html: Removed.
+        * plugins/npruntime/bindings-test-expected.txt: Renamed from LayoutTests/plugins/bindings-test-expected.txt.
+        * plugins/npruntime/bindings-test.html: Renamed from LayoutTests/plugins/bindings-test.html.
+        * plugins/npruntime/browser-object-identity-expected.txt: Renamed from LayoutTests/plugins/netscape-browser-object-identity-expected.txt.
+        * plugins/npruntime/browser-object-identity.html: Renamed from LayoutTests/plugins/netscape-browser-object-identity.html.
+        * plugins/npruntime/construct-expected.txt: Renamed from LayoutTests/plugins/netscape-construct-expected.txt.
+        * plugins/npruntime/construct.html: Renamed from LayoutTests/plugins/netscape-construct.html.
+        * plugins/npruntime/embed-property-expected.txt: Renamed from LayoutTests/plugins/embed-property-expected.txt.
+        * plugins/npruntime/embed-property.html: Renamed from LayoutTests/plugins/embed-property.html.
+        * plugins/npruntime/enumerate-expected.txt: Renamed from LayoutTests/plugins/netscape-enumerate-expected.txt.
+        * plugins/npruntime/enumerate.html: Renamed from LayoutTests/plugins/netscape-enumerate.html.
+        * plugins/npruntime/get-int-identifier-special-values-expected.txt: Renamed from LayoutTests/plugins/getintidentifier-special-values-expected.txt.
+        * plugins/npruntime/get-int-identifier-special-values.html: Renamed from LayoutTests/plugins/getintidentifier-special-values.html.
+        * plugins/npruntime/get-property-return-value-expected.txt: Renamed from LayoutTests/plugins/netscape-get-property-return-value-expected.txt.
+        * plugins/npruntime/get-property-return-value.html: Renamed from LayoutTests/plugins/netscape-get-property-return-value.html.
+        * plugins/npruntime/identifier-conversion-expected.txt: Renamed from LayoutTests/plugins/netscape-identifier-conversion-expected.txt.
+        * plugins/npruntime/identifier-conversion.html: Renamed from LayoutTests/plugins/netscape-identifier-conversion.html.
+        * plugins/npruntime/invoke-browserfuncs-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-browserfuncs-expected.txt.
+        * plugins/npruntime/invoke-browserfuncs.html: Renamed from LayoutTests/plugins/netscape-invoke-browserfuncs.html.
+        * plugins/npruntime/invoke-default-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-default-expected.txt.
+        * plugins/npruntime/invoke-default.html: Renamed from LayoutTests/plugins/netscape-invoke-default.html.
+        * plugins/npruntime/invoke-expected.txt: Renamed from LayoutTests/plugins/invoke-expected.txt.
+        * plugins/npruntime/invoke-failure-expected.txt: Renamed from LayoutTests/plugins/netscape-invoke-failure-expected.txt.
+        * plugins/npruntime/invoke-failure.html: Renamed from LayoutTests/plugins/netscape-invoke-failure.html.
+        * plugins/npruntime/invoke.html: Renamed from LayoutTests/plugins/invoke.html.
+        * plugins/npruntime/npruntime-expected.txt: Renamed from LayoutTests/plugins/npruntime-expected.txt.
+        * plugins/npruntime/npruntime.html: Renamed from LayoutTests/plugins/npruntime.html.
+        * plugins/npruntime/round-trip-npobject-expected.txt: Renamed from LayoutTests/plugins/round-trip-npobject-expected.txt.
+        * plugins/npruntime/round-trip-npobject.html: Renamed from LayoutTests/plugins/round-trip-npobject.html.
+        * plugins/npruntime/script-tests/TEMPLATE.html: Renamed from LayoutTests/plugins/script-tests/TEMPLATE.html.
+        * plugins/npruntime/script-tests/browser-object-identity.js: Renamed from LayoutTests/plugins/script-tests/netscape-browser-object-identity.js.
+        (description.gc):
+        * plugins/npruntime/script-tests/identifier-conversion.js: Renamed from LayoutTests/plugins/script-tests/netscape-identifier-conversion.js.
+        * plugins/npruntime/set-property-expected.txt: Renamed from LayoutTests/plugins/setProperty-expected.txt.
+        * plugins/npruntime/set-property.html: Renamed from LayoutTests/plugins/setProperty.html.
+        * plugins/npruntime/throw-exception-expected.txt: Renamed from LayoutTests/plugins/netscape-throw-exception-expected.txt.
+        * plugins/npruntime/throw-exception.html: Renamed from LayoutTests/plugins/netscape-throw-exception.html.
+
 2010-07-17  John Gregg  <johnnyg at google.com>
 
         Unreviewed, updating test expectations.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 0580905..560a0b9 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5553,7 +5553,7 @@ inspector/console-format.html
 media/video-reverse-play-duration.html
 
 #https://bugs.webkit.org/show_bug.cgi?id=37537
-plugins/round-trip-npobject.html
+plugins/npruntime/round-trip-npobject.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=37539
 svg/custom/use-on-clip-path-with-transformation.svg
@@ -5565,7 +5565,7 @@ http/tests/security/xss-DENIED-mime-type-execute-as-html.html
 svg/custom/use-instanceRoot-as-event-target.xhtml
 
 # https://bugs.webkit.org/show_bug.cgi?id=37545
-plugins/setProperty.html
+plugins/npruntime/setProperty.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=37546
 media/audio-delete-while-slider-thumb-clicked.html
diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index 859fbaa..1e8f96d 100644
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -11,20 +11,20 @@ plugins/mouse-events.html
 plugins/private-browsing-mode.html
 plugins/private-browsing-mode-2.html
 plugins/netscape-plugin-property-access-exception.html
-plugins/netscape-throw-exception.html
+plugins/npruntime/throw-exception.html
 plugins/netscape-dom-access.html
-plugins/netscape-browser-object-identity.html
+plugins/npruntime/browser-object-identity.html
 plugins/destroy-plugin-from-callback.html
 # Intermittent failures, requiring a newer version of Safari:
 # https://bugs.webkit.org/show_bug.cgi?id=36462
 plugins/keyboard-events.html
 plugins/mouse-events-fixedpos.html
-plugins/netscape-construct.html
+plugins/npruntime/construct.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=30528 - test started failing
 # immediately on Snow Leopard due to the expected exception not being
 # thrown
-plugins/netscape-invoke-failure.html
+plugins/npruntime/invoke-failure.html
 
 # Radar bugs needed for these
 fast/canvas/set-colors.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index cda76a0..7937d7d 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -539,7 +539,7 @@ http/tests/security/local-iFrame-from-remote.html
 http/tests/security/local-image-from-remote.html
 http/tests/security/local-user-CSS-from-remote.html
 http/tests/security/originHeader/origin-header-for-https.html
-plugins/npruntime.html
+plugins/npruntime/npruntime.html
 
 ################################################################################
 ######################### End list of r41995 failures ##########################
diff --git a/LayoutTests/plugins/netscape-identifier-conversion.html b/LayoutTests/plugins/netscape-identifier-conversion.html
deleted file mode 100644
index 8390c43..0000000
--- a/LayoutTests/plugins/netscape-identifier-conversion.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
-<script src="../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/netscape-identifier-conversion.js"></script>
-<script src="../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/plugins/npruntime.html b/LayoutTests/plugins/npruntime.html
deleted file mode 100644
index 07d1507..0000000
--- a/LayoutTests/plugins/npruntime.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<head>
-<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
-<script src="../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-function main() 
-{
-    if (!window.layoutTestController) {
-        debug("This test can only run from within DumpRenderTree because it requires TestNetscapePlugin.\n");
-        return;
-    }
-
-    layoutTestController.waitUntilDone();
-}
-main();
-
-function testNPInvoke()
-{
-    argumentsLength = arguments.length;
-    
-    shouldBe("argumentsLength", "7");
-
-    undefinedArgument = arguments[0];
-    shouldBe("typeof(undefinedArgument)", "'undefined'")
-    
-    nullArgument = arguments[1];
-    shouldBe("typeof(nullArgument)", "'object'")
-    shouldBe("nullArgument", "null");
-    
-    booleanArgument = arguments[2];
-    shouldBe("typeof(booleanArgument)", "'boolean'");
-    shouldBe("booleanArgument", "true");
-    
-    intArgument = arguments[3];
-    shouldBe("typeof(intArgument)", "'number'");
-    shouldBe("intArgument", "242");
-    
-    doubleArgument = arguments[4];
-    shouldBe("typeof(doubleArgument)", "'number'");
-    shouldBe("doubleArgument", "242.242");
-    
-    stringArgument = arguments[5];
-    shouldBe("typeof(stringArgument)", "'string'");
-    shouldBe("stringArgument", "'Hello, World'");
-    
-    objectArgument = arguments[6];
-    shouldBe("typeof(objectArgument)", "'object'");
-
-    shouldBeTrue("successfullyParsed");
-    debug('<br><span class="pass">TEST COMPLETE</span>');
-    
-    layoutTestController.notifyDone();
-}
-
-</script>
-<embed id="plugin" 
-       type="application/x-webkit-test-netscape"
-       style="width:0; height:0"
-       testnpruntime="1">
-</embed>
-
-<script>
-description("Tests that the NPRuntime implementation works as expected");
-
-
-successfullyParsed = true;
-</script>
diff --git a/LayoutTests/plugins/bindings-test-expected.txt b/LayoutTests/plugins/npruntime/bindings-test-expected.txt
similarity index 100%
rename from LayoutTests/plugins/bindings-test-expected.txt
rename to LayoutTests/plugins/npruntime/bindings-test-expected.txt
diff --git a/LayoutTests/plugins/bindings-test.html b/LayoutTests/plugins/npruntime/bindings-test.html
similarity index 100%
rename from LayoutTests/plugins/bindings-test.html
rename to LayoutTests/plugins/npruntime/bindings-test.html
diff --git a/LayoutTests/plugins/netscape-browser-object-identity-expected.txt b/LayoutTests/plugins/npruntime/browser-object-identity-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-browser-object-identity-expected.txt
rename to LayoutTests/plugins/npruntime/browser-object-identity-expected.txt
diff --git a/LayoutTests/plugins/netscape-browser-object-identity.html b/LayoutTests/plugins/npruntime/browser-object-identity.html
similarity index 100%
rename from LayoutTests/plugins/netscape-browser-object-identity.html
rename to LayoutTests/plugins/npruntime/browser-object-identity.html
diff --git a/LayoutTests/plugins/netscape-construct-expected.txt b/LayoutTests/plugins/npruntime/construct-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-construct-expected.txt
rename to LayoutTests/plugins/npruntime/construct-expected.txt
diff --git a/LayoutTests/plugins/netscape-construct.html b/LayoutTests/plugins/npruntime/construct.html
similarity index 100%
rename from LayoutTests/plugins/netscape-construct.html
rename to LayoutTests/plugins/npruntime/construct.html
diff --git a/LayoutTests/plugins/embed-property-expected.txt b/LayoutTests/plugins/npruntime/embed-property-expected.txt
similarity index 100%
rename from LayoutTests/plugins/embed-property-expected.txt
rename to LayoutTests/plugins/npruntime/embed-property-expected.txt
diff --git a/LayoutTests/plugins/embed-property.html b/LayoutTests/plugins/npruntime/embed-property.html
similarity index 100%
rename from LayoutTests/plugins/embed-property.html
rename to LayoutTests/plugins/npruntime/embed-property.html
diff --git a/LayoutTests/plugins/netscape-enumerate-expected.txt b/LayoutTests/plugins/npruntime/enumerate-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-enumerate-expected.txt
rename to LayoutTests/plugins/npruntime/enumerate-expected.txt
diff --git a/LayoutTests/plugins/netscape-enumerate.html b/LayoutTests/plugins/npruntime/enumerate.html
similarity index 100%
rename from LayoutTests/plugins/netscape-enumerate.html
rename to LayoutTests/plugins/npruntime/enumerate.html
diff --git a/LayoutTests/plugins/getintidentifier-special-values-expected.txt b/LayoutTests/plugins/npruntime/get-int-identifier-special-values-expected.txt
similarity index 100%
rename from LayoutTests/plugins/getintidentifier-special-values-expected.txt
rename to LayoutTests/plugins/npruntime/get-int-identifier-special-values-expected.txt
diff --git a/LayoutTests/plugins/getintidentifier-special-values.html b/LayoutTests/plugins/npruntime/get-int-identifier-special-values.html
similarity index 100%
rename from LayoutTests/plugins/getintidentifier-special-values.html
rename to LayoutTests/plugins/npruntime/get-int-identifier-special-values.html
diff --git a/LayoutTests/plugins/netscape-get-property-return-value-expected.txt b/LayoutTests/plugins/npruntime/get-property-return-value-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-get-property-return-value-expected.txt
rename to LayoutTests/plugins/npruntime/get-property-return-value-expected.txt
diff --git a/LayoutTests/plugins/netscape-get-property-return-value.html b/LayoutTests/plugins/npruntime/get-property-return-value.html
similarity index 100%
rename from LayoutTests/plugins/netscape-get-property-return-value.html
rename to LayoutTests/plugins/npruntime/get-property-return-value.html
diff --git a/LayoutTests/plugins/netscape-identifier-conversion-expected.txt b/LayoutTests/plugins/npruntime/identifier-conversion-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-identifier-conversion-expected.txt
rename to LayoutTests/plugins/npruntime/identifier-conversion-expected.txt
diff --git a/LayoutTests/plugins/npruntime/identifier-conversion.html b/LayoutTests/plugins/npruntime/identifier-conversion.html
new file mode 100644
index 0000000..6487368
--- /dev/null
+++ b/LayoutTests/plugins/npruntime/identifier-conversion.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/identifier-conversion.js"></script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/plugins/netscape-invoke-browserfuncs-expected.txt b/LayoutTests/plugins/npruntime/invoke-browserfuncs-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-browserfuncs-expected.txt
rename to LayoutTests/plugins/npruntime/invoke-browserfuncs-expected.txt
diff --git a/LayoutTests/plugins/netscape-invoke-browserfuncs.html b/LayoutTests/plugins/npruntime/invoke-browserfuncs.html
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-browserfuncs.html
rename to LayoutTests/plugins/npruntime/invoke-browserfuncs.html
diff --git a/LayoutTests/plugins/netscape-invoke-default-expected.txt b/LayoutTests/plugins/npruntime/invoke-default-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-default-expected.txt
rename to LayoutTests/plugins/npruntime/invoke-default-expected.txt
diff --git a/LayoutTests/plugins/netscape-invoke-default.html b/LayoutTests/plugins/npruntime/invoke-default.html
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-default.html
rename to LayoutTests/plugins/npruntime/invoke-default.html
diff --git a/LayoutTests/plugins/invoke-expected.txt b/LayoutTests/plugins/npruntime/invoke-expected.txt
similarity index 100%
rename from LayoutTests/plugins/invoke-expected.txt
rename to LayoutTests/plugins/npruntime/invoke-expected.txt
diff --git a/LayoutTests/plugins/netscape-invoke-failure-expected.txt b/LayoutTests/plugins/npruntime/invoke-failure-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-failure-expected.txt
rename to LayoutTests/plugins/npruntime/invoke-failure-expected.txt
diff --git a/LayoutTests/plugins/netscape-invoke-failure.html b/LayoutTests/plugins/npruntime/invoke-failure.html
similarity index 100%
rename from LayoutTests/plugins/netscape-invoke-failure.html
rename to LayoutTests/plugins/npruntime/invoke-failure.html
diff --git a/LayoutTests/plugins/invoke.html b/LayoutTests/plugins/npruntime/invoke.html
similarity index 100%
rename from LayoutTests/plugins/invoke.html
rename to LayoutTests/plugins/npruntime/invoke.html
diff --git a/LayoutTests/plugins/npruntime-expected.txt b/LayoutTests/plugins/npruntime/npruntime-expected.txt
similarity index 100%
rename from LayoutTests/plugins/npruntime-expected.txt
rename to LayoutTests/plugins/npruntime/npruntime-expected.txt
diff --git a/LayoutTests/plugins/npruntime/npruntime.html b/LayoutTests/plugins/npruntime/npruntime.html
new file mode 100644
index 0000000..daba413
--- /dev/null
+++ b/LayoutTests/plugins/npruntime/npruntime.html
@@ -0,0 +1,70 @@
+<head>
+<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+function main() 
+{
+    if (!window.layoutTestController) {
+        debug("This test can only run from within DumpRenderTree because it requires TestNetscapePlugin.\n");
+        return;
+    }
+
+    layoutTestController.waitUntilDone();
+}
+main();
+
+function testNPInvoke()
+{
+    argumentsLength = arguments.length;
+    
+    shouldBe("argumentsLength", "7");
+
+    undefinedArgument = arguments[0];
+    shouldBe("typeof(undefinedArgument)", "'undefined'")
+    
+    nullArgument = arguments[1];
+    shouldBe("typeof(nullArgument)", "'object'")
+    shouldBe("nullArgument", "null");
+    
+    booleanArgument = arguments[2];
+    shouldBe("typeof(booleanArgument)", "'boolean'");
+    shouldBe("booleanArgument", "true");
+    
+    intArgument = arguments[3];
+    shouldBe("typeof(intArgument)", "'number'");
+    shouldBe("intArgument", "242");
+    
+    doubleArgument = arguments[4];
+    shouldBe("typeof(doubleArgument)", "'number'");
+    shouldBe("doubleArgument", "242.242");
+    
+    stringArgument = arguments[5];
+    shouldBe("typeof(stringArgument)", "'string'");
+    shouldBe("stringArgument", "'Hello, World'");
+    
+    objectArgument = arguments[6];
+    shouldBe("typeof(objectArgument)", "'object'");
+
+    shouldBeTrue("successfullyParsed");
+    debug('<br><span class="pass">TEST COMPLETE</span>');
+    
+    layoutTestController.notifyDone();
+}
+
+</script>
+<embed id="plugin" 
+       type="application/x-webkit-test-netscape"
+       style="width:0; height:0"
+       testnpruntime="1">
+</embed>
+
+<script>
+description("Tests that the NPRuntime implementation works as expected");
+
+
+successfullyParsed = true;
+</script>
diff --git a/LayoutTests/plugins/round-trip-npobject-expected.txt b/LayoutTests/plugins/npruntime/round-trip-npobject-expected.txt
similarity index 100%
rename from LayoutTests/plugins/round-trip-npobject-expected.txt
rename to LayoutTests/plugins/npruntime/round-trip-npobject-expected.txt
diff --git a/LayoutTests/plugins/round-trip-npobject.html b/LayoutTests/plugins/npruntime/round-trip-npobject.html
similarity index 100%
rename from LayoutTests/plugins/round-trip-npobject.html
rename to LayoutTests/plugins/npruntime/round-trip-npobject.html
diff --git a/LayoutTests/plugins/script-tests/TEMPLATE.html b/LayoutTests/plugins/npruntime/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/plugins/script-tests/TEMPLATE.html
rename to LayoutTests/plugins/npruntime/script-tests/TEMPLATE.html
diff --git a/LayoutTests/plugins/script-tests/netscape-browser-object-identity.js b/LayoutTests/plugins/npruntime/script-tests/browser-object-identity.js
similarity index 100%
rename from LayoutTests/plugins/script-tests/netscape-browser-object-identity.js
rename to LayoutTests/plugins/npruntime/script-tests/browser-object-identity.js
diff --git a/LayoutTests/plugins/script-tests/netscape-identifier-conversion.js b/LayoutTests/plugins/npruntime/script-tests/identifier-conversion.js
similarity index 100%
rename from LayoutTests/plugins/script-tests/netscape-identifier-conversion.js
rename to LayoutTests/plugins/npruntime/script-tests/identifier-conversion.js
diff --git a/LayoutTests/plugins/setProperty-expected.txt b/LayoutTests/plugins/npruntime/set-property-expected.txt
similarity index 100%
rename from LayoutTests/plugins/setProperty-expected.txt
rename to LayoutTests/plugins/npruntime/set-property-expected.txt
diff --git a/LayoutTests/plugins/setProperty.html b/LayoutTests/plugins/npruntime/set-property.html
similarity index 100%
rename from LayoutTests/plugins/setProperty.html
rename to LayoutTests/plugins/npruntime/set-property.html
diff --git a/LayoutTests/plugins/netscape-throw-exception-expected.txt b/LayoutTests/plugins/npruntime/throw-exception-expected.txt
similarity index 100%
rename from LayoutTests/plugins/netscape-throw-exception-expected.txt
rename to LayoutTests/plugins/npruntime/throw-exception-expected.txt
diff --git a/LayoutTests/plugins/netscape-throw-exception.html b/LayoutTests/plugins/npruntime/throw-exception.html
similarity index 100%
rename from LayoutTests/plugins/netscape-throw-exception.html
rename to LayoutTests/plugins/npruntime/throw-exception.html

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list