Modifications to the tests for unicode-bidi: isolate and plaintext from Webkit. Bug 706194, r=roc
authorSimon Montagu <smontagu@smontagu.org>
Mon, 23 Apr 2012 11:48:33 +0300
changeset 95433 af0733d23b87aaf51477a58afa08f716ab3b6402
parent 95432 d8d124d2a76c57bffed5972003470b4da218e839
child 95434 ef43fa1005b7e90d74ba3ab3de91c61d4d037d6c
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs706194
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Modifications to the tests for unicode-bidi: isolate and plaintext from Webkit. Bug 706194, r=roc
layout/reftests/bidi/reftest.list
layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
layout/reftests/bidi/unicode-bidi-isolate-basic.html
layout/reftests/bidi/unicode-bidi-isolate-basic.js
layout/reftests/bidi/unicode-bidi-plaintext-textarea-1.html
layout/reftests/bidi/unicode-bidi-plaintext-textarea-2.html
layout/reftests/bidi/unicode-bidi-plaintext-textarea-3.html
layout/reftests/bidi/unicode-bidi-plaintext-textarea-4.html
layout/reftests/bidi/unicode-bidi-plaintext-textarea-ref.html
layout/reftests/bidi/unicode-bidi-plaintext.html
layout/style/test/test_default_bidi_css.html
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -28,18 +28,18 @@ random-if(cocoaWidget) == mirroring-02.h
 == mixedChartype-01.html mixedChartype-01-ref.html
 == mixedChartype-01-j.html mixedChartype-01-ref.html
 == mixedChartype-02.html mixedChartype-02-ref.html
 == mixedChartype-02-j.html mixedChartype-02-ref.html
 == mixedChartype-03.html mixedChartype-03-ref.html
 == mixedChartype-03-j.html mixedChartype-03-ref.html
 == unicode-bidi-anonymous-001.html unicode-bidi-anonymous-001-ref.html
 == unicode-bidi-anonymous-002.html unicode-bidi-anonymous-002-ref.html
-== unicode-bidi-isolate-basic.html unicode-bidi-isolate-basic-ref.html
-== unicode-bidi-isolate-aharon.html unicode-bidi-isolate-aharon-ref.html
+fails == unicode-bidi-isolate-basic.html unicode-bidi-isolate-basic-ref.html # bug 712600
+fails == unicode-bidi-isolate-aharon.html unicode-bidi-isolate-aharon-ref.html # bug 712600
 == unicode-bidi-plaintext.html unicode-bidi-plaintext-ref.html
 == unicode-bidi-plaintext-textarea-1.html unicode-bidi-plaintext-textarea-ref.html
 == unicode-bidi-plaintext-textarea-2.html unicode-bidi-plaintext-textarea-ref.html
 == unicode-bidi-plaintext-textarea-3.html unicode-bidi-plaintext-textarea-ref.html
 == unicode-bidi-plaintext-textarea-4.html unicode-bidi-plaintext-textarea-ref.html
 == with-first-letter-1a.html with-first-letter-1-ref.html
 == with-first-letter-1b.html with-first-letter-1-ref.html
 random-if(cocoaWidget) == with-first-letter-2a.html with-first-letter-2-ref.html # bug 734313
--- a/layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
+++ b/layout/reftests/bidi/unicode-bidi-isolate-basic-ref.html
@@ -4,16 +4,17 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <script type="text/javascript" src="unicode-bidi-isolate-basic.js"></script>
 <style>
 .resultsDiv {
     -moz-column-width: 3em;
     -webkit-column-width: 3em;
     -moz-column-gap: 5em;
     -webkit-column-gap: 5em;
+    text-align: left;
 }
 .enclosed { display: inline-block; }
 </style>
 </head>
 <body onload="buildTable();">
 <div id="resultsContainer" style="position: relative">
 <div id="elem" class="resultsDiv"></div>
 </div>
--- a/layout/reftests/bidi/unicode-bidi-isolate-basic.html
+++ b/layout/reftests/bidi/unicode-bidi-isolate-basic.html
@@ -4,16 +4,17 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <script type="text/javascript" src="unicode-bidi-isolate-basic.js"></script>
 <style>
 .resultsDiv {
     -moz-column-width: 3em;
     -webkit-column-width: 3em;
     -moz-column-gap: 5em;
     -webkit-column-gap: 5em;
+    text-align: left;
 }
 .enclosed { unicode-bidi: -moz-isolate; }
 </style>
 </head>
 <body onload="buildTable()">
 <div id="resultsContainer" style="position: relative">
 <div id="elem" class="resultsDiv"></div>
 </div>
--- a/layout/reftests/bidi/unicode-bidi-isolate-basic.js
+++ b/layout/reftests/bidi/unicode-bidi-isolate-basic.js
@@ -1,14 +1,14 @@
 function buildTable()
 {
     var seed = 0;
 
     var neutrals = ['"', ")", "("];
-    var strongRTLs = ['ש', 'נ', 'ב', 'ג', 'ק', 'כ', 'ע'];
+    var strongRTLs = ['א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז'];
     var strongLTRs = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
     var neutral = function() { return neutrals[seed++ % neutrals.length]; }
     var strongRTL = function() { return strongRTLs[seed++ % strongRTLs.length]; }
     var strongLTR = function() { return strongLTRs[seed++ % strongLTRs.length]; }
     var charClassExamples = [neutral, strongRTL, strongLTR];
     var possibleDirs = ['ltr', 'rtl'];
 
     var elem=document.getElementById("elem");
--- a/layout/reftests/bidi/unicode-bidi-plaintext-textarea-1.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext-textarea-1.html
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
 <html><head>
 <title>unicode-bidi:plaintext</title>
+<style>
+  textarea { text-align: left; resize: none; }
+</style>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head><body>
 <div>
 The exclamation mark should be on the left side of the first line
 and on the right side of the second line.
 </div>
 <textarea rows=4 cols=50 dir=auto>
 שלום!
--- a/layout/reftests/bidi/unicode-bidi-plaintext-textarea-2.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext-textarea-2.html
@@ -3,16 +3,17 @@
 <title>unicode-bidi:plaintext</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style>
   .plaintext {
     unicode-bidi:-webkit-plaintext;
     unicode-bidi:-moz-plaintext;
     unicode-bidi:plaintext;
   }
+  textarea { text-align: left; resize: none; }
 </style>
 </head><body>
 <div>
 The exclamation mark should be on the left side of the first line
 and on the right side of the second line.
 </div>
 <textarea rows=4 cols=50 class="plaintext">
 שלום!
--- a/layout/reftests/bidi/unicode-bidi-plaintext-textarea-3.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext-textarea-3.html
@@ -3,16 +3,17 @@
 <title>unicode-bidi:plaintext</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style>
   .plaintext {
     unicode-bidi:-webkit-plaintext;
     unicode-bidi:-moz-plaintext;
     unicode-bidi:plaintext;
   }
+  textarea { text-align: left; resize: none; }
 </style>
 </head><body>
 <div>
 The exclamation mark should be on the left side of the first line
 and on the right side of the second line.
 </div>
 <textarea rows=4 cols=50 dir="ltr" class="plaintext">
 שלום!
--- a/layout/reftests/bidi/unicode-bidi-plaintext-textarea-4.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext-textarea-4.html
@@ -3,16 +3,17 @@
 <title>unicode-bidi:plaintext</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style>
   .plaintext {
     unicode-bidi:-webkit-plaintext;
     unicode-bidi:-moz-plaintext;
     unicode-bidi:plaintext;
   }
+  textarea { text-align: left; resize: none; }
 </style>
 </head><body>
 <div>
 The exclamation mark should be on the left side of the first line
 and on the right side of the second line.
 </div>
 <textarea rows=4 cols=50 dir="rtl" class="plaintext">
 שלום!
--- a/layout/reftests/bidi/unicode-bidi-plaintext-textarea-ref.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext-textarea-ref.html
@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
 <title>unicode-bidi:plaintext</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style>
+  textarea { resize: none; }
+</style>
 </head>
 <body>
 <div>
 The exclamation mark should be on the left side of the first line
 and on the right side of the second line.
 </div>
 <textarea rows=4 cols=50 dir=ltr>
 &#x202b;שלום!&#x202c;
--- a/layout/reftests/bidi/unicode-bidi-plaintext.html
+++ b/layout/reftests/bidi/unicode-bidi-plaintext.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style> 
+div, pre { text-align: left; }
+</style>
 </head>
 <body>
 <div style="unicode-bidi: -webkit-plaintext; unicode-bidi: -moz-plaintext; unicode-bidi: plaintext;">
 !hello.
 <br>
 !שלום.
 <br>
 hello, לוי!
--- a/layout/style/test/test_default_bidi_css.html
+++ b/layout/style/test/test_default_bidi_css.html
@@ -21,20 +21,20 @@ function styleOf(name, attributes) {
         var value = attributes[name];
         element.setAttribute(name, value);
     }
     return getComputedStyle(element);
 }
 
 var tests = [
     ['div', {}, 'ltr', '-moz-isolate'],
-    ['div', {'dir': 'ltr'}, 'ltr', 'embed'],
-    ['div', {'dir': 'rtl'}, 'rtl', 'embed'],
+    ['div', {'dir': 'ltr'}, 'ltr', '-moz-isolate'],
+    ['div', {'dir': 'rtl'}, 'rtl', '-moz-isolate'],
     ['div', {'dir': 'auto'}, 'ltr', '-moz-isolate'],
-    ['div', {'dir': ''}, 'ltr', 'embed'],
+    ['div', {'dir': ''}, 'ltr', '-moz-isolate'],
 
     ['span', {}, 'ltr', 'normal'],
     ['span', {'dir': 'ltr'}, 'ltr', 'embed'],
     ['span', {'dir': 'rtl'}, 'rtl', 'embed'],
     ['span', {'dir': 'auto'}, 'ltr', '-moz-isolate'],
     ['span', {'dir': ''}, 'ltr', 'embed'],
 
     ['bdi', {}, 'ltr', '-moz-isolate'],
@@ -56,21 +56,21 @@ var tests = [
     ['bdo', {'dir': ''}, 'ltr', 'bidi-override'],
 
     ['textarea', {}, 'ltr', 'normal'],
     ['textarea', {'dir': 'ltr'}, 'ltr', 'embed'],
     ['textarea', {'dir': 'rtl'}, 'rtl', 'embed'],
     ['textarea', {'dir': 'auto'}, 'ltr', '-moz-plaintext'],
     ['textarea', {'dir': ''}, 'ltr', 'embed'],
 
-    ['pre', {}, 'ltr', 'normal'],
-    ['pre', {'dir': 'ltr'}, 'ltr', 'embed'],
-    ['pre', {'dir': 'rtl'}, 'rtl', 'embed'],
+    ['pre', {}, 'ltr', '-moz-isolate'],
+    ['pre', {'dir': 'ltr'}, 'ltr', '-moz-isolate'],
+    ['pre', {'dir': 'rtl'}, 'rtl', '-moz-isolate'],
     ['pre', {'dir': 'auto'}, 'ltr', '-moz-plaintext'],
-    ['pre', {'dir': ''}, 'ltr', 'embed'],
+    ['pre', {'dir': ''}, 'ltr', '-moz-isolate'],
 ].forEach(function (test) {
     var style = styleOf(test[0], test[1]);
     is(style.direction, test[2], "default value for direction");
     is(style.unicodeBidi, test[3], "default value for unicode-bidi");
 });
 
 
 </script>