*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:
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user