*not part of the buld*

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

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)

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

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