mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

NOT PART OF BUILD. Fix xpconenct test uses of progids missed in the big progid to contractid renaming

This commit is contained in:
jband%netscape.com 2000-09-16 21:47:32 +00:00
Родитель f019ffd8cf
Коммит d50e6f9d65
21 изменённых файлов: 60 добавлений и 73 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
js/src/xpconnect/tests/js/evaluate.js
Просмотреть файл

@ -46,7 +46,8 @@ AddTestComment();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestCallJS.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/CallJS;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestCallJS;
ERROR = Components.results;

3
js/src/xpconnect/tests/js/exceptions-2.js
Просмотреть файл

@ -48,7 +48,8 @@ AddTestComment();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestCallJS.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/CallJS;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestCallJS;
ERROR = Components.results;

3
js/src/xpconnect/tests/js/exceptions-3.js
Просмотреть файл

@ -46,7 +46,8 @@ AddTestComment();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestCallJS.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/CallJS;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestCallJS;
ERROR = Components.results;

3
js/src/xpconnect/tests/js/exceptions-4.js
Просмотреть файл

@ -46,7 +46,8 @@ AddTestComment();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestCallJS.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/CallJS;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestCallJS;
ERROR = Components.results;

3
js/src/xpconnect/tests/js/exceptions-5.js
Просмотреть файл

@ -46,7 +46,8 @@ AddTestComment();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestCallJS.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/CallJS;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestCallJS;
ERROR = Components.results;

2
js/src/xpconnect/tests/js/exceptions.js
Просмотреть файл

@ -39,7 +39,7 @@
StartTest( "Exceptions" );
var CLASS = Components.classes.nsEcho;
var CLASS = Components.classes["@mozilla.org/js/xpc/test/Echo;1"];
var IFACE = Components.interfaces.nsIEcho;
var nativeEcho = CLASS.createInstance(IFACE);

3
js/src/xpconnect/tests/js/javascript.js
Просмотреть файл

@ -44,7 +44,8 @@ AddTestData();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestObjectReadWrite.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ObjectReadWrite;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestObjectReadWrite;
testObject = CLASS.QueryInterface(IFACE);

10
js/src/xpconnect/tests/js/multiple-2.js
Просмотреть файл

@ -54,9 +54,13 @@ try {
iParentOne = Components.interfaces.nsIXPCTestParentOne;
iParentTwo = Components.interfaces.nsIXPCTestParentTwo;
cChild = Components.classes.xpcTestChild2.createInstance();
cParentOne = Components.classes.xpcTestParentOne.createInstance();
cParentTwo = Components.classes.xpcTestParentTwo.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/Child2;1";
cChild = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentOne;1";
cParentOne = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentTwo;1";
cParentTwo = Components.classes[CONTRACTID].createInstance();
c_c2 = cChild.QueryInterface(iChild);
c_p1 = cChild.QueryInterface(iParentOne);

10
js/src/xpconnect/tests/js/multiple-3.js
Просмотреть файл

@ -51,9 +51,13 @@ try {
iParentOne = Components.interfaces.nsIXPCTestParentOne;
iParentTwo = Components.interfaces.nsIXPCTestParentTwo;
cChild = Components.classes.xpcTestChild4.createInstance();
cParentOne = Components.classes.xpcTestParentOne.createInstance();
cParentTwo = Components.classes.xpcTestParentTwo.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/Child4;1";
cChild = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentOne;1";
cParentOne = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentTwo;1";
cParentTwo = Components.classes[CONTRACTID].createInstance();
c_c4 = cChild.QueryInterface(iChild);
c_p1 = cChild.QueryInterface(iParentOne);

9
js/src/xpconnect/tests/js/multiple-4.js
Просмотреть файл

@ -56,9 +56,12 @@ try {
iParentOne = Components.interfaces.nsIXPCTestParentOne;
iParentTwo = Components.interfaces.nsIXPCTestParentTwo;
cChild = Components.classes.xpcTestChild5.createInstance();
cParentOne = Components.classes.xpcTestParentOne.createInstance();
cParentTwo = Components.classes.xpcTestParentTwo.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/Child5;1";
cChild = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentOne;1";
cParentOne = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentTwo;1";
cParentTwo = Components.classes[CONTRACTID].createInstance();
c_c5 = cChild.QueryInterface(iChild);
c_p2 = cChild.QueryInterface(iParentTwo);

6
js/src/xpconnect/tests/js/multiple.js
Просмотреть файл

@ -50,8 +50,10 @@ try {
iChild = Components.interfaces.nsIXPCTestChild3;
iParentOne = Components.interfaces.nsIXPCTestParentOne;
cChild = Components.classes.xpcTestChild3.createInstance();
cParentOne = Components.classes.xpcTestParentOne.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/Child3;1";
cChild = Components.classes[CONTRACTID].createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ParentOne;1";
cParentOne = Components.classes[CONTRACTID].createInstance();
child = cChild.QueryInterface(iChild);
parentOne = cParentOne.QueryInterface(iParentOne);

3
js/src/xpconnect/tests/js/notscriptable.js
Просмотреть файл

@ -44,7 +44,8 @@ AddTestData();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestObjectReadWrite.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/ObjectReadWrite;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestObjectReadWrite;
testObject = CLASS.QueryInterface(IFACE);

1
js/src/xpconnect/tests/js/old/simpletest.js
Просмотреть файл

@ -1,4 +1,3 @@
print("Components.interfaces.nsIJSID = " +
Components.interfaces.nsIJSID);

19
js/src/xpconnect/tests/js/old/testxpc.js
Просмотреть файл

@ -403,25 +403,6 @@ try {
print("method with forward declared param test - failed");
}
/***************************************************************************/
// Components object test...
// print(".......................................");
// print("Components = "+Components);
// print("Components.interfaces = "+Components.interfaces);
// print("Components.interfaces.nsISupports = "+Components.interfaces.nsISupports);
// print("Components.interfaces.nsISupports.name = "+Components.interfaces.nsISupports.name);
// print("Components.interfaces.nsISupports.number = "+Components.interfaces.nsISupports.number);
//
// print("Components.interfaces.nsIEcho.number = "+Components.interfaces.nsIEcho.number);
// print("Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'] = "+Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}']);
// print("Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'].name = "+Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'].name);
//
// print("Components.classes = "+Components.classes);
// print("Components.classes.nsIID = "+Components.classes.nsIID);
// print("Components.classes.nsCID = "+Components.classes.nsCID);
// print("Components.classes.nsCID.name = "+Components.classes.nsCID.name);
/***************************************************************************/
print(".......................................");

2
js/src/xpconnect/tests/js/old/xpctest_array.js
Просмотреть файл

@ -1,5 +1,5 @@
var iface = Components.interfaces.nsIXPCTestArray;
var clazz = Components.classes.nsArrayTest;
var clazz = Components.classes["@mozilla.org/js/xpc/test/ArrayTest;1"];
var obj = clazz.createInstance(iface);

6
js/src/xpconnect/tests/js/old/xpctest_callcontext.js
Просмотреть файл

@ -36,9 +36,9 @@
function nsNativeEcho()
{
var obj = Components.classes.nsEcho.createInstance();
obj = obj.QueryInterface(Components.interfaces.nsIEcho);
return obj;
var clazz = Components.classes["@mozilla.org/js/xpc/test/Echo;1"];
var iface = Components.interfaces.nsIEcho;
return new clazz(iface);
}
var e = nsNativeEcho();

26
js/src/xpconnect/tests/js/old/xpctest_echo.js
Просмотреть файл

@ -36,9 +36,9 @@
function nsNativeEcho()
{
var obj = Components.classes.nsEcho.createInstance();
obj = obj.QueryInterface(Components.interfaces.nsIEcho);
return obj;
var clazz = Components.classes["@mozilla.org/js/xpc/test/Echo;1"];
var iface = Components.interfaces.nsIEcho;
return new clazz(iface);
}
var nsID = Components.ID;
@ -334,6 +334,7 @@ echo.SetReceiver(receiver3);
var all_ok = true;
try {
print("\nThe 'FailInJSTest' test is expected to throw an exception...\n");
echo.FailInJSTest(false);
}
catch(e) {
@ -367,25 +368,6 @@ all_ok = foo === bar;
print("service identity test - "+(all_ok ? "passed" : "failed"));
foo = bar = iface = clazz = null;
/***************************************************************************/
// Components object test...
// print(".......................................");
// print("Components = "+Components);
// print("Components.interfaces = "+Components.interfaces);
// print("Components.interfaces.nsISupports = "+Components.interfaces.nsISupports);
// print("Components.interfaces.nsISupports.name = "+Components.interfaces.nsISupports.name);
// print("Components.interfaces.nsISupports.number = "+Components.interfaces.nsISupports.number);
//
// print("Components.interfaces.nsIEcho.number = "+Components.interfaces.nsIEcho.number);
// print("Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'] = "+Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}']);
// print("Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'].name = "+Components.interfaces['{CD2F2F40-C5D9-11d2-9838-006008962422}'].name);
//
// print("Components.classes = "+Components.classes);
// print("Components.classes.nsIID = "+Components.classes.nsIID);
// print("Components.classes.nsCID = "+Components.classes.nsCID);
// print("Components.classes.nsCID.name = "+Components.classes.nsCID.name);
/***************************************************************************/
print(".......................................");

2
js/src/xpconnect/tests/js/old/xpctest_exceptions.js
Просмотреть файл

@ -20,7 +20,7 @@ function printExceptionDoubleData(e) {
}
}
var clazz = Components.classes.nsEcho;
var clazz = Components.classes["@mozilla.org/js/xpc/test/Echo;1"];
var iface = Components.interfaces.nsIEcho;
var nativeEcho = clazz.createInstance(iface);

14
js/src/xpconnect/tests/js/old/xpctest_ids.js
Просмотреть файл

@ -66,15 +66,17 @@ data = [
// now we check those the 'Components' knows about
[Components.interfaces.nsISupports , "nsISupports"],
[Components.classes.nsEcho , "@mozilla.org/js/xpc/test/Echo;1"],
[Components.classes.nsEcho.number , "{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"],
[Components.classes["@mozilla.org/js/xpc/test/Echo;1"]
, "@mozilla.org/js/xpc/test/Echo;1"],
[Components.classes["@mozilla.org/js/xpc/test/Echo;1"].number
, "{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"],
// now a bogus one
[Components.interfaces.bogus , "undefined"],
// even though these 'exist', they are not addressable by canonical name
[Components.interfaces["{00000000-0000-0000-c000-000000000046}"] , "undefined"],
[Components.classes.nsEcho["{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"], "undefined"],
[Components.classes["@mozilla.org/js/xpc/test/Echo;1"]["{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"], "undefined"],
// we *don't* expect bare CLSIDs to resolve to contractids
[NS_ECHO_UPPER , "{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"],
@ -96,10 +98,12 @@ data = [
// classesByID should not resolve the number to the contractid
[Components.classesByID["{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"].name, ""],
// ...though it is clearly the same object...
[Components.classesByID["{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"].equals(Components.classes.nsEcho), true],
[Components.classesByID["{ed132c20-eed1-11d2-baa4-00805f8a5dd7}"].equals(
Components.classes["@mozilla.org/js/xpc/test/Echo;1"]), true],
// equals self
[Components.classes.nsEcho.equals(Components.classes.nsEcho), true],
[Components.classes["@mozilla.org/js/xpc/test/Echo;1"].equals(
Components.classes["@mozilla.org/js/xpc/test/Echo;1"]), true],
// we could add tests for more of the ID properties here...

2
js/src/xpconnect/tests/js/old/xpctest_overloaded.js
Просмотреть файл

@ -1,4 +1,4 @@
var clazz = Components.classes.nsOverloaded;
var clazz = Components.classes["@mozilla.org/js/xpc/test/Overloaded;1"];
var iface = Components.interfaces.nsIXPCTestOverloaded;
foo = clazz.createInstance(iface);

3
js/src/xpconnect/tests/js/scriptable.js
Просмотреть файл

@ -44,7 +44,8 @@ AddTestData();
StopTest();
function SetupTest() {
CLASS = Components.classes.xpcTestScriptable.createInstance();
CONTRACTID = "@mozilla.org/js/xpc/test/Overloaded;1";
CLASS = Components.classes[CONTRACTID].createInstance();
IFACE = Components.interfaces.nsIXPCTestScriptable;
testObject = CLASS.QueryInterface(IFACE);