*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
@@ -1,2 +1,2 @@
|
||||
a3532005-66d4-4988-8067-dd1928c60138
|
||||
component://netscape/blackwood/blackconnect/test/mthreads/MThreadComponent1
|
||||
@mozilla/blackwood/blackconnect/test/mthreads/MThreadComponent1;1
|
||||
|
||||
@@ -29,48 +29,102 @@ import java.io.FileOutputStream;
|
||||
|
||||
public class MThreadComponent1 implements iMThreadComponent1, iMThreadComponent {
|
||||
private iMThreadContext context = null;
|
||||
private nsIComponentManager com=null;
|
||||
private int thr=0;
|
||||
private int stg=0;
|
||||
|
||||
public MThreadComponent1() {
|
||||
System.out.println("DEbug:avm:MThreadComponent1 constructor");
|
||||
}
|
||||
|
||||
|
||||
public void initialize(iMThreadContext context) {
|
||||
System.out.println("DEbug:avm:MThreadComponent1:initialize Thread is " + Thread.currentThread().getName());
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
public void tHack(nsIComponentManager cm) {
|
||||
nsIFactory factory = null;
|
||||
System.out.println("DEbug:avm:tHack");
|
||||
if(cm == null) {
|
||||
System.err.println("DEbug:avm:tHack:ComponentManager is NULL!!!!!");
|
||||
return;
|
||||
}
|
||||
com=cm;
|
||||
factory = cm.findFactory(iMThreadContextCID);
|
||||
|
||||
if(factory == null) {
|
||||
System.err.println("DEbug:avm:tHack:Factory is NULL!!!!!");
|
||||
return;
|
||||
}
|
||||
|
||||
Object res = factory.createInstance(null, iMThreadContext.IID);
|
||||
if(res == null) {
|
||||
System.err.println("DEbug:avm:tHack:Instance is NULL!!!!!");
|
||||
return;
|
||||
}
|
||||
context = (iMThreadContext)res;
|
||||
if(context == null) {
|
||||
System.err.println("Create instance failed!! Server is NULLLLLLLLLLLLLLLLLLL");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public iMThreadComponent loadComponent(CID classID) {
|
||||
System.out.println("DEbug:avm:MThreadComponent1:loadComponent");
|
||||
nsIComponentManager cm = context.getComponentManager();
|
||||
|
||||
nsIFactory factory = cm.findFactory(classID);
|
||||
if(factory == null) {
|
||||
System.out.println("DEbug:avm:Factory is NULL!!!!!");
|
||||
System.err.println("DEbug:avm:loadComponent:Factory is NULL!!!!!");
|
||||
return null;
|
||||
}
|
||||
|
||||
iMThreadComponent component = (iMThreadComponent)factory.createInstance(null, iMThreadComponent.IID);
|
||||
return component;
|
||||
}
|
||||
|
||||
/* void Execute (); */
|
||||
public void execute(String tName) {
|
||||
|
||||
public void execute(int thread, int stage) {
|
||||
System.out.println("DEbug:avm:MThreadComponent1:execute.");
|
||||
String cThreadName = Thread.currentThread().getName();
|
||||
if(tName.equals(cThreadName)) {
|
||||
System.out.println("PASSED: original and expected names equals to " + tName);
|
||||
} else {
|
||||
System.out.println("FAILED: Current thread name is " + cThreadName + " instead of " + tName );
|
||||
}
|
||||
CID classID = new CID(context.getNext());
|
||||
iMThreadComponent component = loadComponent(classID);
|
||||
if(component == null) {
|
||||
System.out.println("Can't load component");
|
||||
return;
|
||||
}
|
||||
System.out.println("Initialize of " + component + " called in thread " + cThreadName);
|
||||
component.initialize(context);
|
||||
(new ExecutionThread(component)).run();
|
||||
//component.execute();
|
||||
|
||||
try{
|
||||
DataOutputStream f=new DataOutputStream(new FileOutputStream(context.getResFile(),true));
|
||||
f.writeBytes((new Integer(thread)).toString()+","+(new Integer(stage)).toString()+","+cThreadName+"\n");
|
||||
f.close();
|
||||
} catch(Exception e) {
|
||||
System.err.println("Exception during writing the file: " +e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
CID classID = new CID(context.getContractID(thread+1,stage+1));
|
||||
|
||||
if (!(classID.toString().equals("org.mozilla.xpcom.CID@null"))){
|
||||
iMThreadComponent component = loadComponent(classID);
|
||||
if(component == null) {
|
||||
System.err.println("Can't load component");
|
||||
} else {
|
||||
component.initialize(context);
|
||||
component.tHack(com);
|
||||
(new ExecutionThread(component)).run(thread+1,stage+1);
|
||||
}
|
||||
}
|
||||
|
||||
classID = new CID(context.getContractID(thread,stage+1));
|
||||
|
||||
if (!(classID.toString().equals("org.mozilla.xpcom.CID@null"))){
|
||||
iMThreadComponent component = loadComponent(classID);
|
||||
if(component == null) {
|
||||
System.err.println("Can't load component");
|
||||
} else {
|
||||
component.initialize(context);
|
||||
component.tHack(com);
|
||||
component.execute(thread,stage+1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public Object queryInterface(IID iid) {
|
||||
System.out.println("DEbug:avm:MThreadComponent1::queryInterface iid="+iid);
|
||||
if ( iid.equals(nsISupports.IID)
|
||||
@@ -81,13 +135,12 @@ public class MThreadComponent1 implements iMThreadComponent1, iMThreadComponent
|
||||
}
|
||||
}
|
||||
|
||||
static CID J2XINServerCID = new CID("1ddc5b10-9852-11d4-aa22-00a024a8bbac");
|
||||
static CID iMThreadContextCID = new CID("139b8350-280a-46d0-8afc-f1939173c2ea");
|
||||
static {
|
||||
try {
|
||||
Class nsIComponentManagerClass =
|
||||
Class.forName("org.mozilla.xpcom.nsIComponentManager");
|
||||
InterfaceRegistry.register(nsIComponentManagerClass);
|
||||
|
||||
Class iMThreadComponentClass =
|
||||
Class.forName("org.mozilla.xpcom.iMThreadComponent");
|
||||
InterfaceRegistry.register(iMThreadComponentClass);
|
||||
@@ -104,11 +157,3 @@ public class MThreadComponent1 implements iMThreadComponent1, iMThreadComponent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
|
||||
@@ -40,7 +40,7 @@ interface iMThreadComponent1 : nsISupports
|
||||
{0x80, 0x67, 0xdd, 0x19, 0x28, 0xc6, 0x01, 0x38} \
|
||||
}
|
||||
|
||||
#define MTHREADCOMPONENT1_PROGID "component://netscape/blackwood/blackconnect/test/mthreads/MThreadComponent1"
|
||||
#define MTHREADCOMPONENT1_PROGID "@mozilla/blackwood/blackconnect/test/mthreads/MThreadComponent1;1"
|
||||
|
||||
%}
|
||||
|
||||
|
||||
@@ -18,36 +18,41 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=..\..\..\..\..\..
|
||||
topsrcdir = $(DEPTH)
|
||||
srcdir = .
|
||||
VPATH = .
|
||||
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(topsrcdir)\config\rules.mak>
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
JAVA_SRC = \
|
||||
MThreadComponent1.java
|
||||
MThreadComponent1.java \
|
||||
$(NULL)
|
||||
|
||||
JDIRS = .
|
||||
JAVAC_PROG=$(JDKHOME)\bin\javac
|
||||
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
|
||||
|
||||
include <$(topsrcdir)\config\rules.mak>
|
||||
include <$(topsrcdir)\config\javarules.mak>
|
||||
|
||||
JAVAI_SRC = \
|
||||
iMThreadComponent1.java
|
||||
MThreadComponent1.jar.comp: manifest MThreadComponent1.class
|
||||
$(JDKHOME)\bin\jar cvfm MThreadComponent1.jar.comp manifest *.class
|
||||
|
||||
MThreadComponent1.class:
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes $(JAVA_SRC)
|
||||
|
||||
export::
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI_SRC)
|
||||
|
||||
install-component: MThreadComponent1.jar.comp MThreadComponent1.jar.info
|
||||
copy MThreadComponent1.jar* $(DIST)\bin\components
|
||||
clobber::
|
||||
del /f *.class *.jar.comp
|
||||
del /f $(DIST)\bin\components\MThreadComponent1.jar.*
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iMThreadComponent1.class
|
||||
del /f $(DIST)\..\classes\MThreadComponent1.class
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
*/
|
||||
|
||||
#include "plstr.h"
|
||||
#include "prmem.h"
|
||||
#include "stdio.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "MThreadComponent2.h"
|
||||
@@ -31,10 +32,25 @@
|
||||
#include <stdlib.h>
|
||||
#include "nsID.h"
|
||||
|
||||
iMThreadContext* context;
|
||||
void* iThread;
|
||||
void* eThread;
|
||||
|
||||
iMThreadContext* context=NULL;
|
||||
iMThreadComponent* tComponent=NULL;
|
||||
void* iThread=NULL;
|
||||
void* eThread=NULL;
|
||||
int newT=0, newS=0;
|
||||
|
||||
void Exec(void* arg) {
|
||||
tComponent->Initialize(context);
|
||||
nsIComponentManager* cm;
|
||||
nsresult rv = NS_GetGlobalComponentManager(&cm);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "ERROR: Can't get GlobalComponentManager!!\n");
|
||||
return;
|
||||
}
|
||||
tComponent->THack(cm);
|
||||
tComponent->Execute(newT,newS);
|
||||
}
|
||||
|
||||
MThreadComponent2Impl::MThreadComponent2Impl()
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
@@ -54,37 +70,77 @@ NS_IMETHODIMP MThreadComponent2Impl::Initialize(iMThreadContext* c){
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP MThreadComponent2Impl::Execute(const char* tName){
|
||||
printf("MThreadComponent2Impl::Execute. Thread is %s\n", tName);
|
||||
eThread = PR_GetCurrentThread();
|
||||
if(eThread == iThread) {
|
||||
printf("###Execute and initialize were executed in one thread\n");
|
||||
}else {
|
||||
printf("###Execute and initialize were executed in DIFFERENT threads\n");
|
||||
}
|
||||
char* progID;
|
||||
context->GetNext(&progID);
|
||||
nsCID classID;
|
||||
classID.Parse(progID);
|
||||
printf("MThreadComponent2Impl::Execute. progID is %s\n",progID);
|
||||
iMThreadComponent* tComponent;
|
||||
nsresult rv = nsComponentManager::CreateInstance(classID,
|
||||
nsnull,
|
||||
NS_GET_IID(iMThreadComponent),
|
||||
(void**)&tComponent);
|
||||
if(NS_FAILED(rv)) {
|
||||
printf("MThreadComponent2Impl:Create instance failed from %s!!!",classID.ToString());
|
||||
return rv;
|
||||
}
|
||||
tComponent->Initialize(context);
|
||||
tComponent->Execute(tName);
|
||||
|
||||
NS_IMETHODIMP MThreadComponent2Impl::THack(nsIComponentManager* cm){
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP MThreadComponent2Impl::Execute(int thread, int stage){
|
||||
|
||||
char* tmp=(char*)PR_Malloc(sizeof(char*));
|
||||
tmp="";
|
||||
FILE *file;
|
||||
|
||||
printf("MThreadComponent2Impl::Execute.\n");
|
||||
eThread = PR_GetCurrentThread();
|
||||
if(eThread == iThread) {
|
||||
printf("###Execute and initialize were executed in one thread\n");
|
||||
} else {
|
||||
printf("###Execute and initialize were executed in DIFFERENT threads\n");
|
||||
}
|
||||
|
||||
char* progID;
|
||||
char* res=(char*)PR_Malloc(sizeof(char*));
|
||||
|
||||
context->GetResFile(&res);
|
||||
|
||||
if ((file = fopen(res, "a+t")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",res);
|
||||
return NS_OK;
|
||||
}
|
||||
sprintf(tmp,"%d,%d,",thread,stage);
|
||||
fwrite(tmp,1,strlen(tmp),file);
|
||||
sprintf(tmp,"%d\n",eThread);
|
||||
fwrite(tmp,1,strlen(tmp),file);
|
||||
fclose(file);
|
||||
|
||||
context->GetContractID(thread,stage+1,&progID);
|
||||
nsCID classID;
|
||||
|
||||
classID.Parse(progID);
|
||||
nsresult rv = nsComponentManager::CreateInstance(classID,
|
||||
nsnull,
|
||||
NS_GET_IID(iMThreadComponent),
|
||||
(void**)&tComponent);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "MThreadComponent2Impl:Create instance failed from %s!!!\n",classID.ToString());
|
||||
} else {
|
||||
tComponent->Initialize(context);
|
||||
nsIComponentManager* cm;
|
||||
rv = NS_GetGlobalComponentManager(&cm);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "ERROR: Can't get GlobalComponentManager!!\n");
|
||||
return NS_OK;
|
||||
}
|
||||
tComponent->THack(cm);
|
||||
tComponent->Execute(thread,stage+1);
|
||||
}
|
||||
|
||||
|
||||
context->GetContractID(thread+1,stage+1,&progID);
|
||||
classID.Parse(progID);
|
||||
rv = nsComponentManager::CreateInstance(classID, nsnull,
|
||||
NS_GET_IID(iMThreadComponent),
|
||||
(void**)&tComponent);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "MThreadComponent2Impl: 2: Create instance failed from %s!!!\n",progID);
|
||||
} else {
|
||||
newT=thread+1;
|
||||
newS=stage+1;
|
||||
PR_CreateThread(PR_USER_THREAD, Exec,
|
||||
this, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
|
||||
PR_UNJOINABLE_THREAD, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_DECL_IMTHREADCOMPONENT2
|
||||
NS_DECL_IMTHREADCOMPONENT
|
||||
NS_DECL_IMTHREADCOMPONENT
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -29,18 +29,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(MThreadComponent2Impl)
|
||||
|
||||
static nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "X2JIN Client Test Component", MTHREADCOMPONENT2_CID, MTHREADCOMPONENT2_PROGID, MThreadComponent2ImplConstructor,
|
||||
{ "MultiThread Component 2", MTHREADCOMPONENT2_CID, MTHREADCOMPONENT2_PROGID, MThreadComponent2ImplConstructor,
|
||||
NULL /* NULL if you dont need one */,
|
||||
NULL /* NULL if you dont need one */
|
||||
}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE("MThreadComponent2Factory", components)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
|
||||
@@ -40,7 +40,7 @@ interface iMThreadComponent2 : nsISupports
|
||||
{0xb8, 0xdf, 0x4c, 0x28, 0xc0, 0x68, 0x68, 0x63} \
|
||||
}
|
||||
|
||||
#define MTHREADCOMPONENT2_PROGID "component://netscape/blackwood/blackconnect/test/mthreads/MThreadComponent2"
|
||||
#define MTHREADCOMPONENT2_PROGID "@mozilla/blackwood/blackconnect/test/mthreads/MThreadComponent2;1"
|
||||
|
||||
%}
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=..\..\..\..\..\..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -29,6 +31,10 @@ MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = $(MODULE)
|
||||
DLL =.\$(OBJDIR)\$(DLLNAME).dll
|
||||
COMPONENT = 1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
CPP_OBJS = \
|
||||
.\$(OBJDIR)\MThreadComponent2.obj \
|
||||
@@ -39,20 +45,19 @@ XPIDLSRCS = \
|
||||
.\iMThreadComponent2.idl \
|
||||
$(NULL)
|
||||
|
||||
JAVAI = iMThreadComponent2.java
|
||||
|
||||
LLIBS =$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
|
||||
|
||||
JDIRS = .
|
||||
JAVAC_PROG=$(JDKHOME)\bin\javac
|
||||
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
|
||||
|
||||
include <$(topsrcdir)\config\rules.mak>
|
||||
include <$(topsrcdir)\config\javarules.mak>
|
||||
|
||||
javai:
|
||||
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
|
||||
|
||||
install:: $(DLL) javai
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
|
||||
clobber::
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).xpt
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iMThreadComponent2.class
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -30,7 +32,6 @@ DIRS= \
|
||||
context \
|
||||
1 \
|
||||
2 \
|
||||
3 \
|
||||
$(NULL)
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
@@ -1,10 +1,26 @@
|
||||
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* ExecutionThread.java
|
||||
*/
|
||||
The contents of this file are subject to the Mozilla Public
|
||||
License Version 1.1 (the "License"); you may not use this file
|
||||
except in compliance with the License. You may obtain a copy of
|
||||
the License at http://www.mozilla.org/MPL/
|
||||
|
||||
Software distributed under the License is distributed on an "AS
|
||||
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
implied. See the License for the specific language governing
|
||||
rights and limitations under the License.
|
||||
|
||||
The Original Code is mozilla.org code.
|
||||
|
||||
The Initial Developer of the Original Code is Sun Microsystems,
|
||||
Inc. Portions created by Sun are
|
||||
Copyright (C) 1999 Sun Microsystems, Inc. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
Client QA Team, St. Petersburg, Russia
|
||||
*/
|
||||
|
||||
import org.mozilla.xpcom.*;
|
||||
import java.util.Date;
|
||||
|
||||
@@ -34,14 +50,13 @@ public class ExecutionThread extends Thread {
|
||||
public int timeoutGen() {
|
||||
return (int)Math.round(Math.random()*MAX_TIMEOUT);
|
||||
}
|
||||
public void run(){
|
||||
public void run(int t, int s){
|
||||
try {
|
||||
if(timeout == Integer.MAX_VALUE) {
|
||||
timeout = timeoutGen();
|
||||
}
|
||||
System.out.println("ExecutionThread(" + getName() + ") sleep to " + timeout);
|
||||
sleep(timeout);
|
||||
component.execute(getName());
|
||||
component.execute(t,s);
|
||||
} catch (Exception e) {
|
||||
System.out.println("Execution thread had been interrupted");
|
||||
}
|
||||
|
||||
@@ -30,16 +30,21 @@
|
||||
#include <stdlib.h>
|
||||
#include "MThreadContext.h"
|
||||
#include "prmem.h"
|
||||
|
||||
#include "nsString.h"
|
||||
#include "nsStringUtil.h"
|
||||
#include "nsID.h"
|
||||
#include "prio.h"
|
||||
#include "prprf.h"
|
||||
|
||||
nsIComponentManager* cm=NULL;
|
||||
char* resFile=(char*)PR_Malloc(sizeof(char*));
|
||||
char* inFile=(char*)PR_Malloc(sizeof(char*));
|
||||
char* outFile=(char*)PR_Malloc(sizeof(char*));
|
||||
|
||||
nsIComponentManager* cm;
|
||||
char **componentList;
|
||||
int currentPosition = 0;
|
||||
#define MT_COMPONENT_LIST_VAR_NAME "MT_COMPONENT_LIST"
|
||||
|
||||
|
||||
int threads=0, stages=0, nRead=0;
|
||||
|
||||
MThreadContextImpl::MThreadContextImpl()
|
||||
{
|
||||
@@ -48,8 +53,26 @@ MThreadContextImpl::MThreadContextImpl()
|
||||
nsresult rv = NS_GetGlobalComponentManager(&cm);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "ERROR: Can't get GlobalComponentManager!!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!makeParamFile()) printf("Something is going wrong :-(.\n");
|
||||
|
||||
char* cont=(char*)PR_Malloc(sizeof(char*));
|
||||
GetPath(PR_TRUE, &cont);
|
||||
|
||||
int j=0, k=0;
|
||||
PRBool isEnd=PR_FALSE;
|
||||
for(PRUint32 i=0;i<PL_strlen(cont);i++) {
|
||||
switch(cont[i]) {
|
||||
case 10: j++;stages=k;k=0;break;
|
||||
case 13: break;
|
||||
case '-': isEnd=PR_TRUE;break;
|
||||
default: k++;break;
|
||||
}
|
||||
threads=j;
|
||||
if (isEnd) break;
|
||||
}
|
||||
componentList = LoadComponentList();
|
||||
}
|
||||
|
||||
MThreadContextImpl::~MThreadContextImpl()
|
||||
@@ -59,123 +82,242 @@ MThreadContextImpl::~MThreadContextImpl()
|
||||
|
||||
NS_IMPL_ISUPPORTS1(MThreadContextImpl, iMThreadContext);
|
||||
|
||||
|
||||
NS_IMETHODIMP MThreadContextImpl::GetNext(char **_retstr) {
|
||||
nsCID aClass;
|
||||
if(componentList == NULL) {
|
||||
*_retstr = NULL;
|
||||
return NS_OK; //nb
|
||||
}
|
||||
if(componentList[currentPosition]) {
|
||||
*_retstr = componentList[currentPosition];
|
||||
printf("MThreadContextImpl::GetNext. ContractID = %s\n",*_retstr);
|
||||
nsresult rv = cm->ContractIDToClassID(*_retstr, &aClass);
|
||||
if(NS_FAILED(rv)) {
|
||||
printf("MThreadContextImpl::GetNext. Can't convert ContractID to ClassID\n");
|
||||
*_retstr = NULL;
|
||||
return NS_OK;
|
||||
}else {
|
||||
printf("MThreadContextImpl::GetNext. SUCCESS convert ContractID to ClassID\n");
|
||||
}
|
||||
*_retstr = aClass.ToString();
|
||||
printf("MThreadContextImpl::GetNext. ClassID = %s\n",*_retstr);
|
||||
currentPosition++;
|
||||
} else {
|
||||
*_retstr = NULL;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
/*
|
||||
NS_IMETHODIMP MThreadContextImpl::Initialize(const char* serverProgID)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
NS_IMETHODIMP MThreadContextImpl::GetStages(int *_retval) {
|
||||
*_retval=stages;
|
||||
return *_retval;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP MThreadContextImpl::Execute(){
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
NS_IMETHODIMP MThreadContextImpl::GetThreads(int *_retval) {
|
||||
*_retval=threads;
|
||||
return *_retval;
|
||||
}
|
||||
*/
|
||||
|
||||
NS_IMETHODIMP MThreadContextImpl::GetResFile(char **_retval) {
|
||||
*_retval=resFile;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP MThreadContextImpl::GetContractID(int i, int j, char **_retstr) {
|
||||
|
||||
nsCID aClass;
|
||||
int stg=0, thr=0;
|
||||
char* tmp=NULL;
|
||||
char* tmp2=NULL;
|
||||
char* first=NULL;
|
||||
char* tokens[256];
|
||||
char* id[256];
|
||||
|
||||
GetStages(&stg);
|
||||
|
||||
if((i<0)||(i>stg)) {
|
||||
fprintf(stderr, "\nComponent index is out of array bounds!!!\n");
|
||||
*_retstr="NULL";
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
char* cont=(char*)PR_Malloc(sizeof(char*));
|
||||
GetPath(PR_FALSE, &cont);
|
||||
GetThreads(&thr);
|
||||
char** paths=(char**)PR_Malloc(sizeof(char*)*thr);
|
||||
int jj=0, kk=0;
|
||||
|
||||
tmp=(char*)PR_Malloc(sizeof(char*)*1);
|
||||
tmp2=(char*)PR_Malloc(sizeof(char*)*1);
|
||||
first=(char*)PR_Malloc(sizeof(char*)*1);
|
||||
|
||||
sprintf(tmp,"%d,%d,",i,j);
|
||||
|
||||
int strs=0;
|
||||
for(int h=0;h<nRead;h++) if(cont[h]=='\n') strs++;
|
||||
|
||||
first=strtok(cont,"\n");
|
||||
tokens[0]=first;
|
||||
|
||||
for(int g=0;g<strs-1;g++) {
|
||||
tokens[g+1]=strtok(NULL,"\n");
|
||||
}
|
||||
|
||||
PRBool is=PR_FALSE;
|
||||
|
||||
for(int hh=0;hh<strs;hh++) {
|
||||
|
||||
char* t1=strtok(tokens[hh],",");
|
||||
char* t2=strtok(NULL,",");
|
||||
id[hh]=strtok(NULL,",");
|
||||
sprintf(tmp2,"%s,%s,",t1,t2);
|
||||
|
||||
if(PL_strncmp(tmp,tmp2,PL_strlen(tmp))==0) {
|
||||
*_retstr=id[hh];
|
||||
is=PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if(!is) {
|
||||
*_retstr="NULL";
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
nsresult rv = cm->ContractIDToClassID(*_retstr, &aClass);
|
||||
|
||||
if(NS_FAILED(rv)) {
|
||||
printf("MThreadContextImpl::GetContractID. Can't convert ContractID to ClassID\n");
|
||||
*_retstr = "NULL";
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
*_retstr = aClass.ToString();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP MThreadContextImpl::GetComponentManager(nsIComponentManager **_retval) {
|
||||
*_retval = cm;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
char** MThreadContextImpl::LoadComponentList() {
|
||||
NS_IMETHODIMP MThreadContextImpl::GetPath(PRBool in, char **_retval) {
|
||||
|
||||
struct stat st;
|
||||
FILE *file = NULL;
|
||||
char *content;
|
||||
int nRead, nTests, count = 0;
|
||||
char *pos, *pos1;
|
||||
char **testList;
|
||||
char *lstFile = PR_GetEnv(MT_COMPONENT_LIST_VAR_NAME);
|
||||
if(lstFile == NULL) {
|
||||
fprintf(stderr, "ERROR: %s value is'n set\n",MT_COMPONENT_LIST_VAR_NAME);
|
||||
return NULL;
|
||||
}
|
||||
char* content=NULL;
|
||||
char* filo=NULL;
|
||||
int count = 0;
|
||||
|
||||
if (in) filo=inFile;
|
||||
else filo=outFile;
|
||||
|
||||
if (stat(lstFile, &st) < 0) {
|
||||
fprintf(stderr, "ERROR: can't get stat from file %s\n",lstFile);
|
||||
if(filo == NULL) {
|
||||
fprintf(stderr, "ERROR: %s value is'n set\n",MT_COMPONENT_LIST_VAR_NAME);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (stat(filo, &st) < 0) {
|
||||
fprintf(stderr, "ERROR: can't get stat from file %s\n",filo);
|
||||
return NULL;
|
||||
}
|
||||
content = (char*)calloc(1, st.st_size+1);
|
||||
if ((file = fopen(lstFile, "r")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",lstFile);
|
||||
content = (char*)PR_Malloc(1*(st.st_size+1));
|
||||
if ((file = fopen(filo, "r+t")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",filo);
|
||||
return NULL;
|
||||
}
|
||||
if ((nRead = fread(content, 1, st.st_size, file)) < st.st_size) {
|
||||
fprintf(stderr, "WARNING: can't read entire file in text mode (%d of %d) !\n", nRead, st.st_size);
|
||||
//return;
|
||||
}
|
||||
content[nRead] = 0;
|
||||
printf("File content: %s\n", content);
|
||||
fclose(file);
|
||||
|
||||
//allocate maximal possible size
|
||||
nTests = countChars(content, '\n') + 2;
|
||||
printf("nTests = %d\n", nTests);
|
||||
testList = (char**)calloc(sizeof(char*), nTests);
|
||||
testList[0] = 0;
|
||||
pos = content;
|
||||
while((pos1 = PL_strchr(pos, '\n'))) {
|
||||
*pos1 = 0;
|
||||
if(PL_strlen(pos) > 0 && *pos != '#') {
|
||||
//printf("First char: %c\n", *pos);
|
||||
testList[count++] = PL_strdup(pos);
|
||||
}
|
||||
pos = pos1+1;
|
||||
if (!(*pos)) {
|
||||
printf("Parser done: %d .. ", count);
|
||||
testList[count] = 0;
|
||||
printf("ok\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
//If there is no \n after last line
|
||||
if (PL_strlen(pos) > 0 && *pos != '#') {
|
||||
testList[count++] = PL_strdup(pos);
|
||||
testList[count] = 0;
|
||||
}
|
||||
//free(content);
|
||||
return testList;
|
||||
|
||||
fclose(file);
|
||||
*_retval=content;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
int MThreadContextImpl::countChars(char* buf, char ch) {
|
||||
char *pos = buf;
|
||||
int count = 0;
|
||||
PRBool MThreadContextImpl::makeParamFile() {
|
||||
PRBool isMade=PR_FALSE;
|
||||
struct stat st;
|
||||
FILE *file=NULL, *file2=NULL;
|
||||
char* content=(char*)PR_Malloc(sizeof(char*));
|
||||
int j=0, k=0;
|
||||
int objects=0;
|
||||
char paths[100][100];
|
||||
|
||||
while((pos = PL_strchr(pos, ch))) {
|
||||
pos++;
|
||||
count++;
|
||||
sprintf(inFile,"%s%s",PR_GetEnv(MT_COMPONENT_LIST_VAR_NAME),"threads.dat");
|
||||
sprintf(outFile,"%s%s",PR_GetEnv(MT_COMPONENT_LIST_VAR_NAME),"MTTest.lst");
|
||||
sprintf(resFile,"%s%s",PR_GetEnv(MT_COMPONENT_LIST_VAR_NAME),"Results.dat");
|
||||
|
||||
if ((file = fopen(inFile, "r+t")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",inFile);
|
||||
return isMade;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
stat(inFile,&st);
|
||||
content = (char*)PR_Malloc(1*(st.st_size+1));
|
||||
|
||||
if ((nRead = fread(content, 1, st.st_size, file)) < st.st_size) {
|
||||
fprintf(stderr, "WARNING: can't read entire file in text mode (%d of %d) !\n", nRead, st.st_size);
|
||||
}
|
||||
|
||||
int i=0; stages=0; threads=0;
|
||||
while(content[i]!='-') {
|
||||
if(content[i]=='\n') threads++;
|
||||
if((content[i]!='\n')&&(content[i]!=13)) stages=stages+1;
|
||||
i++;
|
||||
}
|
||||
|
||||
stages=stages/threads;
|
||||
|
||||
rewind(file);
|
||||
if ((nRead = fread(content, 1, st.st_size, file)) < st.st_size) {
|
||||
fprintf(stderr, "WARNING: can't read entire file in text mode (%d of %d) !\n", nRead, st.st_size);
|
||||
}
|
||||
|
||||
i=k=j=0;
|
||||
|
||||
while(content[i]!='-') {
|
||||
switch(content[i]) {
|
||||
case '0x0d':break;
|
||||
case '\n':j++;k=0;break;
|
||||
default:paths[j][k]=content[i];k++;if(content[i]!=' ') objects++;break;
|
||||
}
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
|
||||
if ((file2 = fopen(outFile, "w+t")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",outFile);
|
||||
return isMade;
|
||||
}
|
||||
|
||||
char t[1];
|
||||
char tmp[256];
|
||||
|
||||
rewind(file);
|
||||
if ((nRead = fread(content, 1, st.st_size, file)) < st.st_size) {
|
||||
fprintf(stderr, "WARNING: can't read entire file in text mode (%d of %d) !\n", nRead, st.st_size);
|
||||
}
|
||||
|
||||
content=PL_strpbrk(content,"-");
|
||||
int contentLength=PL_strlen(content);
|
||||
|
||||
|
||||
for(int ii=0;ii<threads;ii++)
|
||||
for(int jj=0;jj<stages;jj++) {
|
||||
switch(paths[ii][jj]) {
|
||||
case ' ':
|
||||
case '\n':break;
|
||||
default: {
|
||||
sprintf(tmp,"%d",ii);
|
||||
fwrite((void*)tmp,1,PL_strlen(tmp),file2);
|
||||
|
||||
t[0]=',';
|
||||
fwrite((void*)t,1,1,file2);
|
||||
sprintf(tmp,"%d",jj);
|
||||
fwrite((void*)tmp,1,PL_strlen(tmp),file2);
|
||||
fwrite((void*)t,1,1,file2);
|
||||
|
||||
char con[256];
|
||||
|
||||
for(int h=0;h<contentLength;h++) {
|
||||
if((content[h]==',')&&(paths[ii][jj]==content[h-1])) {
|
||||
sprintf(tmp,"%c%c",content[h-1],content[h]);
|
||||
sprintf(tmp,"%s",PL_strstr(content,tmp));
|
||||
sprintf(tmp,"%s",strtok(tmp,"\n"));
|
||||
for(unsigned int hh=0;hh<PL_strlen(tmp);hh++)
|
||||
con[hh]=tmp[hh+2];
|
||||
con[hh+1]='\0';
|
||||
fwrite((void*)con,1,PL_strlen(con),file2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
t[0]='\n';
|
||||
fwrite((void*)t,1,1,file2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fclose(file);
|
||||
fclose(file2);
|
||||
isMade=PR_TRUE;
|
||||
|
||||
return isMade;
|
||||
}
|
||||
|
||||
@@ -27,8 +27,7 @@ class MThreadContextImpl : public iMThreadContext
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_IMTHREADCONTEXT
|
||||
char** LoadComponentList();
|
||||
int countChars(char* buf, char ch);
|
||||
PRBool makeParamFile();
|
||||
|
||||
MThreadContextImpl();
|
||||
virtual ~MThreadContextImpl();
|
||||
@@ -46,13 +45,3 @@ public:
|
||||
virtual ~_MYCLASS_();
|
||||
/* additional members */
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(MThreadContextImpl)
|
||||
|
||||
static nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "J2XIN Server Test Component", MTHREADCONTEXT_CID, MTHREADCONTEXT_PROGID, MThreadContextImplConstructor,
|
||||
{ "MTContext Test Component", MTHREADCONTEXT_CID, MTHREADCONTEXT_PROGID, MThreadContextImplConstructor,
|
||||
NULL /* NULL if you dont need one */,
|
||||
NULL /* NULL if you dont need one */
|
||||
}
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -51,10 +53,3 @@ export::
|
||||
$(JDKHOME)/bin/javac -classpath $(DIST)/classes -d $(DIST)/classes $(JAVAI_SRC)
|
||||
$(JDKHOME)/bin/javac -classpath $(DIST)/classes -d $(DIST)/classes $(JAVA_SRC)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -28,5 +28,6 @@
|
||||
interface iMThreadComponent : nsISupports
|
||||
{
|
||||
void Initialize(in iMThreadContext c);
|
||||
void Execute(in string tName);
|
||||
void THack(in nsIComponentManager cm);
|
||||
void Execute(in long thread, in long stage);
|
||||
};
|
||||
|
||||
@@ -23,8 +23,11 @@ public interface iMThreadComponent extends nsISupports
|
||||
/* void Initialize (in iMThreadContext c); */
|
||||
public void initialize(iMThreadContext c);
|
||||
|
||||
/* void Execute (in string tName); */
|
||||
public void execute(String tName);
|
||||
/* void THack (in nsIComponentManager cm); */
|
||||
public void tHack(nsIComponentManager cm);
|
||||
|
||||
/* void Execute (in long thread, in long stage); */
|
||||
public void execute(int thread, int stage);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -5,9 +5,19 @@
|
||||
#ifndef __gen_iMThreadContext_h__
|
||||
#define __gen_iMThreadContext_h__
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsIComponentManager.h"
|
||||
|
||||
#ifndef __gen_nsISupports_h__
|
||||
#include "nsISupports.h"
|
||||
#endif
|
||||
|
||||
#ifndef __gen_nsIComponentManager_h__
|
||||
#include "nsIComponentManager.h"
|
||||
#endif
|
||||
|
||||
/* For IDL files that don't want to include root IDL files. */
|
||||
#ifndef NS_NO_VTABLE
|
||||
#define NS_NO_VTABLE
|
||||
#endif
|
||||
|
||||
/* starting interface: iMThreadContext */
|
||||
#define IMTHREADCONTEXT_IID_STR "a7b26685-9816-4eb6-a075-36f539a7a823"
|
||||
@@ -21,8 +31,20 @@ class NS_NO_VTABLE iMThreadContext : public nsISupports {
|
||||
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(IMTHREADCONTEXT_IID)
|
||||
|
||||
/* string GetNext (); */
|
||||
NS_IMETHOD GetNext(char **_retval) = 0;
|
||||
/* long GetStages (); */
|
||||
NS_IMETHOD GetStages(PRInt32 *_retval) = 0;
|
||||
|
||||
/* long GetThreads (); */
|
||||
NS_IMETHOD GetThreads(PRInt32 *_retval) = 0;
|
||||
|
||||
/* string GetResFile (); */
|
||||
NS_IMETHOD GetResFile(char **_retval) = 0;
|
||||
|
||||
/* string GetPath (in boolean i); */
|
||||
NS_IMETHOD GetPath(PRBool i, char **_retval) = 0;
|
||||
|
||||
/* string GetContractID (in long i, in long j); */
|
||||
NS_IMETHOD GetContractID(PRInt32 i, PRInt32 j, char **_retval) = 0;
|
||||
|
||||
/* nsIComponentManager GetComponentManager (); */
|
||||
NS_IMETHOD GetComponentManager(nsIComponentManager **_retval) = 0;
|
||||
@@ -31,14 +53,31 @@ class NS_NO_VTABLE iMThreadContext : public nsISupports {
|
||||
|
||||
/* Use this macro when declaring classes that implement this interface. */
|
||||
#define NS_DECL_IMTHREADCONTEXT \
|
||||
NS_IMETHOD GetNext(char **_retval); \
|
||||
NS_IMETHOD GetStages(PRInt32 *_retval); \
|
||||
NS_IMETHOD GetThreads(PRInt32 *_retval); \
|
||||
NS_IMETHOD GetResFile(char **_retval); \
|
||||
NS_IMETHOD GetPath(PRBool i, char **_retval); \
|
||||
NS_IMETHOD GetContractID(PRInt32 i, PRInt32 j, char **_retval); \
|
||||
NS_IMETHOD GetComponentManager(nsIComponentManager **_retval);
|
||||
|
||||
/* Use this macro to declare functions that forward the behavior of this interface to another object. */
|
||||
#define NS_FORWARD_IMTHREADCONTEXT(_to) \
|
||||
NS_IMETHOD GetNext(char **_retval) { return _to ## GetNext(_retval); } \
|
||||
NS_IMETHOD GetStages(PRInt32 *_retval) { return _to ## GetStages(_retval); } \
|
||||
NS_IMETHOD GetThreads(PRInt32 *_retval) { return _to ## GetThreads(_retval); } \
|
||||
NS_IMETHOD GetResFile(char **_retval) { return _to ## GetResFile(_retval); } \
|
||||
NS_IMETHOD GetPath(PRBool i, char **_retval) { return _to ## GetPath(i, _retval); } \
|
||||
NS_IMETHOD GetContractID(PRInt32 i, PRInt32 j, char **_retval) { return _to ## GetContractID(i, j, _retval); } \
|
||||
NS_IMETHOD GetComponentManager(nsIComponentManager **_retval) { return _to ## GetComponentManager(_retval); }
|
||||
|
||||
/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
|
||||
#define NS_FORWARD_SAFE_IMTHREADCONTEXT(_to) \
|
||||
NS_IMETHOD GetStages(PRInt32 *_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetStages(_retval); } \
|
||||
NS_IMETHOD GetThreads(PRInt32 *_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetThreads(_retval); } \
|
||||
NS_IMETHOD GetResFile(char **_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetResFile(_retval); } \
|
||||
NS_IMETHOD GetPath(PRBool i, char **_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetPath(i, _retval); } \
|
||||
NS_IMETHOD GetContractID(PRInt32 i, PRInt32 j, char **_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetContractID(i, j, _retval); } \
|
||||
NS_IMETHOD GetComponentManager(nsIComponentManager **_retval) { return !_to ## ? NS_ERROR_NULL_POINTER : _to ##-> GetComponentManager(_retval); }
|
||||
|
||||
#if 0
|
||||
/* Use the code below as a template for the implementation class for this interface. */
|
||||
|
||||
@@ -68,8 +107,32 @@ _MYCLASS_::~_MYCLASS_()
|
||||
/* destructor code */
|
||||
}
|
||||
|
||||
/* string GetNext (); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetNext(char **_retval)
|
||||
/* long GetStages (); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetStages(PRInt32 *_retval)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
/* long GetThreads (); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetThreads(PRInt32 *_retval)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
/* string GetResFile (); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetResFile(char **_retval)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
/* string GetPath (in boolean i); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetPath(PRBool i, char **_retval)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
/* string GetContractID (in long i, in long j); */
|
||||
NS_IMETHODIMP _MYCLASS_::GetContractID(PRInt32 i, PRInt32 j, char **_retval)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
@@ -90,6 +153,6 @@ NS_IMETHODIMP _MYCLASS_::GetComponentManager(nsIComponentManager **_retval)
|
||||
0x46d0, \
|
||||
{0x8a, 0xfc, 0xf1, 0x93, 0x91, 0x73, 0xc2, 0xea} \
|
||||
}
|
||||
#define MTHREADCONTEXT_PROGID "component://netscape/blackwood/blackconnect/test/mthreads/MThreadContext"
|
||||
#define MTHREADCONTEXT_PROGID "@mozilla/blackwood/blackconnect/test/params/MThreadContext;1"
|
||||
|
||||
#endif /* __gen_iMThreadContext_h__ */
|
||||
|
||||
@@ -27,7 +27,11 @@
|
||||
[scriptable, uuid(a7b26685-9816-4eb6-a075-36f539a7a823)]
|
||||
interface iMThreadContext : nsISupports
|
||||
{
|
||||
string GetNext();
|
||||
long GetStages();
|
||||
long GetThreads();
|
||||
string GetResFile();
|
||||
string GetPath(in boolean i);
|
||||
string GetContractID(in long i,in long j);
|
||||
nsIComponentManager GetComponentManager();
|
||||
};
|
||||
|
||||
@@ -40,6 +44,5 @@ interface iMThreadContext : nsISupports
|
||||
{0x8a, 0xfc, 0xf1, 0x93, 0x91, 0x73, 0xc2, 0xea} \
|
||||
}
|
||||
|
||||
#define MTHREADCONTEXT_PROGID "component://netscape/blackwood/blackconnect/test/mthreads/MThreadContext"
|
||||
|
||||
#define MTHREADCONTEXT_PROGID "@mozilla/blackwood/blackconnect/test/params/MThreadContext;1"
|
||||
%}
|
||||
|
||||
@@ -20,8 +20,20 @@ public interface iMThreadContext extends nsISupports
|
||||
new IID("a7b26685-9816-4eb6-a075-36f539a7a823");
|
||||
|
||||
|
||||
/* string GetNext (); */
|
||||
public String getNext();
|
||||
/* long GetStages (); */
|
||||
public int getStages();
|
||||
|
||||
/* long GetThreads (); */
|
||||
public int getThreads();
|
||||
|
||||
/* string GetResFile (); */
|
||||
public String getResFile();
|
||||
|
||||
/* string GetPath (in boolean i); */
|
||||
public String getPath(boolean i);
|
||||
|
||||
/* string GetContractID (in long i, in long j); */
|
||||
public String getContractID(int i, int j);
|
||||
|
||||
/* nsIComponentManager GetComponentManager (); */
|
||||
public nsIComponentManager getComponentManager();
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=..\..\..\..\..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -30,8 +32,6 @@ DIRS= \
|
||||
context \
|
||||
1 \
|
||||
2 \
|
||||
3 \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
|
||||
@@ -22,7 +22,9 @@
|
||||
*/
|
||||
|
||||
#include "plstr.h"
|
||||
#include "prmem.h"
|
||||
#include "stdio.h"
|
||||
#include "prthread.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "iMThreadContext.h"
|
||||
#include "iMThreadComponent.h"
|
||||
@@ -32,7 +34,10 @@
|
||||
#include <stdlib.h>
|
||||
#include "nsID.h"
|
||||
|
||||
iMThreadContext* context;
|
||||
iMThreadContext* context=NULL;
|
||||
void* eThread=NULL;
|
||||
FILE *file=NULL;
|
||||
|
||||
MTStartImpl::MTStartImpl()
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
@@ -42,25 +47,47 @@ MTStartImpl::MTStartImpl()
|
||||
NS_GET_IID(iMThreadContext),
|
||||
(void**)&context);
|
||||
if(NS_FAILED(rv)) {
|
||||
printf("Create instance of context failed!!!");
|
||||
fprintf(stderr, "Create instance of context failed!!!");
|
||||
return;
|
||||
}
|
||||
char* first;
|
||||
context->GetNext(&first);
|
||||
char* first=(char*)PR_Malloc(sizeof(char*));
|
||||
|
||||
|
||||
context->GetContractID(0,1,&first);
|
||||
nsCID firstCID;
|
||||
firstCID.Parse(first);
|
||||
printf("ClassID is %s\n", firstCID.ToString());
|
||||
iMThreadComponent* tComponent;
|
||||
iMThreadComponent* tComponent=NULL;
|
||||
rv = nsComponentManager::CreateInstance(firstCID,
|
||||
nsnull,
|
||||
NS_GET_IID(iMThreadComponent),
|
||||
(void**)&tComponent);
|
||||
if(NS_FAILED(rv)) {
|
||||
printf("Create instance failed from %s!!!",first);
|
||||
fprintf(stderr, "Create instance failed from %s!!!",first);
|
||||
return;
|
||||
}
|
||||
|
||||
eThread = PR_GetCurrentThread();
|
||||
|
||||
char* res=(char*)PR_Malloc(sizeof(char*));
|
||||
context->GetResFile(&res);
|
||||
|
||||
if ((file = fopen(res, "w+t")) == NULL) {
|
||||
fprintf(stderr, "ERROR: can't open file %s\n",res);
|
||||
}
|
||||
char* tmp="0,0,";
|
||||
fwrite(tmp,1,PL_strlen(tmp),file);
|
||||
sprintf(tmp,"%d\n",eThread);
|
||||
fwrite(tmp,1,PL_strlen(tmp),file);
|
||||
fclose(file);
|
||||
|
||||
tComponent->Initialize(context);
|
||||
tComponent->Execute("First from MTStart");
|
||||
nsIComponentManager* cm;
|
||||
rv = NS_GetGlobalComponentManager(&cm);
|
||||
if(NS_FAILED(rv)) {
|
||||
fprintf(stderr, "ERROR: Can't get GlobalComponentManager!!\n");
|
||||
}
|
||||
tComponent->THack(cm);
|
||||
tComponent->Execute(0,1);
|
||||
}
|
||||
|
||||
MTStartImpl::~MTStartImpl()
|
||||
@@ -68,12 +95,3 @@ MTStartImpl::~MTStartImpl()
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(MTStartImpl, iMTStart);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -36,11 +36,3 @@ static nsModuleComponentInfo components[] =
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE("MTStartFactory", components)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=../../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
|
||||
@@ -40,7 +40,7 @@ interface iMTStart : nsISupports
|
||||
{0x8a, 0xb2, 0x97, 0x83, 0xf8, 0x98, 0x06, 0x55} \
|
||||
}
|
||||
|
||||
#define MTSTART_PROGID "component://netscape/blackwood/blackconnect/test/mthreads/MTStart"
|
||||
#define MTSTART_PROGID "@mozilla/blackwood/blackconnect/test/mthreads/MTStart;1"
|
||||
|
||||
%}
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
DEPTH=..\..\..\..\..\..
|
||||
topsrcdir = $(DEPTH)
|
||||
@@ -29,10 +31,10 @@ MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = MTStart
|
||||
DLL =.\$(OBJDIR)\$(DLLNAME).dll
|
||||
COMPONENT = 1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
JAVAI = \
|
||||
.\iMTStart.java \
|
||||
$(NULL)
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
XPIDLSRCS = \
|
||||
.\iMTStart.idl \
|
||||
@@ -45,16 +47,17 @@ CPP_OBJS = \
|
||||
|
||||
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>
|
||||
include <$(DEPTH)\config\javarules.mak>
|
||||
|
||||
javai:
|
||||
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
|
||||
|
||||
install:: $(DLL) javai
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
|
||||
clobber::
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).xpt
|
||||
del /f $(DIST)\..\classes\org\mozilla\xpcom\iMTStart.class
|
||||
|
||||
|
||||
@@ -6,3 +6,4 @@ J2XIN
|
||||
J2XOUT
|
||||
J2XINOUT
|
||||
J2XRET
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ VPATH = .
|
||||
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -27,8 +27,7 @@ import java.io.DataOutputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.util.Hashtable;
|
||||
|
||||
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent,
|
||||
iExclusionSupport {
|
||||
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent, iExclusionSupport {
|
||||
private iJ2XINServerTestComponent server = null;
|
||||
private VarContainer varContainer = null;
|
||||
private String testLocation = null;
|
||||
@@ -105,7 +104,11 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
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();
|
||||
@@ -133,12 +136,12 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
testStringArray();
|
||||
if(!exclusionHash.containsKey("longArray"))
|
||||
testLongArray();
|
||||
if(!exclusionHash.containsKey("charArray"))
|
||||
testCharArray();
|
||||
// if(!exclusionHash.containsKey("charArray"))
|
||||
// testCharArray();
|
||||
if(!exclusionHash.containsKey("object"))
|
||||
testObject();
|
||||
if(!exclusionHash.containsKey("mixed"))
|
||||
testMixed();
|
||||
// if(!exclusionHash.containsKey("mixed"))
|
||||
// testMixed();
|
||||
if(!exclusionHash.containsKey("iid"))
|
||||
testIID();
|
||||
if(!exclusionHash.containsKey("cid"))
|
||||
@@ -264,23 +267,45 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
printResult("true\nfalse","j2x.in.client.boolean");
|
||||
server.flush("boolean");
|
||||
}
|
||||
|
||||
// private void testChar() {
|
||||
/*
|
||||
private void testChar() {
|
||||
// server.testChar('S');
|
||||
// server.testWChar(VarContainer.charVar);
|
||||
// printResult("S","j2x.in.client.char");
|
||||
// server.flush("char");
|
||||
// }
|
||||
server.testChar(VarContainer.charVar);
|
||||
printResult((new Character(VarContainer.charVar)).toString(),"j2x.in.client.char");
|
||||
server.flush("char");
|
||||
}
|
||||
|
||||
private void testWChar() {
|
||||
// server.testWChar('S');
|
||||
server.testWChar(VarContainer.charVar);
|
||||
printResult((new Character(VarContainer.charVar)).toString(),"j2x.in.client.wchar");
|
||||
server.flush("wchar");
|
||||
}
|
||||
*/
|
||||
private void testString() {
|
||||
printResult(VarContainer.charPVar,"j2x.in.client.string");
|
||||
buf = new StringBuffer("");
|
||||
buf.append(VarContainer.charPVar+"\n");
|
||||
server.testString(VarContainer.charPVar);
|
||||
buf.append(VarContainer.charPVar2+"\n");
|
||||
server.testString(VarContainer.charPVar2);
|
||||
buf.append(VarContainer.charPVar3+"\n");
|
||||
server.testString(VarContainer.charPVar3);
|
||||
|
||||
printResult(buf.toString(),"j2x.in.client.string");
|
||||
server.flush("string");
|
||||
}
|
||||
|
||||
private void testWString() {
|
||||
printResult(VarContainer.unicharPVar,"j2x.in.client.wstring");
|
||||
buf = new StringBuffer("");
|
||||
|
||||
buf.append(VarContainer.unicharPVar+"\n");
|
||||
server.testWString(VarContainer.unicharPVar);
|
||||
buf.append(VarContainer.unicharPVar2+"\n");
|
||||
server.testWString(VarContainer.unicharPVar2);
|
||||
buf.append(VarContainer.unicharPVar3+"\n");
|
||||
server.testWString(VarContainer.unicharPVar3);
|
||||
|
||||
printResult(buf.toString(),"j2x.in.client.wstring");
|
||||
server.flush("wstring");
|
||||
}
|
||||
|
||||
@@ -304,7 +329,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
printResult(s.toString(),"j2x.in.client.longArray");
|
||||
server.testLongArray(intArray.length, intArray);
|
||||
}
|
||||
|
||||
/*
|
||||
private void testCharArray() {
|
||||
char[] charArray = {'A','B','c','L','ï','u','Ô','p'};
|
||||
s = new StringBuffer();
|
||||
@@ -349,7 +374,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
printResult(s.toString(),"j2x.in.client.mixed");
|
||||
server.testMixed(bBool, nByte, nShort, nUShort,nLong,nULong, nHyper, nUHyper, fFloat,fDouble, aString, intArray.length, intArray);
|
||||
}
|
||||
|
||||
*/
|
||||
private void testObject() {
|
||||
printResult(server.getTestObjectString(),"j2x.in.client.object");
|
||||
server.testObject(server);
|
||||
@@ -358,7 +383,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
private void testIID() {
|
||||
buf = new StringBuffer("");
|
||||
IID iid=new IID("cc7480e0-3a37-11d5-b653-005004552ed1");
|
||||
buf.append(iid + "\n");
|
||||
buf.append(iid.getString() + "\n");
|
||||
|
||||
server.testIID(iid);
|
||||
printResult(buf.toString(),"j2x.in.client.iid");
|
||||
@@ -368,7 +393,7 @@ public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iCli
|
||||
private void testCID() {
|
||||
buf = new StringBuffer("");
|
||||
CID cid=new CID("cc7480e0-3a37-11d5-b653-005004552ed1");
|
||||
buf.append(cid + "\n");
|
||||
buf.append(cid.getString() + "\n");
|
||||
|
||||
server.testCID(cid);
|
||||
printResult(buf.toString(),"j2x.in.client.cid");
|
||||
|
||||
@@ -30,28 +30,35 @@ JAVA_OR_NSJVM=1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XINClientTestComponent.java
|
||||
|
||||
JAVAI_SRC = \
|
||||
iJ2XINClientTestComponent.java
|
||||
J2XINClientTestComponent.jar.comp: manifest javai J2XINClientTestComponent.class
|
||||
#JAVAI_SRC = \
|
||||
# iJ2XINClientTestComponent.java
|
||||
|
||||
|
||||
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
|
||||
|
||||
J2XINClientTestComponent.jar.comp: manifest J2XINClientTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm J2XINClientTestComponent.jar.comp manifest *.class
|
||||
|
||||
J2XINClientTestComponent.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)
|
||||
|
||||
install-component: J2XINClientTestComponent.jar.comp J2XINClientTestComponent.jar.info
|
||||
cp -f J2XINClientTestComponent.jar* $(DIST)/bin/components
|
||||
|
||||
clobber::
|
||||
rm -f *.class *.jar.comp
|
||||
rm -f $(DIST)/bin/components/J2XINClientTestComponent.jar.*
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
rm -f $(DIST)/../classes/J2XINClientTestComponent.class
|
||||
|
||||
@@ -38,13 +38,19 @@ XPIDLSRCS = \
|
||||
.\iJ2XINClientTestComponent.idl \
|
||||
$(NULL)
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XINClientTestComponent.java\
|
||||
$(NULL)
|
||||
|
||||
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>
|
||||
|
||||
J2XINClientTestComponent.class: J2XINClientTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iJ2XINClientTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes J2XINClientTestComponent.java
|
||||
J2XINClientTestComponent.class:
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes $(JAVA_SRC)
|
||||
|
||||
J2XINClientTestComponent.jar.comp: manifest J2XINClientTestComponent.class
|
||||
$(JDKHOME)\bin\jar cvfm J2XINClientTestComponent.jar.comp manifest *.class
|
||||
@@ -55,9 +61,7 @@ install-component: J2XINClientTestComponent.jar.comp J2XINClientTestComponent.ja
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\J2XINClientTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINServerTestComponent.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINClientTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
|
||||
-del /f $(DIST)\..\classes\J2XINClientTestComponent.class
|
||||
|
||||
@@ -28,8 +28,8 @@ VPATH = .
|
||||
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
char* testLocation=NULL;
|
||||
char* logLocation=NULL;
|
||||
char* fBuffer=NULL;
|
||||
char* fBuffer;
|
||||
PRUint8 end_of_data = 112;
|
||||
int all=0;
|
||||
|
||||
@@ -49,7 +49,8 @@ J2XINOUTServerTestComponentImpl::J2XINOUTServerTestComponentImpl()
|
||||
fprintf(stderr,"ERROR: %s or %s isn't set !", BC_TEST_LOCATION_VAR_NAME, BC_LOG_LOCATION_VAR_NAME);
|
||||
}
|
||||
InitStackVars();
|
||||
printf("DEbug:avm:J2XINOUTServerTestComponentImpl::J2XINOUTServerTestComponentImp\n");
|
||||
// fBuffer=(char*)PR_Malloc(sizeof(char*));
|
||||
// printf("DEbug:avm:J2XINOUTServerTestComponentImpl::J2XINOUTServerTestComponentImp\n");
|
||||
}
|
||||
|
||||
J2XINOUTServerTestComponentImpl::~J2XINOUTServerTestComponentImpl()
|
||||
@@ -67,32 +68,38 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::GetTestLocation(char **tLocation,
|
||||
}
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::Flush(const char *type) {
|
||||
char* fileName = NULL;
|
||||
|
||||
char* fileName = NULL;//(char*)PR_Malloc(sizeof(char*));
|
||||
fileName = PR_sprintf_append(fileName,"j2x.inout.server.%s",type);
|
||||
if(fBuffer) {
|
||||
PrintResult(fileName,fBuffer);
|
||||
PR_smprintf_free(fBuffer);
|
||||
fBuffer = NULL;
|
||||
} else {
|
||||
}
|
||||
PR_smprintf_free(fileName);
|
||||
|
||||
if(fBuffer != NULL ) {
|
||||
}else {
|
||||
}
|
||||
PR_smprintf_free(fBuffer);
|
||||
fBuffer = NULL;
|
||||
PR_smprintf_free(fileName);
|
||||
all=0;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//Test methods
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestChar(char *i) {
|
||||
if (*i!='x') fBuffer = PR_sprintf_append(fBuffer,"%c\n",*i);
|
||||
else Flush("char");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestWChar(PRUnichar *i) {
|
||||
if (*i!='x') fBuffer = PR_sprintf_append(fBuffer,"%c\n",*i);
|
||||
else Flush("wchar");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
//Test methods
|
||||
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestShort(PRInt16 *i) {
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%hd\n",*i);
|
||||
else Flush("short");
|
||||
return NS_OK;
|
||||
|
||||
@@ -100,7 +107,8 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestShort(PRInt16 *i) {
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestLong(PRInt32 *i) {
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
//fprintf(stderr,"L==%ld\n",*i);
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%ld\n",*i);
|
||||
else Flush("long");
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -114,23 +122,22 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestLonglong(PRInt64 *i) {
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestByte(PRUint8 *i) {
|
||||
// Strange bug here
|
||||
/* if (*i!=112)*/ fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
all++;
|
||||
if (all==4) Flush("octet");
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
else Flush("octet");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestUShort(PRUint16 *i) {
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
//fprintf(stderr,"S==%hu\n",*i);
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%hu\n",*i);
|
||||
else Flush("ushort");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestULong(PRUint32 *i) {
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%d\n",*i);
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%lu\n",*i);
|
||||
else Flush("ulong");
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -138,7 +145,7 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestULong(PRUint32 *i) {
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestULonglong(PRUint64 *i) {
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%lld\n",*i);
|
||||
if (*i!=112) fBuffer = PR_sprintf_append(fBuffer,"%llu\n",*i);
|
||||
else Flush("ulonglong");
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -168,28 +175,13 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestBoolean(PRBool *i) {
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestChar(char *i) {
|
||||
// Strange bug here
|
||||
/* if (*i!='x')*/ fBuffer = PR_sprintf_append(fBuffer,"%c\n",i);
|
||||
all++;
|
||||
if (all==2) Flush("char");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestWChar(PRUnichar *i) {
|
||||
// Strange bug here
|
||||
/* if (*i!='x')*/ fBuffer = PR_sprintf_append(fBuffer,"%c\n",i);
|
||||
all++;
|
||||
if (all==2) Flush("wchar");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestString(char **i) {
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%s\n",*i);
|
||||
all++;
|
||||
if (all==3) Flush("string");
|
||||
//fprintf(stderr,"==>%d\n",PL_strcmp(*i,"112"));
|
||||
if (0!=PL_strcmp(*i,"112")) fBuffer = PR_sprintf_append(fBuffer,"%s\n",*i);
|
||||
else {
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%s\n",*i);
|
||||
Flush("string");
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -218,7 +210,7 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestStringArray(PRUint32 count, c
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestLongArray(PRUint32 count, PRInt32 **longArray) {
|
||||
for(int i=0;i<count;i++)
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%d\n",longArray[i]);
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%d\n",longArray[0][i]);
|
||||
Flush("longArray");
|
||||
return NS_OK;//PrintResultArray("j2x.in.server.longArray",count,longArray);
|
||||
}
|
||||
@@ -226,25 +218,24 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestLongArray(PRUint32 count, PRI
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestCharArray(PRUint32 count, char **valueArray) {
|
||||
for(int i=0;i<count;i++)
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%c\n",valueArray[i]);
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%c\n",valueArray[0][i]);
|
||||
Flush("charArray");
|
||||
return NS_OK;//PrintResultArray("j2x.in.server.charArray",count,valueArray);;
|
||||
}
|
||||
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestMixed(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) {
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%d\n%d\n%d",nByte, nShort, nUShort);
|
||||
Flush("mixed");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestObject(iJ2XINOUTServerTestComponent **obj) {
|
||||
obj[0]->TestObj();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestMixed(char *cChar, PRUint8 *nByte, PRInt16 *nShort, PRUint16 *nUShort, PRInt32 *nLong, PRUint32 *nULong, PRInt64 *nHyper, PRUint64 *nUHyper, char **aString) {
|
||||
fBuffer = PR_sprintf_append(fBuffer,"%c\n%d\n%hd\n%hu\n%ld\n%lu\n%lld\n%llu\n%s\n",*cChar,*nByte, *nShort, *nUShort, *nLong, *nULong, *nHyper, *nUHyper, *aString);
|
||||
Flush("mixed");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestObj() {
|
||||
fBuffer = PR_sprintf_append(fBuffer,"!!!Right string!!!");
|
||||
Flush("object");
|
||||
@@ -265,6 +256,5 @@ NS_IMETHODIMP J2XINOUTServerTestComponentImpl::TestObj2() {
|
||||
}
|
||||
PR_smprintf_free(fileName);
|
||||
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -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 = J2XINOUTServerTestComponent
|
||||
LIBRARY_NAME = $(MODULE)
|
||||
@@ -51,11 +52,16 @@ CPPSRCS = \
|
||||
$(NULL)
|
||||
XPIDLSRCS = iJ2XINOUTServerTestComponent.idl
|
||||
|
||||
JAVAI = iJ2XINOUTServerTestComponent.java
|
||||
#JAVAI = iJ2XINOUTServerTestComponent.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)
|
||||
|
||||
@@ -28,6 +28,8 @@ interface iJ2XINOUTServerTestComponent : nsISupports
|
||||
{
|
||||
void GetTestLocation(out string tLocation, out string lLocation);
|
||||
void Flush(in string s);
|
||||
void TestChar(inout char i);
|
||||
void TestWChar(inout wchar i);
|
||||
void TestShort(inout short i);
|
||||
void TestLong(inout long i);
|
||||
void TestLonglong(inout long long i);
|
||||
@@ -38,22 +40,17 @@ interface iJ2XINOUTServerTestComponent : nsISupports
|
||||
void TestFloat(inout float i);
|
||||
void TestDouble(inout double i);
|
||||
void TestBoolean(inout boolean i);
|
||||
void TestChar(inout char i);
|
||||
void TestWChar(inout wchar i);
|
||||
void TestString(inout string i);
|
||||
void TestWString(inout wstring i);
|
||||
void TestStringArray(in unsigned long count,[array, size_is(count)] inout string valueArray);
|
||||
void TestLongArray(in unsigned long count, [array, size_is(count)] inout long longArray);
|
||||
void TestCharArray(in unsigned long count,[array, size_is(count)] inout char valueArray);
|
||||
void TestMixed(inout boolean bBool, inout char cChar, inout octet nByte,
|
||||
void TestObject(inout iJ2XINOUTServerTestComponent obj);
|
||||
void TestMixed(inout char cChar, inout octet nByte,
|
||||
inout short nShort, inout unsigned short nUShort,
|
||||
inout long nLong, inout unsigned long nULong,
|
||||
inout long long nHyper, inout unsigned long long nUHyper,
|
||||
inout float fFloat, inout double fDouble,
|
||||
inout string aString,
|
||||
in unsigned long count, [array, size_is(count)] inout long longArray);
|
||||
|
||||
void TestObject(inout iJ2XINOUTServerTestComponent obj);
|
||||
inout string aString);
|
||||
void TestObj();
|
||||
void TestObj2();
|
||||
};
|
||||
|
||||
@@ -1,96 +1,96 @@
|
||||
/*
|
||||
* ************* DO NOT EDIT THIS FILE ***********
|
||||
*
|
||||
* This file was automatically generated from iJ2XINOUTServerTestComponent.idl.
|
||||
*/
|
||||
|
||||
|
||||
package org.mozilla.xpcom;
|
||||
|
||||
|
||||
/**
|
||||
* Interface iJ2XINOUTServerTestComponent
|
||||
*
|
||||
* IID: 0xc534e01c-9567-44ac-aaa6-f908fabefc2b
|
||||
*/
|
||||
|
||||
public interface iJ2XINOUTServerTestComponent extends nsISupports
|
||||
{
|
||||
public static final IID IID =
|
||||
new IID("c534e01c-9567-44ac-aaa6-f908fabefc2b");
|
||||
|
||||
|
||||
/* void GetTestLocation (out string tLocation, out string lLocation); */
|
||||
public void getTestLocation(String[] tLocation, String[] lLocation);
|
||||
|
||||
/* void Flush (in string s); */
|
||||
public void flush(String s);
|
||||
|
||||
/* void TestShort (inout short i); */
|
||||
public void testShort(short[] i);
|
||||
|
||||
/* void TestLong (inout long i); */
|
||||
public void testLong(int[] i);
|
||||
|
||||
/* void TestLonglong (inout long long i); */
|
||||
public void testLonglong(long[] i);
|
||||
|
||||
/* void TestByte (inout octet i); */
|
||||
public void testByte(byte[] i);
|
||||
|
||||
/* void TestUShort (inout unsigned short i); */
|
||||
public void testUShort(short[] i);
|
||||
|
||||
/* void TestULong (inout unsigned long i); */
|
||||
public void testULong(int[] i);
|
||||
|
||||
/* void TestULonglong (inout unsigned long long i); */
|
||||
public void testULonglong(long[] i);
|
||||
|
||||
/* void TestFloat (inout float i); */
|
||||
public void testFloat(float[] i);
|
||||
|
||||
/* void TestDouble (inout double i); */
|
||||
public void testDouble(double[] i);
|
||||
|
||||
/* void TestBoolean (inout boolean i); */
|
||||
public void testBoolean(boolean[] i);
|
||||
|
||||
/* void TestChar (inout char i); */
|
||||
public void testChar(char[] i);
|
||||
|
||||
/* void TestWChar (inout wchar i); */
|
||||
public void testWChar(char[] i);
|
||||
|
||||
/* void TestString (inout string i); */
|
||||
public void testString(String[] i);
|
||||
|
||||
/* void TestWString (inout wstring i); */
|
||||
public void testWString(String[] i);
|
||||
|
||||
/* void TestStringArray (in unsigned long count, [array, size_is (count)] inout string valueArray); */
|
||||
public void testStringArray(int count, String[][] valueArray);
|
||||
|
||||
/* void TestLongArray (in unsigned long count, [array, size_is (count)] inout long longArray); */
|
||||
public void testLongArray(int count, int[][] longArray);
|
||||
|
||||
/* void TestCharArray (in unsigned long count, [array, size_is (count)] inout char valueArray); */
|
||||
public void testCharArray(int count, char[][] valueArray);
|
||||
|
||||
/* void TestMixed (inout boolean bBool, inout char cChar, inout octet nByte, inout short nShort, inout unsigned short nUShort, inout long nLong, inout unsigned long nULong, inout long long nHyper, inout unsigned long long nUHyper, inout float fFloat, inout double fDouble, inout string aString, in unsigned long count, [array, size_is (count)] inout long longArray); */
|
||||
public void testMixed(boolean[] bBool, char[] cChar, 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 (inout iJ2XINOUTServerTestComponent obj); */
|
||||
public void testObject(iJ2XINOUTServerTestComponent[] obj);
|
||||
|
||||
/* void TestObj (); */
|
||||
public void testObj();
|
||||
|
||||
/* void TestObj2 (); */
|
||||
public void testObj2();
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* end
|
||||
*/
|
||||
/*
|
||||
* ************* DO NOT EDIT THIS FILE ***********
|
||||
*
|
||||
* This file was automatically generated from iJ2XINOUTServerTestComponent.idl.
|
||||
*/
|
||||
|
||||
|
||||
package org.mozilla.xpcom;
|
||||
|
||||
|
||||
/**
|
||||
* Interface iJ2XINOUTServerTestComponent
|
||||
*
|
||||
* IID: 0xc534e01c-9567-44ac-aaa6-f908fabefc2b
|
||||
*/
|
||||
|
||||
public interface iJ2XINOUTServerTestComponent extends nsISupports
|
||||
{
|
||||
public static final IID IID =
|
||||
new IID("c534e01c-9567-44ac-aaa6-f908fabefc2b");
|
||||
|
||||
|
||||
/* void GetTestLocation (out string tLocation, out string lLocation); */
|
||||
public void getTestLocation(String[] tLocation, String[] lLocation);
|
||||
|
||||
/* void Flush (in string s); */
|
||||
public void flush(String s);
|
||||
|
||||
/* void TestChar (inout char i); */
|
||||
public void testChar(char[] i);
|
||||
|
||||
/* void TestWChar (inout wchar i); */
|
||||
public void testWChar(char[] i);
|
||||
|
||||
/* void TestShort (inout short i); */
|
||||
public void testShort(short[] i);
|
||||
|
||||
/* void TestLong (inout long i); */
|
||||
public void testLong(int[] i);
|
||||
|
||||
/* void TestLonglong (inout long long i); */
|
||||
public void testLonglong(long[] i);
|
||||
|
||||
/* void TestByte (inout octet i); */
|
||||
public void testByte(byte[] i);
|
||||
|
||||
/* void TestUShort (inout unsigned short i); */
|
||||
public void testUShort(short[] i);
|
||||
|
||||
/* void TestULong (inout unsigned long i); */
|
||||
public void testULong(int[] i);
|
||||
|
||||
/* void TestULonglong (inout unsigned long long i); */
|
||||
public void testULonglong(long[] i);
|
||||
|
||||
/* void TestFloat (inout float i); */
|
||||
public void testFloat(float[] i);
|
||||
|
||||
/* void TestDouble (inout double i); */
|
||||
public void testDouble(double[] i);
|
||||
|
||||
/* void TestBoolean (inout boolean i); */
|
||||
public void testBoolean(boolean[] i);
|
||||
|
||||
/* void TestString (inout string i); */
|
||||
public void testString(String[] i);
|
||||
|
||||
/* void TestWString (inout wstring i); */
|
||||
public void testWString(String[] i);
|
||||
|
||||
/* void TestStringArray (in unsigned long count, [array, size_is (count)] inout string valueArray); */
|
||||
public void testStringArray(int count, String[][] valueArray);
|
||||
|
||||
/* void TestLongArray (in unsigned long count, [array, size_is (count)] inout long longArray); */
|
||||
public void testLongArray(int count, int[][] longArray);
|
||||
|
||||
/* void TestCharArray (in unsigned long count, [array, size_is (count)] inout char valueArray); */
|
||||
public void testCharArray(int count, char[][] valueArray);
|
||||
|
||||
/* void TestObject (inout iJ2XINOUTServerTestComponent obj); */
|
||||
public void testObject(iJ2XINOUTServerTestComponent[] obj);
|
||||
|
||||
/* void TestMixed (inout char cChar, inout octet nByte, inout short nShort, inout unsigned short nUShort, inout long nLong, inout unsigned long nULong, inout long long nHyper, inout unsigned long long nUHyper, inout string aString); */
|
||||
public void testMixed(char[] cChar, byte[] nByte, short[] nShort, short[] nUShort, int[] nLong, int[] nULong, long[] nHyper, long[] nUHyper, String[] aString);
|
||||
|
||||
/* void TestObj (); */
|
||||
public void testObj();
|
||||
|
||||
/* void TestObj2 (); */
|
||||
public void testObj2();
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* end
|
||||
*/
|
||||
|
||||
@@ -28,7 +28,10 @@ DLLNAME = J2XINOUTServerTestComponent
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
MODULE = J2XINOUTServerTestComponent
|
||||
COMPONENT = 1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\J2XINOUTServerTestComponent.obj \
|
||||
@@ -37,15 +40,14 @@ CPP_OBJS= \
|
||||
|
||||
XPIDLSRCS = .\iJ2XINOUTServerTestComponent.idl
|
||||
|
||||
JAVAI= iJ2XINOUTServerTestComponent.java
|
||||
|
||||
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 $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes
|
||||
include <$(DEPTH)\config\javarules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
@@ -53,6 +55,3 @@ clobber::
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
del /f $(DIST)\bin\components\J2XINOUT*.xpt
|
||||
|
||||
export::
|
||||
$(JAVAC) $(JAVAI)
|
||||
|
||||
|
||||
@@ -99,6 +99,10 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
System.err.println("Server is not initialized!!!");
|
||||
return;
|
||||
}
|
||||
if(!exclusionHash.containsKey("char"))
|
||||
testChar();
|
||||
if(!exclusionHash.containsKey("wchar"))
|
||||
testWChar();
|
||||
if(!exclusionHash.containsKey("short"))
|
||||
testShort();
|
||||
if(!exclusionHash.containsKey("long"))
|
||||
@@ -135,6 +139,50 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
testMixed();
|
||||
}
|
||||
|
||||
|
||||
private void testChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testChar");
|
||||
char[] charVar = new char[1];
|
||||
|
||||
charVar[0]='0';
|
||||
s.append(charVar[0]+"\n");
|
||||
server.testChar(charVar);
|
||||
s2.append(charVar[0]+"\n");
|
||||
charVar[0]='Z';
|
||||
s.append(charVar[0]+"\n");
|
||||
server.testChar(charVar);
|
||||
s2.append(charVar[0]+"\n");
|
||||
charVar[0]='x';
|
||||
server.testChar(charVar);
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.char");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.char");
|
||||
}
|
||||
|
||||
|
||||
private void testWChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testWChar");
|
||||
char[] wcharVar = new char[1];
|
||||
|
||||
wcharVar[0]='0';
|
||||
s.append(wcharVar[0]+"\n");
|
||||
server.testWChar(wcharVar);
|
||||
s2.append(wcharVar[0]+"\n");
|
||||
wcharVar[0]='Z';
|
||||
s.append(wcharVar[0]+"\n");
|
||||
server.testWChar(wcharVar);
|
||||
s2.append(wcharVar[0]+"\n");
|
||||
wcharVar[0]='x';
|
||||
server.testWChar(wcharVar);
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.wchar");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.wchar");
|
||||
}
|
||||
|
||||
private void testShort() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
@@ -176,7 +224,7 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
s.append(intVar[0]+"\n");
|
||||
server.testLong(intVar);
|
||||
s2.append(intVar[0]+"\n");
|
||||
intVar[0]=1000;//VarContainer.intVar;
|
||||
intVar[0]=VarContainer.intVar;
|
||||
s.append(intVar[0]+"\n");
|
||||
server.testLong(intVar);
|
||||
s2.append(intVar[0]+"\n");
|
||||
@@ -225,19 +273,15 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
System.err.println("server.testByte");
|
||||
byte[] byteVar = new byte[1];
|
||||
|
||||
byteVar[0]=java.lang.Byte.MIN_VALUE;
|
||||
byteVar[0]=VarContainer.byteMin;
|
||||
s.append(byteVar[0]+"\n");
|
||||
server.testByte(byteVar);
|
||||
s2.append(byteVar[0]+"\n");
|
||||
byteVar[0]=0;
|
||||
byteVar[0]=VarContainer.byteMid;
|
||||
s.append(byteVar[0]+"\n");
|
||||
server.testByte(byteVar);
|
||||
s2.append(byteVar[0]+"\n");
|
||||
byteVar[0]=VarContainer.unsignedByteVar;
|
||||
s.append(byteVar[0]+"\n");
|
||||
server.testByte(byteVar);
|
||||
s2.append(byteVar[0]+"\n");
|
||||
byteVar[0]=java.lang.Byte.MAX_VALUE;
|
||||
byteVar[0]=VarContainer.byteMax;
|
||||
s.append(byteVar[0]+"\n");
|
||||
server.testByte(byteVar);
|
||||
s2.append(byteVar[0]+"\n");
|
||||
@@ -333,7 +377,7 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
s.append(floatVar[0]+"\n");
|
||||
server.testFloat(floatVar);
|
||||
s2.append(floatVar[0]+"\n");
|
||||
floatVar[0]=1000;//VarContainer.floatVar;
|
||||
floatVar[0]=VarContainer.floatVar;
|
||||
s.append(floatVar[0]+"\n");
|
||||
server.testFloat(floatVar);
|
||||
s2.append(floatVar[0]+"\n");
|
||||
@@ -397,49 +441,6 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
}
|
||||
|
||||
|
||||
private void testChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testChar");
|
||||
char[] charVar = new char[1];
|
||||
|
||||
charVar[0]='0';
|
||||
s.append(charVar[0]+"\n");
|
||||
server.testChar(charVar);
|
||||
s2.append(charVar[0]+"\n");
|
||||
charVar[0]='Z';
|
||||
s.append(charVar[0]+"\n");
|
||||
server.testChar(charVar);
|
||||
s2.append(charVar[0]+"\n");
|
||||
charVar[0]='x';
|
||||
server.testChar(charVar);
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.char");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.char");
|
||||
}
|
||||
|
||||
|
||||
private void testWChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testWChar");
|
||||
char[] wcharVar = new char[1];
|
||||
|
||||
wcharVar[0]='0';
|
||||
s.append(wcharVar[0]+"\n");
|
||||
server.testWChar(wcharVar);
|
||||
s2.append(wcharVar[0]+"\n");
|
||||
wcharVar[0]='Z';
|
||||
s.append(wcharVar[0]+"\n");
|
||||
server.testWChar(wcharVar);
|
||||
s2.append(wcharVar[0]+"\n");
|
||||
// wcharVar[0]='x';
|
||||
// server.testWChar(wcharVar);
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.wchar");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.wchar");
|
||||
}
|
||||
|
||||
|
||||
private void testString() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
@@ -447,7 +448,7 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
System.err.println("server.testString");
|
||||
String[] stringVar = new String[1];
|
||||
|
||||
stringVar[0]="111";//VarContainer.charPVar;
|
||||
stringVar[0]=null;//VarContainer.charPVar;
|
||||
s.append(stringVar[0]+"\n");
|
||||
server.testString(stringVar);
|
||||
s2.append(stringVar[0]+"\n");
|
||||
@@ -455,19 +456,16 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
s.append(stringVar[0]+"\n");
|
||||
server.testString(stringVar);
|
||||
s2.append(stringVar[0]+"\n");
|
||||
stringVar[0]="NULL string";
|
||||
stringVar[0]="112";
|
||||
s.append(stringVar[0]+"\n");
|
||||
server.testString(stringVar);
|
||||
s2.append(stringVar[0]+"\n");
|
||||
// stringVar[0]="112";
|
||||
// server.testString(stringVar);
|
||||
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.string");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.string");
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void testWString() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
@@ -482,12 +480,10 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
s.append(wstringVar[0]+"\n");
|
||||
server.testWString(wstringVar);
|
||||
s2.append(wstringVar[0]+"\n");
|
||||
wstringVar[0]="NULL string";
|
||||
wstringVar[0]=null;
|
||||
s.append(wstringVar[0]+"\n");
|
||||
server.testWString(wstringVar);
|
||||
s2.append(wstringVar[0]+"\n");
|
||||
// wstringVar[0]="112";
|
||||
// server.testWString(wstringVar);
|
||||
printResult(s.toString(),"j2x.inout.client.wstring");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.wstring");
|
||||
}
|
||||
@@ -555,6 +551,18 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
printResult(s.toString(),"j2x.inout.client.charArray");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.charArray");
|
||||
}
|
||||
|
||||
private void testObject() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testObject");
|
||||
iJ2XINOUTServerTestComponent[] objectVar= new iJ2XINOUTServerTestComponent[1];
|
||||
objectVar[0] = server;
|
||||
|
||||
printResult("!!!Right string!!!","j2x.inout.client.object"); //!!!Mat' Mat'
|
||||
server.testObject(objectVar);
|
||||
objectVar[0].testObj2();
|
||||
}
|
||||
|
||||
private void testMixed() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
@@ -569,12 +577,7 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
int[] uintVar=new int[1];
|
||||
char[] charVar=new char[1];
|
||||
long[] ulongVar=new long[1];
|
||||
float[] floatVar=new float[1];
|
||||
double[] doubleVar=new double[1];
|
||||
int count=3;
|
||||
String[] stringVar=new String[1];
|
||||
boolean[] boolVar=new boolean[1];
|
||||
int[][] intAVar=new int[1][3];
|
||||
|
||||
shortVar[0]=VarContainer.shortVar;
|
||||
intVar[0]=VarContainer.intVar;
|
||||
@@ -583,46 +586,26 @@ public class J2XINOUTClientTestComponent implements iJ2XINOUTClientTestComponent
|
||||
ushortVar[0]=VarContainer.unsignedShortVar;
|
||||
uintVar[0]=VarContainer.unsignedIntVar;
|
||||
ulongVar[0]=VarContainer.unsignedLongVar;
|
||||
floatVar[0]=VarContainer.floatVar;
|
||||
doubleVar[0]=VarContainer.doubleVar;
|
||||
boolVar[0]=VarContainer.booleanVar;
|
||||
charVar[0]=VarContainer.charVar;
|
||||
stringVar[0]=VarContainer.charPVar;
|
||||
intAVar[0][0]=333;
|
||||
intAVar[0][1]=444;
|
||||
intAVar[0][2]=555;
|
||||
|
||||
s.append(boolVar[0]+"\n"+charVar[0]+"\n"+byteVar[0]+"\n"+
|
||||
s.append(charVar[0]+"\n"+byteVar[0]+"\n"+
|
||||
shortVar[0]+"\n"+ushortVar[0]+"\n"+intVar[0]+"\n"+
|
||||
uintVar[0]+"\n"+longVar[0]+"\n"+ulongVar[0]+"\n"+
|
||||
floatVar[0]+"\n"+doubleVar[0]+"\n"+stringVar[0]+"\n"+
|
||||
intAVar[0][0]+"\n"+intAVar[0][1]+"\n"+intAVar[0][2]+"\n");
|
||||
stringVar[0]+"\n");
|
||||
|
||||
server.testMixed(boolVar, charVar, byteVar, shortVar, ushortVar,
|
||||
intVar, uintVar, longVar, ulongVar, floatVar,
|
||||
doubleVar, stringVar, count, intAVar);
|
||||
server.testMixed(charVar, byteVar, shortVar, ushortVar,
|
||||
intVar, uintVar, longVar, ulongVar, stringVar);
|
||||
|
||||
s2.append(boolVar[0]+"\n"+charVar[0]+"\n"+byteVar[0]+"\n"+
|
||||
s2.append(charVar[0]+"\n"+byteVar[0]+"\n"+
|
||||
shortVar[0]+"\n"+ushortVar[0]+"\n"+intVar[0]+"\n"+
|
||||
uintVar[0]+"\n"+longVar[0]+"\n"+ulongVar[0]+"\n"+
|
||||
floatVar[0]+"\n"+doubleVar[0]+"\n"+stringVar[0]+"\n"+
|
||||
intAVar[0][0]+"\n"+intAVar[0][1]+"\n"+intAVar[0][2]+"\n");
|
||||
stringVar[0]+"\n");
|
||||
|
||||
printResult(s.toString(),"j2x.inout.client.mixed");
|
||||
printResult(s2.toString(),"j2x.inout.xclient.mixed");
|
||||
}
|
||||
|
||||
private void testObject() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
StringBuffer s2 = new StringBuffer();
|
||||
System.err.println("server.testObject");
|
||||
iJ2XINOUTServerTestComponent[] objectVar= new iJ2XINOUTServerTestComponent[1];
|
||||
objectVar[0] = server;
|
||||
|
||||
printResult("!!!Right string!!!","j2x.inout.client.object"); //!!!Mat' Mat'
|
||||
server.testObject(objectVar);
|
||||
objectVar[0].testObj2();
|
||||
}
|
||||
|
||||
public Object queryInterface(IID iid) {
|
||||
System.out.println("DEbug:avm:J2XINOUTClientTestComponent::queryInterface iid="+iid);
|
||||
|
||||
@@ -31,22 +31,26 @@ JAVA_OR_NSJVM=1
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XINOUTClientTestComponent.java
|
||||
|
||||
JAVAI_SRC = \
|
||||
iJ2XINOUTClientTestComponent.java
|
||||
J2XINOUTClientTestComponent.jar.comp: manifest javai J2XINOUTClientTestComponent.class
|
||||
#JAVAI_SRC = \
|
||||
# iJ2XINOUTClientTestComponent.java
|
||||
J2XINOUTClientTestComponent.jar.comp: manifest J2XINOUTClientTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm J2XINOUTClientTestComponent.jar.comp manifest *.class
|
||||
|
||||
J2XINOUTClientTestComponent.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: J2XINOUTClientTestComponent.jar.comp J2XINOUTClientTestComponent.jar.info
|
||||
cp -f J2XINOUTClientTestComponent.jar* $(DIST)/bin/components
|
||||
@@ -55,3 +59,4 @@ clobber::
|
||||
rm -f $(DIST)/bin/components/J2XINOUTClientTestComponent.jar.*
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
rm -f $(DIST)/../classes/J2XINOUTClientTestComponent.class
|
||||
|
||||
@@ -29,19 +29,25 @@ VPATH = .
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
MODULE=J2XINOUTClientTestComponent
|
||||
COMPONENT=1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
XPIDLSRCS = \
|
||||
.\iJ2XINOUTClientTestComponent.idl \
|
||||
$(NULL)
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XINOUTClientTestComponent.java
|
||||
|
||||
JAVAI_SRC = \
|
||||
iJ2XINOUTClientTestComponent.java
|
||||
J2XINOUTClientTestComponent.java \
|
||||
$(NULL)
|
||||
|
||||
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>
|
||||
|
||||
J2XINOUTClientTestComponent.jar.comp: manifest J2XINOUTClientTestComponent.class
|
||||
$(JDKHOME)\bin\jar cvfm J2XINOUTClientTestComponent.jar.comp manifest *.class
|
||||
@@ -49,18 +55,13 @@ J2XINOUTClientTestComponent.jar.comp: manifest J2XINOUTClientTestComponent.clas
|
||||
J2XINOUTClientTestComponent.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 J2XINOUTClientTestComponent.jar.comp J2XINOUTClientTestComponent.jar.info $(DLL)
|
||||
install-component: J2XINOUTClientTestComponent.jar.comp J2XINOUTClientTestComponent.jar.info $(DLL)
|
||||
copy J2XINOUTClientTestComponent.jar* $(DIST)\bin\components
|
||||
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\J2XINOUTClientTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINOUTServerTestComponent.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XINOUTClientTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
-del /f $(DIST)\..\classes\J2XINOUTClientTestComponent.class
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
DEPTH = ..\..\..\..\..\..
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
@@ -28,8 +28,8 @@ VPATH = .
|
||||
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
/**
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -97,6 +97,10 @@ public class J2XOUTClientTestComponent implements iJ2XOUTClientTestComponent, iC
|
||||
return;
|
||||
}
|
||||
|
||||
if(!exclusionHash.containsKey("char"))
|
||||
testChar();
|
||||
if(!exclusionHash.containsKey("wchar"))
|
||||
testWChar();
|
||||
if(!exclusionHash.containsKey("short"))
|
||||
testShort();
|
||||
if(!exclusionHash.containsKey("long"))
|
||||
@@ -262,24 +266,62 @@ private void testBoolean() {
|
||||
printResult(s.toString(),"j2x.out.client.boolean");
|
||||
server.flush("boolean");
|
||||
}
|
||||
|
||||
/*
|
||||
//server.testChar(charVar);
|
||||
//server.testWChar(charVar);
|
||||
*/
|
||||
private void testString() {
|
||||
|
||||
|
||||
private void testChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
char [] charVar = new char[1];
|
||||
System.err.println("server.testChar");
|
||||
server.testChar(charVar);
|
||||
s.append(charVar[0]+"\n");
|
||||
printResult(s.toString(),"j2x.out.client.char");
|
||||
server.flush("char");
|
||||
}
|
||||
|
||||
private void testWChar() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
char [] wcharVar = new char[1];
|
||||
System.err.println("server.testWChar");
|
||||
server.testWChar(wcharVar);
|
||||
s.append(wcharVar[0]+"\n");
|
||||
printResult(s.toString(),"j2x.out.client.wchar");
|
||||
server.flush("wchar");
|
||||
}
|
||||
|
||||
private void testString() {
|
||||
/* StringBuffer s = new StringBuffer();
|
||||
String[] stringVar = new String[1];
|
||||
server.testString(stringVar);
|
||||
s.append(stringVar[0]+"\n");
|
||||
printResult(s.toString(),"j2x.out.client.string");
|
||||
server.flush("string");
|
||||
*/
|
||||
StringBuffer s = new StringBuffer();
|
||||
String[] sVar = new String[1];
|
||||
// System.err.println("server.string");
|
||||
server.testString(sVar);
|
||||
System.err.println("-->"+sVar[0]);
|
||||
try{
|
||||
while(!sVar[0].equals("112")) {
|
||||
s.append(sVar[0]+"\n");
|
||||
server.testString(sVar);
|
||||
System.err.println("-->"+sVar[0]);
|
||||
}
|
||||
}catch(Exception e) {
|
||||
s.append("null"+"\n");
|
||||
|
||||
}
|
||||
printResult(s.toString(),"j2x.out.client.string");
|
||||
server.flush("string");
|
||||
}
|
||||
|
||||
private void testsWstring() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
String[] stringVar = new String[1];
|
||||
server.testWString(stringVar);
|
||||
s.append(stringVar[0]+"\n");
|
||||
server.testWString(stringVar);
|
||||
s.append(stringVar[0]+"\n");
|
||||
printResult(s.toString(),"j2x.out.client.wstring");
|
||||
server.flush("wstring");
|
||||
}
|
||||
@@ -297,8 +339,8 @@ private void testStringArray() {
|
||||
}
|
||||
private void testLongArray() {
|
||||
StringBuffer s = new StringBuffer();
|
||||
int[][] intArray = new int[1][100];
|
||||
int count = 100;
|
||||
int[][] intArray = new int[1][3];
|
||||
int count = 3;
|
||||
server.testLongArray(count, intArray);
|
||||
for(int i=0;i<count;i++) {
|
||||
s.append(intArray[0][i]+"\n");
|
||||
@@ -307,8 +349,8 @@ private void testLongArray() {
|
||||
|
||||
}
|
||||
private void testCharArray() {
|
||||
char[][] charArray = new char[1][100];
|
||||
int count = 100;
|
||||
char[][] charArray = new char[1][6];
|
||||
int count = 6;
|
||||
StringBuffer s = new StringBuffer();
|
||||
server.testCharArray(count, charArray);
|
||||
for(int i=0;i<count;i++) {
|
||||
@@ -330,7 +372,7 @@ private void testCharArray() {
|
||||
float[] fFloat = new float[1];
|
||||
double[] fDouble = new double[1];
|
||||
String[] aString = new String[1];
|
||||
int count = 5;
|
||||
int count = 3;
|
||||
int[][] longArray = new int[1][count];
|
||||
server.testMixed(bBool, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, aString, count, longArray);
|
||||
StringBuffer s = new StringBuffer();
|
||||
|
||||
@@ -31,22 +31,26 @@ JAVA_OR_NSJVM=1
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XOUTClientTestComponent.java
|
||||
|
||||
JAVAI_SRC = \
|
||||
iJ2XOUTClientTestComponent.java
|
||||
J2XOUTClientTestComponent.jar.comp: manifest javai J2XOUTClientTestComponent.class
|
||||
#JAVAI_SRC = \
|
||||
# iJ2XOUTClientTestComponent.java
|
||||
J2XOUTClientTestComponent.jar.comp: manifest J2XOUTClientTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm J2XOUTClientTestComponent.jar.comp manifest *.class
|
||||
|
||||
J2XOUTClientTestComponent.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: J2XOUTClientTestComponent.jar.comp J2XOUTClientTestComponent.jar.info
|
||||
cp -f J2XOUTClientTestComponent.jar* $(DIST)/bin/components
|
||||
@@ -55,3 +59,4 @@ clobber::
|
||||
rm -f $(DIST)/bin/components/J2XOUTClientTestComponent.jar.*
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
rm -f $(DIST)/../classes/J2XOUTClientTestComponent.class
|
||||
|
||||
@@ -29,18 +29,25 @@ VPATH = .
|
||||
MAKE_OBJ_TYPE=DLL
|
||||
MODULE=J2XOUTClientTestComponent
|
||||
COMPONENT=1
|
||||
JAVA_OR_NSJVM=1
|
||||
NO_CAFE=1
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
XPIDLSRCS = \
|
||||
.\iJ2XOUTClientTestComponent.idl \
|
||||
$(NULL)
|
||||
|
||||
JAVA_SRC = \
|
||||
J2XOUTClientTestComponent.java
|
||||
J2XOUTClientTestComponent.java \
|
||||
$(NULL)
|
||||
|
||||
JAVAI_SRC = \
|
||||
iJ2XOUTClientTestComponent.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>
|
||||
|
||||
J2XOUTClientTestComponent.jar.comp: manifest J2XOUTClientTestComponent.class
|
||||
$(JDKHOME)\bin\jar cvfm J2XOUTClientTestComponent.jar.comp manifest *.class
|
||||
@@ -48,18 +55,13 @@ J2XOUTClientTestComponent.jar.comp: manifest J2XOUTClientTestComponent.class
|
||||
J2XOUTClientTestComponent.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 J2XOUTClientTestComponent.jar.comp J2XOUTClientTestComponent.jar.info $(DLL)
|
||||
install-component: J2XOUTClientTestComponent.jar.comp J2XOUTClientTestComponent.jar.info $(DLL)
|
||||
copy J2XOUTClientTestComponent.jar* $(DIST)\bin\components
|
||||
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\J2XOUTClientTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XOUTServerTestComponent.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iJ2XOUTClientTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
-del /f $(DIST)\..\classes\J2XOUTClientTestComponent.class
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
DEPTH = ..\..\..\..\..\..
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
@@ -28,8 +28,8 @@ VPATH = .
|
||||
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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();
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
DEPTH = ..\..\..\..\..\..
|
||||
|
||||
DIRS= \
|
||||
java \
|
||||
cpp \
|
||||
cpp \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
@@ -18,6 +18,9 @@
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Client QA Team, St. Petersburg, Russia
|
||||
#
|
||||
|
||||
|
||||
DEPTH=../../../../..
|
||||
topsrcdir = $(DEPTH)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -37,9 +37,9 @@ CPPSRCS = \
|
||||
X2JINClientTestComponent.cpp \
|
||||
X2JINClientTestComponentFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
XPIDLSRCS = iX2JINClientTestComponent.idl
|
||||
|
||||
JAVAI = iX2JINClientTestComponent.class
|
||||
DSO_LDOPTS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
@@ -47,7 +47,3 @@ DSO_LDOPTS += \
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
$(JAVAI)::
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DIST)/classes -d $(DIST)/classes $<
|
||||
|
||||
install:: $(JAVAI)
|
||||
|
||||
@@ -424,11 +424,25 @@
|
||||
_wstring=cstr->ToNewUnicode();
|
||||
|
||||
nsString str = *(new nsString(_wstring));
|
||||
|
||||
NS_ALLOC_STR_BUF(aBuf,str,14)
|
||||
{
|
||||
NS_ALLOC_STR_BUF(aBuf,str,256)
|
||||
val=PR_sprintf_append(val,"%s\n",aBuf);
|
||||
NS_FREE_STR_BUF(aBuf)
|
||||
}
|
||||
serverComponent->TestWString(_wstring);
|
||||
|
||||
|
||||
_string=NULL;
|
||||
|
||||
cstr=new nsCString(_string);
|
||||
_wstring=cstr->ToNewUnicode();
|
||||
|
||||
str = *(new nsString(_wstring));
|
||||
{
|
||||
NS_ALLOC_STR_BUF(aBuf1,str,256)
|
||||
val=PR_sprintf_append(val,"%s\n",aBuf1);
|
||||
NS_FREE_STR_BUF(aBuf1)
|
||||
}
|
||||
serverComponent->TestWString(_wstring);
|
||||
|
||||
PrintResult("x2j.in.client.wstring",val);
|
||||
|
||||
@@ -48,4 +48,5 @@ install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
clobber::
|
||||
del /f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
del /f $(DIST)\bin\components\X2JIN*.xpt
|
||||
del /f $(DIST)\bin\components\X2JINC*.xpt
|
||||
del /f $(DIST)\bin\components\X2JINS*.xpt
|
||||
|
||||
@@ -31,25 +31,19 @@ JAVA_OR_NSJVM = 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
export::
|
||||
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) -d $(JAVA_DESTPATH) iX2JINServerTestComponent.java
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
JAVA_SRC=X2JINServerTestComponent.java
|
||||
|
||||
JAVAI_SRC=iX2JINServerTestComponent.java
|
||||
X2JINServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) X2JINServerTestComponent.java
|
||||
|
||||
X2JINServerTestComponent.jar.comp: manifest X2JINServerTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm X2JINServerTestComponent.jar.comp manifest *.class
|
||||
|
||||
X2JINServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes $(JAVA_SRC)
|
||||
|
||||
javai::
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI_SRC)
|
||||
|
||||
|
||||
install-component: javai X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info
|
||||
cp -f X2JINServerTestComponent.jar* $(DIST)/bin/components
|
||||
|
||||
clobber::
|
||||
|
||||
@@ -271,7 +271,7 @@ System.out.println("TESTOBJ");
|
||||
* C++ client side.
|
||||
*/
|
||||
public void testIID(IID iid) {
|
||||
S=S+iid.toString()+"\n";
|
||||
S=S+iid.getString()+"\n";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -279,7 +279,7 @@ System.out.println("TESTOBJ");
|
||||
* C++ client side.
|
||||
*/
|
||||
public void testCID(CID cid) {
|
||||
S=S+cid.toString()+"\n";
|
||||
S=S+cid.getString()+"\n";
|
||||
//CID c=new CID("1ddc5b10-9852-11d4-aa22-00a024a8bbac");
|
||||
}
|
||||
|
||||
|
||||
@@ -43,8 +43,8 @@ X2JINServerTestComponent.jar.comp: manifest iX2JINServerTestComponent.class X2JI
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
.java.class:
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JINServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JINServerTestComponent.java
|
||||
|
||||
install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info $(DLL)
|
||||
copy X2JINServerTestComponent.jar* $(DIST)\bin\components
|
||||
@@ -52,6 +52,6 @@ install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.ja
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\X2JINServerTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iX2JINServerTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
|
||||
@@ -37,9 +37,9 @@ CPPSRCS = \
|
||||
X2JINOUTClientTestComponent.cpp \
|
||||
X2JINOUTClientTestComponentFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
XPIDLSRCS = iX2JINOUTClientTestComponent.idl
|
||||
|
||||
JAVAI = iX2JINOUTClientTestComponent.class
|
||||
DSO_LDOPTS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
@@ -47,7 +47,3 @@ DSO_LDOPTS += \
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
$(JAVAI)::
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DIST)/classes -d $(DIST)/classes $<
|
||||
|
||||
install:: $(JAVAI)
|
||||
|
||||
@@ -492,6 +492,23 @@ void X2JINOUTClientTestComponentImpl::TestWString(){
|
||||
NS_FREE_STR_BUF(aBuf2)
|
||||
}
|
||||
|
||||
_string=NULL;
|
||||
cstr=new nsCString(_string);
|
||||
_wstring=cstr->ToNewUnicode();
|
||||
str = *(new nsString(_wstring));
|
||||
{
|
||||
NS_ALLOC_STR_BUF(aBuf5,str,100)
|
||||
val=PR_sprintf_append(val,"%s\n",aBuf5);
|
||||
NS_FREE_STR_BUF(aBuf5)
|
||||
}
|
||||
serverComponent->TestWString(&_wstring);
|
||||
str = *(new nsString(_wstring));
|
||||
{
|
||||
NS_ALLOC_STR_BUF(aBuf6,str,100)
|
||||
xval=PR_sprintf_append(xval,"%s\n",aBuf6);
|
||||
NS_FREE_STR_BUF(aBuf6)
|
||||
}
|
||||
|
||||
_string="Test string.";
|
||||
cstr=new nsCString(_string);
|
||||
_wstring=cstr->ToNewUnicode();
|
||||
|
||||
@@ -35,21 +35,18 @@ include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
JAVA_SRC=X2JINOUTServerTestComponent.java
|
||||
|
||||
JAVAI_SRC=iX2JINOUTServerTestComponent.java
|
||||
X2JINOUTServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) X2JINOUTServerTestComponent.java
|
||||
|
||||
X2JINOUTServerTestComponent.jar.comp: manifest X2JINOUTServerTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm X2JINOUTServerTestComponent.jar.comp manifest *.class
|
||||
|
||||
X2JINOUTServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes $(JAVA_SRC)
|
||||
|
||||
javai::
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI_SRC)
|
||||
export::
|
||||
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) -d $(DEPTH)/dist/classes iX2JINOUTServerTestComponent.java
|
||||
|
||||
|
||||
install-component: javai X2JINOUTServerTestComponent.jar.comp X2JINOUTServerTestComponent.jar.info
|
||||
|
||||
install-component: X2JINOUTServerTestComponent.jar.comp X2JINOUTServerTestComponent.jar.info
|
||||
cp -f X2JINOUTServerTestComponent.jar* $(DIST)/bin/components
|
||||
|
||||
clobber::
|
||||
|
||||
@@ -41,8 +41,8 @@ X2JINOUTServerTestComponent.jar.comp: manifest iX2JINOUTServerTestComponent.clas
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
.java.class:
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JINOUTServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JINOUTServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JINOUTServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JINOUTServerTestComponent.java
|
||||
|
||||
install-component: X2JINOUTServerTestComponent.jar.comp X2JINOUTServerTestComponent.jar.info $(DLL)
|
||||
copy X2JINOUTServerTestComponent.jar* $(DIST)\bin\components
|
||||
@@ -50,6 +50,6 @@ install-component: X2JINOUTServerTestComponent.jar.comp X2JINOUTServerTestCompon
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\X2JINOUTServerTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iX2JINOUTServerTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
|
||||
@@ -39,15 +39,9 @@ CPPSRCS = \
|
||||
$(NULL)
|
||||
XPIDLSRCS = iX2JOUTClientTestComponent.idl
|
||||
|
||||
JAVAI = iX2JOUTClientTestComponent.class
|
||||
DSO_LDOPTS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
$(JAVAI)::
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DIST)/classes -d $(DIST)/classes $<
|
||||
|
||||
install:: $(JAVAI)
|
||||
|
||||
@@ -455,10 +455,10 @@ void X2JOUTClientTestComponentImpl::TestObject(){
|
||||
PrintResult("x2j.out.client.object","!!!Right string!!!");
|
||||
}
|
||||
|
||||
/*
|
||||
void X2JOUTClientTestComponentImpl::TestIID() {
|
||||
|
||||
// void X2JOUTClientTestComponentImpl::TestIID() {
|
||||
|
||||
/* const nsIID& iid=NS_GET_IID(iX2JOUTServerTestComponent);
|
||||
const nsIID& iid=NS_GET_IID(iX2JOUTServerTestComponent);
|
||||
val=NULL;
|
||||
|
||||
val=iid.ToString();
|
||||
@@ -466,9 +466,9 @@ void X2JOUTClientTestComponentImpl::TestObject(){
|
||||
val=PR_sprintf_append(val,"%s\n",val);
|
||||
PrintResult("x2j.out.client.iid",val);
|
||||
serverComponent->TestIID(&iid);
|
||||
*/
|
||||
// }
|
||||
|
||||
}
|
||||
*/
|
||||
// void X2JOUTClientTestComponentImpl::TestCID() {
|
||||
/*
|
||||
NS_DEFINE_CID(cid,X2JOUTCLIENTTESTCOMPONENT_CID);
|
||||
|
||||
@@ -30,21 +30,16 @@ XPIDL_MODULE = X2JOUTServerTestComponent
|
||||
JAVA_OR_NSJVM = 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
X2JOUTServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes X2JOUTServerTestComponent.java
|
||||
|
||||
JDIRS=.
|
||||
|
||||
X2JOUTServerTestComponent.jar.comp: manifest iX2JOUTServerTestComponent.class X2JOUTServerTestComponent.class
|
||||
X2JOUTServerTestComponent.jar.comp: manifest X2JOUTServerTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm X2JOUTServerTestComponent.jar.comp manifest *.class
|
||||
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
.java.class:
|
||||
export::
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes iX2JOUTServerTestComponent.java
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes X2JOUTServerTestComponent.java
|
||||
|
||||
install-component: X2JOUTServerTestComponent.jar.comp X2JOUTServerTestComponent.jar.info
|
||||
cp -f X2JOUTServerTestComponent.jar* $(DIST)/bin/components
|
||||
|
||||
@@ -316,7 +316,7 @@ public class X2JOUTServerTestComponent implements iX2JOUTServerTestComponent {
|
||||
public void testWString(String[] i) {
|
||||
switch (all) {
|
||||
case 0: i[0]=""; break;
|
||||
case 1: i[0]="Null must be here"; break;
|
||||
case 1: i[0]=null; break;
|
||||
case 2: i[0]="abc"; break;
|
||||
}
|
||||
all++;
|
||||
|
||||
@@ -56,7 +56,7 @@ interface iX2JOUTServerTestComponent : nsISupports {
|
||||
[array, size_is(count)] out long intArray);
|
||||
void testObject(out iX2JOUTServerTestComponent obj);
|
||||
void testObj();
|
||||
// void testIID(out nsIIDRef iid);
|
||||
// void testIID(out nsIIDRef aNameRef);
|
||||
// void testCID(out nsCIDRef cid);
|
||||
|
||||
};
|
||||
|
||||
@@ -39,15 +39,9 @@ CPPSRCS = \
|
||||
$(NULL)
|
||||
XPIDLSRCS = iX2JRETClientTestComponent.idl
|
||||
|
||||
JAVAI = iX2JRETClientTestComponent.class
|
||||
DSO_LDOPTS += \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
$(JAVAI)::
|
||||
$(JDKHOME)/bin/javac -classpath .:$(DIST)/classes -d $(DIST)/classes $<
|
||||
|
||||
install:: $(JAVAI)
|
||||
|
||||
@@ -30,21 +30,16 @@ XPIDL_MODULE = X2JRETServerTestComponent
|
||||
JAVA_OR_NSJVM = 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
X2JRETServerTestComponent.class:
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes X2JRETServerTestComponent.java
|
||||
|
||||
JDIRS=.
|
||||
|
||||
X2JRETServerTestComponent.jar.comp: manifest iX2JRETServerTestComponent.class X2JRETServerTestComponent.class
|
||||
X2JRETServerTestComponent.jar.comp: manifest X2JRETServerTestComponent.class
|
||||
$(JDKHOME)/bin/jar cvfm X2JRETServerTestComponent.jar.comp manifest *.class
|
||||
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
.java.class:
|
||||
export::
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes iX2JRETServerTestComponent.java
|
||||
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes X2JRETServerTestComponent.java
|
||||
|
||||
install-component: X2JRETServerTestComponent.jar.comp X2JRETServerTestComponent.jar.info
|
||||
cp -f X2JRETServerTestComponent.jar* $(DIST)/bin/components
|
||||
|
||||
@@ -327,7 +327,7 @@ public class X2JRETServerTestComponent implements iX2JRETServerTestComponent {
|
||||
switch (all) {
|
||||
case 0: _string=""; break;
|
||||
case 1: _string="abc"; break;
|
||||
case 2: _string="NULL string must be here"; break;
|
||||
case 2: _string=null; break;
|
||||
}
|
||||
all++;
|
||||
S=S+_string+"\n";
|
||||
@@ -347,7 +347,7 @@ public class X2JRETServerTestComponent implements iX2JRETServerTestComponent {
|
||||
switch (all) {
|
||||
case 0: _wstring=""; break;
|
||||
case 1: _wstring="abc"; break;
|
||||
case 2: _wstring="ctrl"; break;
|
||||
case 2: _wstring=null; break;
|
||||
}
|
||||
all++;
|
||||
S=S+_wstring+"\n";
|
||||
|
||||
@@ -44,8 +44,8 @@ X2JRETServerTestComponent.jar.comp: manifest iX2JRETServerTestComponent.class X2
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
.java.class:
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JRETServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JRETServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JRETServerTestComponent.java
|
||||
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JRETServerTestComponent.java
|
||||
|
||||
install-component: X2JRETServerTestComponent.jar.comp X2JRETServerTestComponent.jar.info $(DLL)
|
||||
copy X2JRETServerTestComponent.jar* $(DIST)\bin\components
|
||||
@@ -53,6 +53,6 @@ install-component: X2JRETServerTestComponent.jar.comp X2JRETServerTestComponent.
|
||||
clobber::
|
||||
-del /f *.class *.jar.comp
|
||||
-del /f $(DIST)\bin\components\X2JRETServerTestComponent.jar.*
|
||||
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iX2JRETServerTestComponent.*
|
||||
|
||||
clobber_all:: clobber
|
||||
install:: install-component
|
||||
|
||||
Reference in New Issue
Block a user