JavaScript Tests - eliminate NL(), bug 353998

This commit is contained in:
bclary%bclary.com 2006-09-24 22:00:35 +00:00
parent cfa4884775
commit 4389624050
10 changed files with 47 additions and 65 deletions

View File

@ -468,7 +468,7 @@ function init()
function testIsXMLName(buffer)
{
var nl = NL();
var nl = "\n";
var result = '';
var length = buffer.length;

View File

@ -51,7 +51,7 @@ x =
</>;
TEST(1, "xml", typeof(x));
TEST(2, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toXMLString());
TEST(2, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toXMLString());
// Load from another XMLList
// Make sure it is copied if it's an XMLList
@ -59,7 +59,7 @@ y = new XMLList(x);
x += <charlie>three</charlie>;
TEST(3, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", y.toXMLString());
TEST(3, "<alpha>one</alpha>\n<bravo>two</bravo>", y.toXMLString());
// Load from one XML type
x = new XMLList(<alpha>one</alpha>);
@ -67,11 +67,11 @@ TEST(4, "<alpha>one</alpha>", x.toXMLString());
// Load from Anonymous
x = new XMLList(<><alpha>one</alpha><bravo>two</bravo></>);
TEST(5, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toXMLString());
TEST(5, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toXMLString());
// Load from Anonymous as string
x = new XMLList("<alpha>one</alpha><bravo>two</bravo>");
TEST(6, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toXMLString());
TEST(6, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toXMLString());
// Load from illegal type
//x = new XMLList("foobar");

View File

@ -62,7 +62,7 @@ x = new String("<alpha><bravo>one</bravo></alpha>");
TEST(3, <alpha><bravo>one</bravo></alpha>, new XMLList(x));
x = new String("<alpha>one</alpha><charlie>two</charlie>");
TEST(4, "<alpha>one</alpha>" + NL() + "<charlie>two</charlie>",
TEST(4, "<alpha>one</alpha>\n<charlie>two</charlie>",
new XMLList(x).toXMLString());
// XML
@ -77,7 +77,7 @@ x = new XMLList(<alpha><bravo>one</bravo></alpha>);
TEST(7, <alpha><bravo>one</bravo></alpha>, new XMLList(x));
x = new XMLList(<><alpha>one</alpha><bravo>two</bravo></>);
TEST(8, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>",
TEST(8, "<alpha>one</alpha>\n<bravo>two</bravo>",
new XMLList(x).toXMLString());
END();

View File

@ -48,15 +48,15 @@ var x =
<bravo>two</bravo>
</>;
TEST(1, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>",
TEST(1, "<alpha>one</alpha>\n<bravo>two</bravo>",
x.toXMLString());
x[0] = <charlie>three</charlie>;
TEST(2, "<charlie>three</charlie>" + NL() + "<bravo>two</bravo>",
TEST(2, "<charlie>three</charlie>\n<bravo>two</bravo>",
x.toXMLString());
x[0] = <delta>four</delta> + <echo>five</echo>;
TEST(3, "<delta>four</delta>" + NL() + "<echo>five</echo>" + NL() + "<bravo>two</bravo>",
TEST(3, "<delta>four</delta>\n<echo>five</echo>\n<bravo>two</bravo>",
x.toXMLString());
END();

View File

@ -61,9 +61,9 @@ XML.ignoreComments = false;
x = <alpha><!-- comment --><bravo>one</bravo></alpha>;
correct =
"<alpha>" + NL() +
" <!-- comment -->" + NL() +
" <bravo>one</bravo>" + NL() +
"<alpha>\n" +
" <!-- comment -->\n" +
" <bravo>one</bravo>\n" +
"</alpha>";
TEST_XML(7, correct, x);
@ -97,9 +97,9 @@ x =
</>;
correct =
"<alpha>" + NL() +
" <?foo version=\"1.0\" encoding=\"utf-8\"?>" + NL() +
" <bravo>one</bravo>" + NL() +
"<alpha>\n" +
" <?foo version=\"1.0\" encoding=\"utf-8\"?>\n" +
" <bravo>one</bravo>\n" +
"</alpha>";
TEST_XML(9, correct, x);
@ -109,8 +109,8 @@ XML.setSettings();
x = new XML("<alpha> \t\r\n\r\n<bravo> \t\r\n\r\none</bravo> \t\r\n\r\n</alpha>");
correct =
"<alpha>" + NL() +
" <bravo>one</bravo>" + NL() +
"<alpha>\n" +
" <bravo>one</bravo>\n" +
"</alpha>";
TEST_XML(10, correct, x);
@ -137,14 +137,14 @@ x =
</delta>
</alpha>;
correct = "<alpha>" + NL() +
" one" + NL() +
" <bravo>two</bravo>" + NL() +
" <charlie/>" + NL() +
" <delta>" + NL() +
" three" + NL() +
" <echo>four</echo>" + NL() +
" </delta>" + NL() +
correct = "<alpha>\n" +
" one\n" +
" <bravo>two</bravo>\n" +
" <charlie/>\n" +
" <delta>\n" +
" three\n" +
" <echo>four</echo>\n" +
" </delta>\n" +
"</alpha>";
TEST(12, correct, x.toString());
@ -160,14 +160,14 @@ TEST(15, correct, x.toXMLString());
XML.prettyPrinting = true;
XML.prettyIndent = 3;
correct = "<alpha>" + NL() +
" one" + NL() +
" <bravo>two</bravo>" + NL() +
" <charlie/>" + NL() +
" <delta>" + NL() +
" three" + NL() +
" <echo>four</echo>" + NL() +
" </delta>" + NL() +
correct = "<alpha>\n" +
" one\n" +
" <bravo>two</bravo>\n" +
" <charlie/>\n" +
" <delta>\n" +
" three\n" +
" <echo>four</echo>\n" +
" </delta>\n" +
"</alpha>";
TEST(16, correct, x.toString());
@ -175,14 +175,14 @@ TEST(17, correct, x.toXMLString());
XML.prettyIndent = 0;
correct = "<alpha>" + NL() +
"one" + NL() +
"<bravo>two</bravo>" + NL() +
"<charlie/>" + NL() +
"<delta>" + NL() +
"three" + NL() +
"<echo>four</echo>" + NL() +
"</delta>" + NL() +
correct = "<alpha>\n" +
"one\n" +
"<bravo>two</bravo>\n" +
"<charlie/>\n" +
"<delta>\n" +
"three\n" +
"<echo>four</echo>\n" +
"</delta>\n" +
"</alpha>";
TEST(18, correct, x.toString());

View File

@ -58,7 +58,7 @@ y = new XMLList(x);
x += <charlie>three</charlie>;
TEST(3, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", y.toString());
TEST(3, "<alpha>one</alpha>\n<bravo>two</bravo>", y.toString());
// Load from one XML type
x = new XMLList(<alpha>one</alpha>);
@ -66,11 +66,11 @@ TEST_XML(4, "<alpha>one</alpha>", x);
// Load from Anonymous
x = new XMLList(<><alpha>one</alpha><bravo>two</bravo></>);
TEST(5, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toString());
TEST(5, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toString());
// Load from Anonymous as string
x = new XMLList(<><alpha>one</alpha><bravo>two</bravo></>);
TEST(6, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toString());
TEST(6, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toString());
// Load from single textnode
x = new XMLList("foobar");

View File

@ -50,6 +50,6 @@ TEST(2, "one", x.toString());
x = <><alpha>one</alpha><bravo>two</bravo></>;
TEST(3, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toString());
TEST(3, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toString());
END();

View File

@ -50,6 +50,6 @@ TEST(2, "<alpha>one</alpha>", x.toXMLString());
x = <><alpha>one</alpha><bravo>two</bravo></>;
TEST(3, "<alpha>one</alpha>" + NL() + "<bravo>two</bravo>", x.toXMLString());
TEST(3, "<alpha>one</alpha>\n<bravo>two</bravo>", x.toXMLString());
END();

View File

@ -245,13 +245,4 @@ function quit()
{
}
// override NL from shell.js.
// assume running either on unix with \n line endings
// or on windows under cygwin with \n line endings.
function NL()
{
return '\n';
}
window.onerror = reportError;

View File

@ -186,15 +186,6 @@ function END()
{
}
function NL()
{
try {
return java.lang.System.getProperty("line.separator");
} catch (e) {
return "\n";
}
}
/* JavaScriptOptions
encapsulate the logic for setting and retrieving the values
of the javascript options.