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/J2XRET/Makefile.in
View File

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

12
mozilla/java/xpcom/test/basic/params/J2XRET/cpp/J2XRETServerTestComponent.cpp
View File

@@ -216,7 +216,7 @@ NS_IMETHODIMP J2XRETServerTestComponentImpl::TestBoolean(PRBool *i) {
return NS_OK;
}
/*
NS_IMETHODIMP J2XRETServerTestComponentImpl::TestChar(char *i) {
if(charVars.size()) {
*i = charVars.top();
@@ -241,7 +241,7 @@ NS_IMETHODIMP J2XRETServerTestComponentImpl::TestWChar(PRUnichar *i) {
}
return NS_OK;
}
*/
NS_IMETHODIMP J2XRETServerTestComponentImpl::TestString(char* *i) {
@@ -249,7 +249,9 @@ NS_IMETHODIMP J2XRETServerTestComponentImpl::TestString(char* *i) {
*i = stringVars.top();
stringVars.pop();
fBuffer = PR_sprintf_append(fBuffer,"%s\n",*i);
//fprintf(stderr,"\n==>%s\n",*i);
} else {
//fprintf(stderr,"\n==>FLASH\n");
*i="";
fBuffer = PR_sprintf_append(fBuffer,"%s",*i);
Flush("string");
@@ -285,7 +287,7 @@ char* _string="";
}
}
if (all==2) {
_string="null string";
_string=NULL;
nsCString* cstr=new nsCString(_string);
*i=cstr->ToNewUnicode();
nsString str = *(new nsString(*i));
@@ -335,7 +337,7 @@ NS_IMETHODIMP J2XRETServerTestComponentImpl::TestLongArray(PRUint32 count, int *
return NS_OK;
}
/*
NS_IMETHODIMP J2XRETServerTestComponentImpl::TestCharArray(PRUint32 count, char **valueArray) {
char* ret=(char*)PR_Malloc(sizeof(char)*3);
@@ -350,7 +352,7 @@ NS_IMETHODIMP J2XRETServerTestComponentImpl::TestCharArray(PRUint32 count, char
*valueArray=ret;
return NS_OK;
}
*/
NS_IMETHODIMP J2XRETServerTestComponentImpl::TestObject(iJ2XRETServerTestComponent **obj) {
*obj=this;

16
mozilla/java/xpcom/test/basic/params/J2XRET/cpp/Makefile.in
View File

@@ -25,9 +25,10 @@ DEPTH=../../../../../../..
topsrcdir = $(DEPTH)
srcdir = .
VPATH = .
JAVA_OR_NSJVM=1
NO_CAFE=1
include $(DEPTH)/config/autoconf.mk
include $(DEPTH)/config/config.mk
MODULE = J2XRETServerTestComponent
LIBRARY_NAME = $(MODULE)
@@ -50,11 +51,16 @@ CPPSRCS = \
$(NULL)
XPIDLSRCS = iJ2XRETServerTestComponent.idl
JAVAI = iJ2XRETServerTestComponent.java
#JAVAI = iJ2XRETServerTestComponent.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
#JAVAC=$(JDKHOME)/bin/javac -classpath $(DIST)/classes -d $(DIST)/classes
export::
$(JAVAC) $(JAVAI)
#export::
# $(JAVAC) $(JAVAI)

6
mozilla/java/xpcom/test/basic/params/J2XRET/cpp/iJ2XRETServerTestComponent.idl
View File

@@ -38,13 +38,13 @@ interface iJ2XRETServerTestComponent : nsISupports
float TestFloat();
double TestDouble();
boolean TestBoolean();
char TestChar();
wchar TestWChar();
// char TestChar();
// wchar TestWChar();
string TestString();
wstring TestWString();
void TestStringArray(in unsigned long count, [retval, array, size_is(count)] out string stringArray);
void TestLongArray(in unsigned long count, [retval, array, size_is(count)] out long intArray);
void TestCharArray(in unsigned long count,[retval, array, size_is(count)] out char charArray);
// void TestCharArray(in unsigned long count,[retval, array, size_is(count)] out char charArray);
iJ2XRETServerTestComponent TestObject();
void TestObj();
};

9
mozilla/java/xpcom/test/basic/params/J2XRET/cpp/iJ2XRETServerTestComponent.java
View File

@@ -56,12 +56,6 @@ public interface iJ2XRETServerTestComponent extends nsISupports
/* boolean TestBoolean (); */
public boolean testBoolean();
/* char TestChar (); */
public char testChar();
/* wchar TestWChar (); */
public char testWChar();
/* string TestString (); */
public String testString();
@@ -74,9 +68,6 @@ public interface iJ2XRETServerTestComponent extends nsISupports
/* void TestLongArray (in unsigned long count, [array, size_is (count), retval] out long intArray); */
public int[] testLongArray(int count);
/* void TestCharArray (in unsigned long count, [array, size_is (count), retval] out char charArray); */
public char[] testCharArray(int count);
/* iJ2XRETServerTestComponent TestObject (); */
public iJ2XRETServerTestComponent testObject();

20
mozilla/java/xpcom/test/basic/params/J2XRET/cpp/makefile.win
View File

@@ -28,30 +28,30 @@ DLLNAME = J2XRETServerTestComponent
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE = J2XRETServerTestComponent
COMPONENT = 1
JAVA_OR_NSJVM=1
NO_CAFE=1
include <$(DEPTH)\config\config.mak>
XPIDLSRCS = .\iJ2XRETServerTestComponent.idl
CPP_OBJS= \
.\$(OBJDIR)\J2XRETServerTestComponent.obj \
.\$(OBJDIR)\J2XRETServerTestComponentFactory.obj \
$(NULL)
LLIBS= $(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
XPIDLSRCS = .\iJ2XRETServerTestComponent.idl
JAVAI= iJ2XRETServerTestComponent.java
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include <$(DEPTH)\config\rules.mak>
JAVAC=$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes
include <$(DEPTH)\config\javarules.mak>
install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
clobber::
del /f $(DIST)\bin\components\$(DLLNAME).dll
del /f $(DIST)\bin\components\J2XRET*.xpt
export::
$(JAVAC) $(JAVAI)

28
mozilla/java/xpcom/test/basic/params/J2XRET/java/J2XRETClientTestComponent.java
View File

@@ -108,8 +108,12 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
System.err.println("Server is not initialized!!!");
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();
@@ -137,8 +141,8 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
testStringArray();
if(!exclusionHash.containsKey("longArray"))
testLongArray();
if(!exclusionHash.containsKey("charArray"))
testCharArray();
// if(!exclusionHash.containsKey("charArray"))
// testCharArray();
if(!exclusionHash.containsKey("object"))
testObject();
@@ -254,17 +258,23 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
server.testBoolean();
}
private void testString() {
s = new StringBuffer();
String stringVar ="8";
stringVar=server.testString();
try{
while(!stringVar.equals("112")) {
s.append(stringVar+"\n");
stringVar=server.testString();
}
}catch(Exception e) {
s.append(stringVar+"\n");
}
printResult(s.toString(),"j2x.ret.client.string");
server.testString();
server.flush("string");
}
private void testWString() {
@@ -288,7 +298,7 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
s.append(intAVar[i]+"\n");
printResult(s.toString(),"j2x.ret.client.longArray");
}
/*
private void testCharArray() {
s = new StringBuffer();
char[] charAVar = {'0','0','0'};
@@ -298,7 +308,7 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
s.append(charAVar[i]+"\n");
printResult(s.toString(),"j2x.ret.client.charArray");
}
*/
private void testStringArray() {
s = new StringBuffer();
String[] stringAVar = {"0","0","0"};
@@ -320,7 +330,7 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
}
printResult("!!!Right string!!!","j2x.ret.client.object");
}
/*
private void testWChar() {
s = new StringBuffer();
char wcharVar = '8';
@@ -342,7 +352,7 @@ public class J2XRETClientTestComponent implements iJ2XRETClientTestComponent, iC
}
printResult(s.toString(),"j2x.ret.client.char");
}
*/
public Object queryInterface(IID iid) {
System.out.println("DEbug:avm:J2XRETClientTestComponent::queryInterface iid="+iid);
if ( iid.equals(nsISupports.IID)

21
mozilla/java/xpcom/test/basic/params/J2XRET/java/Makefile.in
View File

@@ -31,22 +31,26 @@ JAVA_OR_NSJVM=1
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
JAVA_SRC = \
J2XRETClientTestComponent.java
JAVAI_SRC = \
iJ2XRETClientTestComponent.java
J2XRETClientTestComponent.jar.comp: manifest javai J2XRETClientTestComponent.class
#JAVAI_SRC = \
# iJ2XRETClientTestComponent.java
J2XRETClientTestComponent.jar.comp: manifest J2XRETClientTestComponent.class
$(JDKHOME)/bin/jar cvfm J2XRETClientTestComponent.jar.comp manifest *.class
J2XRETClientTestComponent.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)
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
install-component: J2XRETClientTestComponent.jar.comp J2XRETClientTestComponent.jar.info
cp -f J2XRETClientTestComponent.jar* $(DIST)/bin/components
@@ -55,3 +59,4 @@ clobber::
rm -f $(DIST)/bin/components/J2XRETClientTestComponent.jar.*
clobber_all:: clobber
install:: install-component
rm -f $(DIST)/../classes/J2XRETClientTestComponent.class

23
mozilla/java/xpcom/test/basic/params/J2XRET/java/makefile.win
View File

@@ -29,18 +29,25 @@ VPATH = .
MAKE_OBJ_TYPE=DLL
MODULE=J2XRETClientTestComponent
COMPONENT=1
JAVA_OR_NSJVM=1
NO_CAFE=1
include <$(DEPTH)\config\config.mak>
XPIDLSRCS = \
.\iJ2XRETClientTestComponent.idl \
$(NULL)
JAVA_SRC = \
J2XRETClientTestComponent.java
J2XRETClientTestComponent.java \
$(NULL)
JAVAI_SRC = \
iJ2XRETClientTestComponent.java
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>
J2XRETClientTestComponent.jar.comp: manifest J2XRETClientTestComponent.class
$(JDKHOME)\bin\jar cvfm J2XRETClientTestComponent.jar.comp manifest *.class
@@ -48,17 +55,13 @@ J2XRETClientTestComponent.jar.comp: manifest J2XRETClientTestComponent.class
J2XRETClientTestComponent.class:
$(JDKHOME)\bin\javac -classpath $(DEPTH)/dist/classes $(JAVA_SRC)
javai:
echo $(JDKHOME)\bin\javac -classpath $(CLASSPATH);$(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI_SRC)
$(JDKHOME)\bin\javac -classpath $(CLASSPATH);$(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI_SRC)
install-component: javai J2XRETClientTestComponent.jar.comp J2XRETClientTestComponent.jar.info $(DLL)
install-component: J2XRETClientTestComponent.jar.comp J2XRETClientTestComponent.jar.info $(DLL)
copy J2XRETClientTestComponent.jar* $(DIST)\bin\components
clobber::
-del /f *.class *.jar.comp
-del /f $(DIST)\bin\components\J2XRETClientTestComponent.jar.*
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XRETServerTestComponent.*
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XRETClientTestComponent.*
clobber_all:: clobber
install:: install-component
-del /f $(DIST)\..\classes\J2XRETClientTestComponent.class

4
mozilla/java/xpcom/test/basic/params/J2XRET/makefile.win
View File

@@ -24,8 +24,8 @@
DEPTH = ..\..\..\..\..\..
DIRS= \
java \
cpp \
cpp \
java \
$(NULL)
include <$(DEPTH)\config\rules.mak>