Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*not part of the buld*

Browse Source 
blackConnect tests update


git-svn-id: svn://10.0.0.236/trunk@99925 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-07-25 22:05:35 +00:00
parent ad651ef17b
commit 4e0a322dbc
92 changed files with 1360 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/java/xpcom/test/basic/params/J2XIN/Makefile.in
View File

@@ -28,8 +28,8 @@ VPATH = .
DIRS= \
java \
cpp \
cpp \
java \
$(NULL)
include $(DEPTH)/config/rules.mk

14
mozilla/java/xpcom/test/basic/params/J2XIN/cpp/J2XINServerTestComponent.cpp
View File

@@ -174,8 +174,8 @@ NS_IMETHODIMP J2XINServerTestComponentImpl::TestChar(char i) {
NS_IMETHODIMP J2XINServerTestComponentImpl::TestWChar(PRUnichar i) {
fBuffer = PR_sprintf_append(fBuffer,"%d\n",i);
return NS_OK;
}
*/
} */
/* void TestString (in string i); */
NS_IMETHODIMP J2XINServerTestComponentImpl::TestString(const char *i) {
fBuffer = PR_sprintf_append(fBuffer,"%s\n",i);
@@ -203,16 +203,16 @@ NS_IMETHODIMP J2XINServerTestComponentImpl::TestLongArray(PRUint32 count, PRInt3
}
/* void TestCharArray (in unsigned long count, [array, size_is (count)] in char valueArray); */
NS_IMETHODIMP J2XINServerTestComponentImpl::TestCharArray(PRUint32 count, char *valueArray) {
/*NS_IMETHODIMP J2XINServerTestComponentImpl::TestCharArray(PRUint32 count, char *valueArray) {
return PrintResultArray("j2x.in.server.charArray",count,valueArray);;
}
} */
/* void TestMixed (in boolean bBool, in char cChar, in octet nByte, in short nShort, in unsigned short nUShort, in long nLong, in unsigned long nULong, in long long nHyper, in unsigned long long nUHyper, in float fFloat, in double fDouble, in string aString, in unsigned long count, [array, size_is (count)] in long longArray); */
NS_IMETHODIMP J2XINServerTestComponentImpl::TestMixed(PRBool bBool,/* char cChar,*/ PRUint8 nByte, PRInt16 nShort, PRUint16 nUShort, PRInt32 nLong, PRUint32 nULong, PRInt64 nHyper, PRUint64 nUHyper, float fFloat, double fDouble, const char *aString, PRUint32 count, PRInt32 *longArray) {
/*
NS_IMETHODIMP J2XINServerTestComponentImpl::TestMixed(PRBool bBool, char cChar, PRUint8 nByte, PRInt16 nShort, PRUint16 nUShort, PRInt32 nLong, PRUint32 nULong, PRInt64 nHyper, PRUint64 nUHyper, float fFloat, double fDouble, const char *aString, PRUint32 count, PRInt32 *longArray) {
char cChar = '0';
return PrintResultMixed("j2x.in.server.mixed",(PRBool)bBool,(char)cChar,(PRUint8)nByte,(PRInt16)nShort, (PRUint16)nUShort, (PRInt32)nLong, (PRUint32)nULong, (PRInt64)nHyper, (PRUint64)nUHyper, (float)fFloat, (double)fDouble, (char*)aString, (PRUint32)count, (PRInt32*)longArray);
}
} */
/* void TestObject (in iJ2XINServerTestComponent obj); */
NS_IMETHODIMP J2XINServerTestComponentImpl::TestObject(iJ2XINServerTestComponent *obj) {

17
mozilla/java/xpcom/test/basic/params/J2XIN/cpp/Makefile.in
View File

@@ -25,19 +25,16 @@ DEPTH=../../../../../../..
topsrcdir = $(DEPTH)
srcdir = .
VPATH = .
JAVA_OR_NSJVM=1
NO_CAFE=1
include $(DEPTH)/config/autoconf.mk
include $(DEPTH)/config/config.mk
MODULE = J2XINServerTestComponent
LIBRARY_NAME = $(MODULE)
XPIDL_MODULE = $(MODULE)
IS_COMPONENT = 1
#It is not right !
#DSO_LDOPTS += -L$(DIST)/lib \
# -lnspr4 \
# $(NULL)
DSO_LDOPTS += \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
@@ -48,13 +45,13 @@ CPPSRCS = \
J2XINServerTestComponent.cpp \
J2XINServerTestComponentFactory.cpp \
$(NULL)
XPIDLSRCS = iJ2XINServerTestComponent.idl
JAVAI = iJ2XINServerTestComponent.java
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include $(topsrcdir)/config/rules.mk
include $(DEPTH)/config/config.mk
JAVAC=$(JDKHOME)/bin/javac -classpath $(DIST)/classes -d $(DIST)/classes
export::
$(JAVAC) $(JAVAI)

18
mozilla/java/xpcom/test/basic/params/J2XIN/cpp/iJ2XINServerTestComponent.idl
View File

@@ -39,19 +39,19 @@ interface iJ2XINServerTestComponent : nsISupports
void TestDouble(in double i);
void TestBoolean(in boolean i);
// void TestChar(in char i);
//void TestWChar(in wchar i);
// void TestWChar(in wchar i);
void TestString(in string i);
void TestWString(in wstring i);
void TestStringArray(in unsigned long count,[array, size_is(count)] in string valueArray);
void TestLongArray(in unsigned long count, [array, size_is(count)] in long longArray);
void TestCharArray(in unsigned long count,[array, size_is(count)] in char valueArray);
void TestMixed(in boolean bBool,/*in char cChar*,*/ in octet nByte,
in short nShort, in unsigned short nUShort,
in long nLong, in unsigned long nULong,
in long long nHyper, in unsigned long long nUHyper,
in float fFloat, in double fDouble,
in string aString,
in unsigned long count, [array, size_is(count)] in long longArray);
// void TestCharArray(in unsigned long count,[array, size_is(count)] in char valueArray);
// void TestMixed(in boolean bBool,/*in char cChar*,*/ in octet nByte,
// in short nShort, in unsigned short nUShort,
// in long nLong, in unsigned long nULong,
// in long long nHyper, in unsigned long long nUHyper,
// in float fFloat, in double fDouble,
// in string aString,
// in unsigned long count, [array, size_is(count)] in long longArray);
void TestObject(in iJ2XINServerTestComponent obj);
string GetTestObjectString();
void TestIID(in nsIIDRef iid);

6
mozilla/java/xpcom/test/basic/params/J2XIN/cpp/iJ2XINServerTestComponent.java
View File

@@ -68,12 +68,6 @@ public interface iJ2XINServerTestComponent extends nsISupports
/* void TestLongArray (in unsigned long count, [array, size_is (count)] in long longArray); */
public void testLongArray(int count, int[] longArray);
/* void TestCharArray (in unsigned long count, [array, size_is (count)] in char valueArray); */
public void testCharArray(int count, char[] valueArray);
/* void TestMixed (in boolean bBool, in octet nByte, in short nShort, in unsigned short nUShort, in long nLong, in unsigned long nULong, in long long nHyper, in unsigned long long nUHyper, in float fFloat, in double fDouble, in string aString, in unsigned long count, [array, size_is (count)] in long longArray); */
public void testMixed(boolean bBool, byte nByte, short nShort, short nUShort, int nLong, int nULong, long nHyper, long nUHyper, float fFloat, double fDouble, String aString, int count, int[] longArray);
/* void TestObject (in iJ2XINServerTestComponent obj); */
public void testObject(iJ2XINServerTestComponent obj);

11
mozilla/java/xpcom/test/basic/params/J2XIN/cpp/makefile.win
View File

@@ -43,19 +43,18 @@ CPP_OBJS= \
.\$(OBJDIR)\J2XINServerTestComponentFactory.obj \
$(NULL)
LLIBS= $(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include <$(DEPTH)\config\rules.mak>
include <$(DEPTH)\config\javarules.mak>
iJ2XINServerTestComponent.class : iJ2XINServerTestComponent.java
$(JAVAC_PROG) $(JAVAC_FLAGS) iJ2XINServerTestComponent.java
install:: $(DLL) iJ2XINServerTestComponent.class
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
clobber::
del /f $(DIST)\bin\components\$(DLLNAME).dll
del /f $(DIST)\bin\components\J2XIN*.xpt
del /f $(DIST)\bin\components\J2XINC*.xpt
del /f $(DIST)\bin\components\J2XINS*.xpt

63
mozilla/java/xpcom/test/basic/params/J2XIN/java/J2XINClientTestComponent.java
View File

@@ -27,8 +27,7 @@ import java.io.DataOutputStream;
import java.io.FileOutputStream;
import java.util.Hashtable;
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent,
iExclusionSupport {
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent, iExclusionSupport {
private iJ2XINServerTestComponent server = null;
private VarContainer varContainer = null;
private String testLocation = null;
@@ -105,7 +104,11 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
return;
}
if(!exclusionHash.containsKey("short"))
/* if(!exclusionHash.containsKey("char"))
testChar();
if(!exclusionHash.containsKey("wchar"))
testWChar();
*/ if(!exclusionHash.containsKey("short"))
testShort();
if(!exclusionHash.containsKey("long"))
testLong();
@@ -133,12 +136,12 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
testStringArray();
if(!exclusionHash.containsKey("longArray"))
testLongArray();
if(!exclusionHash.containsKey("charArray"))
testCharArray();
// if(!exclusionHash.containsKey("charArray"))
// testCharArray();
if(!exclusionHash.containsKey("object"))
testObject();
if(!exclusionHash.containsKey("mixed"))
testMixed();
// if(!exclusionHash.containsKey("mixed"))
// testMixed();
if(!exclusionHash.containsKey("iid"))
testIID();
if(!exclusionHash.containsKey("cid"))
@@ -264,23 +267,45 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
printResult("true\nfalse","j2x.in.client.boolean");
server.flush("boolean");
}
// private void testChar() {
/*
private void testChar() {
// server.testChar('S');
// server.testWChar(VarContainer.charVar);
// printResult("S","j2x.in.client.char");
// server.flush("char");
// }
server.testChar(VarContainer.charVar);
printResult((new Character(VarContainer.charVar)).toString(),"j2x.in.client.char");
server.flush("char");
}
private void testWChar() {
// server.testWChar('S');
server.testWChar(VarContainer.charVar);
printResult((new Character(VarContainer.charVar)).toString(),"j2x.in.client.wchar");
server.flush("wchar");
}
*/
private void testString() {
printResult(VarContainer.charPVar,"j2x.in.client.string");
buf = new StringBuffer("");
buf.append(VarContainer.charPVar+"\n");
server.testString(VarContainer.charPVar);
buf.append(VarContainer.charPVar2+"\n");
server.testString(VarContainer.charPVar2);
buf.append(VarContainer.charPVar3+"\n");
server.testString(VarContainer.charPVar3);
printResult(buf.toString(),"j2x.in.client.string");
server.flush("string");
}
private void testWString() {
printResult(VarContainer.unicharPVar,"j2x.in.client.wstring");
buf = new StringBuffer("");
buf.append(VarContainer.unicharPVar+"\n");
server.testWString(VarContainer.unicharPVar);
buf.append(VarContainer.unicharPVar2+"\n");
server.testWString(VarContainer.unicharPVar2);
buf.append(VarContainer.unicharPVar3+"\n");
server.testWString(VarContainer.unicharPVar3);
printResult(buf.toString(),"j2x.in.client.wstring");
server.flush("wstring");
}
@@ -304,7 +329,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
printResult(s.toString(),"j2x.in.client.longArray");
server.testLongArray(intArray.length, intArray);
}
/*
private void testCharArray() {
char[] charArray = {'A','B','c','L','ï','u','Ô','p'};
s = new StringBuffer();
@@ -349,7 +374,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
printResult(s.toString(),"j2x.in.client.mixed");
server.testMixed(bBool, nByte, nShort, nUShort,nLong,nULong, nHyper, nUHyper, fFloat,fDouble, aString, intArray.length, intArray);
}
*/
private void testObject() {
printResult(server.getTestObjectString(),"j2x.in.client.object");
server.testObject(server);
@@ -358,7 +383,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
private void testIID() {
buf = new StringBuffer("");
IID iid=new IID("cc7480e0-3a37-11d5-b653-005004552ed1");
buf.append(iid + "\n");
buf.append(iid.getString() + "\n");
server.testIID(iid);
printResult(buf.toString(),"j2x.in.client.iid");
@@ -368,7 +393,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
private void testCID() {
buf = new StringBuffer("");
CID cid=new CID("cc7480e0-3a37-11d5-b653-005004552ed1");
buf.append(cid + "\n");
buf.append(cid.getString() + "\n");
server.testCID(cid);
printResult(buf.toString(),"j2x.in.client.cid");

25
mozilla/java/xpcom/test/basic/params/J2XIN/java/Makefile.in
View File

@@ -30,28 +30,35 @@ JAVA_OR_NSJVM=1
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
JAVA_SRC = \
J2XINClientTestComponent.java
JAVAI_SRC = \
iJ2XINClientTestComponent.java
J2XINClientTestComponent.jar.comp: manifest javai J2XINClientTestComponent.class
#JAVAI_SRC = \
# iJ2XINClientTestComponent.java
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/config.mk
J2XINClientTestComponent.jar.comp: manifest J2XINClientTestComponent.class
$(JDKHOME)/bin/jar cvfm J2XINClientTestComponent.jar.comp manifest *.class
J2XINClientTestComponent.class:
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes $(JAVA_SRC)
javai::
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI_SRC)
#javai::
# $(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI_SRC)
install-component: J2XINClientTestComponent.jar.comp J2XINClientTestComponent.jar.info
cp -f J2XINClientTestComponent.jar* $(DIST)/bin/components
clobber::
rm -f *.class *.jar.comp
rm -f $(DIST)/bin/components/J2XINClientTestComponent.jar.*
clobber_all:: clobber
install:: install-component
rm -f $(DIST)/../classes/J2XINClientTestComponent.class

16
mozilla/java/xpcom/test/basic/params/J2XIN/java/makefile.win
View File

@@ -38,13 +38,19 @@ XPIDLSRCS = \
.\iJ2XINClientTestComponent.idl \
$(NULL)
JAVA_SRC = \
J2XINClientTestComponent.java\
$(NULL)
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include <$(DEPTH)\config\rules.mak>
include <$(DEPTH)\config\javarules.mak>
J2XINClientTestComponent.class: J2XINClientTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iJ2XINClientTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes J2XINClientTestComponent.java
J2XINClientTestComponent.class:
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes $(JAVA_SRC)
J2XINClientTestComponent.jar.comp: manifest J2XINClientTestComponent.class
$(JDKHOME)\bin\jar cvfm J2XINClientTestComponent.jar.comp manifest *.class
@@ -55,9 +61,7 @@ install-component: J2XINClientTestComponent.jar.comp J2XINClientTestComponent.ja
clobber::
-del /f *.class *.jar.comp
-del /f $(DIST)\bin\components\J2XINClientTestComponent.jar.*
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINServerTestComponent.*
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINClientTestComponent.*
clobber_all:: clobber
install:: install-component
-del /f $(DIST)\..\classes\J2XINClientTestComponent.class