*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

@@ -37,7 +37,7 @@ char* testLocation=NULL;
char* logLocation=NULL;
char* fBuffer=NULL;
PRUint8 end_of_data = 112;
int all=0;
J2XOUTServerTestComponentImpl::J2XOUTServerTestComponentImpl()
{
@@ -277,18 +277,19 @@ NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestBoolean(PRBool *i) {
}
/*
NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestChar(char *i) {
fBuffer = PR_sprintf_append(fBuffer,"%c\n",i);
*i='Z';
fBuffer = PR_sprintf_append(fBuffer,"%c\n",*i);
return NS_OK;
}
NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestWChar(PRUnichar *i) {
fBuffer = PR_sprintf_append(fBuffer,"%d\n",i);
*i='Z';
fBuffer = PR_sprintf_append(fBuffer,"%c\n",*i);
return NS_OK;
}
*/
/**
@@ -297,10 +298,21 @@ NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestWChar(PRUnichar *i) {
*/
NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestString(char **i) {
char* str = "Some string";
PrintResult("j2x.out.server.string",str);
*i = PL_strdup(str);
if(stringVars.size()) {
*i = stringVars.top();
stringVars.pop();
//fprintf(stderr,"C++==>%s\n",*i);
fBuffer = PR_sprintf_append(fBuffer,"%s\n",*i);
} else {
*i = "112";
}
return NS_OK;
// char* str = "Some string";
// PrintResult("j2x.out.server.string",fbuffer);
// *i = PL_strdup(str);
// return NS_OK;
}
/**
@@ -310,19 +322,32 @@ NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestString(char **i) {
*/
NS_IMETHODIMP J2XOUTServerTestComponentImpl::TestWString(PRUnichar **i) {
//Verification code.
if(all==0) {
char* str = "Some test string";
nsCString* cStr = new nsCString(str);
*i = cStr->ToNewUnicode();
//Verification code.
nsString nsStr = *(new nsString(*i));
NS_ALLOC_STR_BUF(aBuf,nsStr,100)
printf("aBuf is %s",aBuf);
PrintResult("j2x.out.server.wstring",aBuf);
NS_FREE_STR_BUF(aBuf)
nsString nsStr = *(new nsString(*i));
NS_ALLOC_STR_BUF(aBuf,nsStr,100);
fBuffer = PR_sprintf_append(fBuffer,"%s\n",aBuf);
NS_FREE_STR_BUF(aBuf);
}
if(all==1) {
char* str = NULL;
nsCString* cStr = new nsCString(str);
*i = cStr->ToNewUnicode();
nsString nsStr = *(new nsString(*i));
NS_ALLOC_STR_BUF(aBuf,nsStr,100);
fBuffer = PR_sprintf_append(fBuffer,"%s\n",aBuf);
NS_FREE_STR_BUF(aBuf);
}
// if(all==2) Flush("wstring");
all++;
return NS_OK;
//
PrintResult("j2x.out.server.wstring",str);
return NS_OK;
// PrintResult("j2x.out.server.wstring",str);
// return NS_OK;
}
/**

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 = J2XOUTServerTestComponent
LIBRARY_NAME = $(MODULE)
@@ -50,11 +51,16 @@ CPPSRCS = \
$(NULL)
XPIDLSRCS = iJ2XOUTServerTestComponent.idl
JAVAI = iJ2XOUTServerTestComponent.java
#JAVAI = iJ2XOUTServerTestComponent.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)

View File

@@ -38,8 +38,8 @@ interface iJ2XOUTServerTestComponent : nsISupports
void TestFloat(out float i);
void TestDouble(out double i);
void TestBoolean(out boolean i);
// void TestChar(out char i);
//void TestWChar(out wchar i);
void TestChar(out char i);
void TestWChar(out wchar i);
void TestString(out string i);
void TestWString(out wstring i);
void TestStringArray(in unsigned long count,[array, size_is(count)] out string valueArray);

View File

@@ -56,6 +56,12 @@ public interface iJ2XOUTServerTestComponent extends nsISupports
/* void TestBoolean (out boolean i); */
public void testBoolean(boolean[] i);
/* void TestChar (out char i); */
public void testChar(char[] i);
/* void TestWChar (out wchar i); */
public void testWChar(char[] i);
/* void TestString (out string i); */
public void testString(String[] i);

View File

@@ -28,7 +28,11 @@ DLLNAME = J2XOUTServerTestComponent
DLL=.\$(OBJDIR)\$(DLLNAME).dll
MODULE = J2XOUTServerTestComponent
COMPONENT = 1
JAVAI= iJ2XOUTServerTestComponent.java
JAVA_OR_NSJVM=1
NO_CAFE=1
include <$(DEPTH)\config\config.mak>
XPIDLSRCS = \
.\iJ2XOUTServerTestComponent.idl \
@@ -39,22 +43,17 @@ CPP_OBJS= \
.\$(OBJDIR)\J2XOUTServerTestComponentFactory.obj \
$(NULL)
LLIBS= $(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
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 $(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\J2XOUT*.xpt
export::
$(JAVAC) $(JAVAI)