*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:
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -30,28 +32,29 @@ MODULE = BCTestLoader
|
||||
LIBRARY_NAME = $(MODULE)
|
||||
XPIDL_MODULE = $(MODULE)
|
||||
IS_COMPONENT = 1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
EXPORTS = \
|
||||
BCTest.h \
|
||||
ProceedResults.h \
|
||||
Values.h \
|
||||
VarContainer.h \
|
||||
VarContainer.h \
|
||||
PseudoHash.h \
|
||||
$(NULL)
|
||||
|
||||
|
||||
CPPSRCS = \
|
||||
BCTestLoader.cpp \
|
||||
BCTestLoaderFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
XPIDLSRCS = \
|
||||
BCITestLoader.idl \
|
||||
iClientTestComponent.idl \
|
||||
iJClientTestComponent.idl\
|
||||
iExclusionSupport.idl\
|
||||
$(NULL)
|
||||
JAVAI= iClientTestComponent.java \
|
||||
iJClientTestComponent.java \
|
||||
iExclusionSupport.java
|
||||
|
||||
DSO_LDOPTS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
@@ -59,28 +62,27 @@ DSO_LDOPTS += \
|
||||
|
||||
COMMON_JAVA = VarContainer.java
|
||||
|
||||
JDIRS = .
|
||||
JAVAC_PROG=$(JDKHOME)/bin/javac
|
||||
JAVAC_FLAGS=-classpath $(CLASSPATH):$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export::
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI) $(COMMON_JAVA)
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(COMMON_JAVA)
|
||||
|
||||
|
||||
#A little temporary hack with messenger
|
||||
install::
|
||||
cp -f start.html $(DIST)/bin/chrome/messenger/content/messenger
|
||||
|
||||
clobber-java:
|
||||
clobber::
|
||||
rm -f *.class *.jar
|
||||
clobber:: clobber-java
|
||||
rm -f $(DIST)/include/BCTest.h
|
||||
rm -f $(DIST)/include/ProceedResults.h
|
||||
rm -f $(DIST)/include/Values.h
|
||||
rm -f $(DIST)/include/VarContainer.h
|
||||
rm -f $(DIST)/include/PseudoHash.h
|
||||
rm -f $(DIST)/classes/VarContainer.class
|
||||
rm -f $(DIST)/classes/org/mozilla/xpcom/iClientTestComponent.class
|
||||
rm -f $(DIST)/classes/org/mozilla/xpcom/iJClientTestComponent.class
|
||||
rm -f $(DIST)/classes/org/mozilla/xpcom/iExclusionSupport.class
|
||||
|
||||
clobber-java:: clobber
|
||||
clobber_all:: clobber-java
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
#define char_last 'Z'
|
||||
#define wchar_first '0'
|
||||
#define wchar_last 'Z'
|
||||
#define string_first "iddqd"
|
||||
#define string_first NULL
|
||||
#define string_empty ""
|
||||
#define string_null "Here must be the NULL string"
|
||||
#define string_null "iddqd"
|
||||
#define string_last "112"
|
||||
|
||||
|
||||
@@ -36,12 +36,16 @@ public class VarContainer {
|
||||
public static int unsignedIntVar = 3000000;
|
||||
public static long unsignedLongVar = 1000001;
|
||||
public static float floatVar = (float)2.0;
|
||||
public static double doubleVar = 3.0;
|
||||
public static double doubleVar = (double)3.0;
|
||||
public static boolean booleanVar = true;
|
||||
public static char charTruncVar = 'A';
|
||||
public static char charVar = 'B';
|
||||
public static String charPVar = "This is some string";
|
||||
public static String charPVar2 = "";
|
||||
public static String charPVar3 = null;
|
||||
public static String unicharPVar = "UUUAAARRR";
|
||||
public static String unicharPVar2 = "";
|
||||
public static String unicharPVar3 = null;
|
||||
//end of compatibility section
|
||||
|
||||
public static byte endOfData = 112;
|
||||
@@ -84,8 +88,12 @@ public class VarContainer {
|
||||
public static char wcharLast = 'Z';
|
||||
public static String stringFirst = "iddqd";
|
||||
public static String stringEmpty = "";
|
||||
public static String stringNull = "Here must be the NULL string";
|
||||
public static String stringNull = null;
|
||||
public static String stringLast = "112";
|
||||
public static String wstringFirst = "iddqd";
|
||||
public static String wstringEmpty = "";
|
||||
public static String wstringNull = null;
|
||||
public static String wstringLast = "112";
|
||||
|
||||
//stacks
|
||||
public Stack byteStack = null;
|
||||
@@ -100,6 +108,7 @@ public Stack doubleStack = null;
|
||||
public Stack charStack = null;
|
||||
public Stack wcharStack = null;
|
||||
public Stack stringStack = null;
|
||||
public Stack wstringStack = null;
|
||||
//Constructor with stacks initialization
|
||||
public VarContainer() {
|
||||
byteStack = new Stack();
|
||||
@@ -154,6 +163,11 @@ public VarContainer() {
|
||||
stringStack.push(stringEmpty);
|
||||
stringStack.push(stringNull);
|
||||
stringStack.push(stringLast);
|
||||
wstringStack = new Stack();
|
||||
wstringStack.push(wstringFirst);
|
||||
wstringStack.push(wstringEmpty);
|
||||
wstringStack.push(wstringNull);
|
||||
wstringStack.push(wstringLast);
|
||||
|
||||
}
|
||||
|
||||
@@ -248,6 +262,14 @@ public String getNextString() {
|
||||
}
|
||||
}
|
||||
|
||||
public String getNextWString() {
|
||||
try {
|
||||
return (String)wstringStack.pop();
|
||||
}catch(EmptyStackException e) {
|
||||
return wstringLast;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=..\..\..\..\..\..
|
||||
MODULE=BCTestLoader
|
||||
@@ -25,11 +27,11 @@ MODULE=BCTestLoader
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
DLLNAME=$(MODULE)
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
JAVAI= iClientTestComponent.java \
|
||||
iJClientTestComponent.java \
|
||||
iExclusionSupport.java
|
||||
|
||||
COMMON_JAVA= VarContainer.java
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
XPIDLSRCS= .\BCITestLoader.idl \
|
||||
.\iClientTestComponent.idl \
|
||||
@@ -54,16 +56,16 @@ LINCS=\
|
||||
-I$(PUBLIC)\xpcom \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
JDIRS = .
|
||||
JAVAC_PROG=$(JDKHOME)\bin\javac
|
||||
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
|
||||
|
||||
javai:
|
||||
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes; -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
include <$(DEPTH)\config\javarules.mak>
|
||||
|
||||
#A little temporary hack with messenger
|
||||
install:: $(DLL) javai
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) start.html $(DIST)\bin\chrome\messenger\content\messenger
|
||||
$(MAKE_INSTALL) BCTest.h $(DIST)\..\include
|
||||
$(MAKE_INSTALL) ProceedResults.h $(DIST)\..\include
|
||||
$(MAKE_INSTALL) PseudoHash.h $(DIST)\..\include
|
||||
@@ -76,7 +78,4 @@ clobber::
|
||||
del /f $(DIST)\..\include\Values.h
|
||||
del /f $(DIST)\..\include\VarContainer.h
|
||||
del /f $(DIST)\..\include\PseudoHash.h
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iClientTestComponent.class
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iJClientTestComponent.class
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iExclusionSupport.class
|
||||
del /f $(DIST)\..\classes\VarContainer.class
|
||||
|
||||
Reference in New Issue
Block a user