Bug 899080 - Test fixup part 5 - layout. r=roc

1355e7da · Georg Fritzsche · 48069b57 · 1355e7da · 1355e7da · 1355e7da
Commit 1355e7da authored 11 years ago by Georg Fritzsche
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -151,6 +151,7 @@ MOCHITEST_FILES =	\
 		test_bug851445.html \
 		  bug851445_helper.html \
 		test_emulateMedium.html \
+		enableTestPlugin.js \
 		$(NULL)

 ifeq (,$(filter gonk,$(MOZ_WIDGET_TOOLKIT)))

--- a/layout/base/tests/enableTestPlugin.js
+++ b/layout/base/tests/enableTestPlugin.js
+// this automatically sets the test plugin to be enabled (not e.g. click-to-play)
+// and resets this afterwards
+
+(function() {
+  function getTestPlugin(aPluginName) {
+    var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                          .getService(SpecialPowers.Ci.nsIPluginHost);
+    var tags = ph.getPluginTags();
+    for (var tag of tags) {
+      if (tag.name == aPluginName) {
+       return tag;
+      }
+    }
+
+    ok(false, "Could not find plugin tag with plugin name '" + name + "'");
+    return null;
+  }
+
+  var plugin = getTestPlugin("Test Plug-in");
+  var oldEnabledState = plugin.enabledState;
+  plugin.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;
+  SimpleTest.registerCleanupFunction(function() {
+    getTestPlugin("Test Plug-in").enabledState = oldEnabledState;
+  });
+})();
--- a/layout/base/tests/test_bug629838.html
+++ b/layout/base/tests/test_bug629838.html
@@ -3,6 +3,7 @@
 <head>
  <title>Tests for MozAfterPaint</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>

--- a/layout/base/tests/test_mozPaintCount.html
+++ b/layout/base/tests/test_mozPaintCount.html
@@ -3,6 +3,7 @@
 <head>
  <title>Tests for mozPaintCount</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="doBackgroundFlicker()">

--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -106,6 +106,7 @@ MOCHITEST_FILES = \
  test_bug791616.html \
  test_bug831780.html \
  test_bug841361.html \
+  $(srcdir)/../../base/tests/enableTestPlugin.js \
  $(NULL)

 # Disable the caret movement by word test on Linux because the shortcut keys

--- a/layout/generic/test/test_invalidate_during_plugin_paint.html
+++ b/layout/generic/test/test_invalidate_during_plugin_paint.html
@@ -3,6 +3,7 @@
 <head>
  <title>Test handling plugins invalidating during paint</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>    
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
  <style>
  embed { width:200px; height:200px; display:block; }

--- a/layout/generic/test/test_plugin_focus.html
+++ b/layout/generic/test/test_plugin_focus.html
 <html title="Test plugin focus control">
 <head>
  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>

--- a/layout/generic/test/test_plugin_mouse_coords.html
+++ b/layout/generic/test/test_plugin_mouse_coords.html
@@ -4,6 +4,7 @@
  <title>Test delivering mouse events to plugins</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>    
  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="text/javascript" src="enableTestPlugin.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
  <style>
  embed { width:200px; height:200px; display:block; }