paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete unnecessary file generation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@590 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa 2008-10-09 16:35:03 +00:00
parent 170b2a730f
commit 57c2b5443f
11 changed files with 90 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wst/trunk/tests/test_suite/test_generators.pas
View File

@ -112,7 +112,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_properties_default.xsd');
//WriteXMLFile(locDoc,'.\class_properties_default.xsd');
locExistDoc := LoadXmlFromFilesList('class_properties_default.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -183,7 +183,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_properties_extended_metadata.xsd');
//WriteXMLFile(locDoc,'.\class_properties_extended_metadata.xsd');
locExistDoc := LoadXmlFromFilesList('class_properties_extended_metadata.xsd');
Check(CompareNodes(locExistDoc,locDoc),'generated document differs from the existent one.');
finally
@ -253,7 +253,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_extent_native_type.xsd');
//WriteXMLFile(locDoc,'.\class_extent_native_type.xsd');
locExistDoc := LoadXmlFromFilesList('class_extent_native_type.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -326,7 +326,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_headerblock_derived.xsd');
//WriteXMLFile(locDoc,'.\class_headerblock_derived.xsd');
locExistDoc := LoadXmlFromFilesList('class_headerblock_derived.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -389,7 +389,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_headerblock_simplecontent_derived.xsd');
//WriteXMLFile(locDoc,'.\class_headerblock_simplecontent_derived.xsd');
locExistDoc := LoadXmlFromFilesList('class_headerblock_simplecontent_derived.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -450,7 +450,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'.\class_widestring_property.xsd');
//WriteXMLFile(locDoc,'.\class_widestring_property.xsd');
locExistDoc := LoadXmlFromFilesList('class_widestring_property.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -555,7 +555,7 @@ begin
locDoc := CreateDoc();
g := CreateGenerator(locDoc);
g.Execute(tr,mdl.Name);
WriteXMLFile(locDoc,'array_sequence_collection.xsd');
//WriteXMLFile(locDoc,'array_sequence_collection.xsd');
locExistDoc := LoadXmlFromFilesList('array_sequence_collection.xsd');
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -566,16 +566,8 @@ begin
end;
function TTest_CustomXsdGenerator.LoadXmlFromFilesList(const AFileName: string): TXMLDocument;
var
locFileName : string;
begin
{$IFDEF FPC}
locFileName := Format('.%sfiles%s%s',[PathDelim,PathDelim,AFileName]);
{$ENDIF}
{$IFDEF DELPHI}
locFileName := Format('..%sfiles%s%s',[PathDelim,PathDelim,AFileName]);
{$ENDIF}
ReadXMLFile(Result,locFileName);
ReadXMLFile(Result,wstExpandLocalFileName(TestFilesPath + AFileName));
end;
{ TTest_XsdGenerator }

8
wst/trunk/tests/test_suite/test_generators_runtime.pas
View File

@ -140,7 +140,7 @@ begin
RegisterFondamentalTypesHandler(handlerReg);
locDoc := CreateDoc();
GenerateWSDL(locRep,locDoc,typeReg,handlerReg);
WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_complex_type_derivation.wsdl'));
//WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_complex_type_derivation.wsdl'));
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'wsdl_gen_complex_type_derivation.wsdl'));
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -173,7 +173,7 @@ begin
RegisterFondamentalTypesHandler(handlerReg);
locDoc := CreateDoc();
GenerateWSDL(locRep,locDoc,typeReg,handlerReg);
WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_enum.wsdl'));
//WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_enum.wsdl'));
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'wsdl_gen_generate_enum.wsdl'));
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -207,7 +207,7 @@ begin
RegisterFondamentalTypesHandler(handlerReg);
locDoc := CreateDoc();
GenerateWSDL(locRep,locDoc,typeReg,handlerReg);
WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_array.wsdl'));
//WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_array.wsdl'));
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'wsdl_gen_generate_array.wsdl'));
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally
@ -246,7 +246,7 @@ begin
RegisterFondamentalTypesHandler(handlerReg);
locDoc := CreateDoc();
GenerateWSDL(locRep,locDoc,typeReg,handlerReg);
WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_record.wsdl'));
//WriteXML(locDoc,wstExpandLocalFileName('wsdl_gen_generate_record.wsdl'));
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'wsdl_gen_generate_record.wsdl'));
Check(CompareNodes(locExistDoc.DocumentElement,locDoc.DocumentElement),'generated document differs from the existent one.');
finally

2
wst/trunk/tests/test_suite/test_json.pas
View File

@ -111,7 +111,7 @@ begin
locParser := nil;
strm := TMemoryStream.Create();
try
f.SaveToStream(strm); strm.SaveToFile('TTest_JsonRpcFormatterExceptionBlock.ExceptBlock_server.txt');
f.SaveToStream(strm);
strm.Position := 0;
locParser := TJSONParser.Create(strm);
root := locParser.Parse() as TJSONObject;

12
wst/trunk/tests/test_suite/test_parsers.pas
View File

@ -21,7 +21,7 @@ uses
{$ELSE}
TestFrameWork, xmldom, wst_delphi_xml,
{$ENDIF}
pastree, pascal_parser_intf, xsd_parser, wsdl_parser;
pastree, pascal_parser_intf, xsd_parser, wsdl_parser, test_suite_utils;
type
@ -1466,10 +1466,7 @@ var
prs : IXsdPaser;
fileName : string;
begin
fileName := Format('.%sfiles%s%s.xsd',[PathDelim,PathDelim,ADoc]);
{$IFNDEF FPC}
fileName := Format('..%s%s',[PathDelim,fileName]);
{$ENDIF}
fileName := wstExpandLocalFileName(TestFilesPath + ADoc + '.xsd');
locDoc := LoadXmlFile(fileName);
try
Result := TwstPasTreeContainer.Create();
@ -1589,10 +1586,7 @@ var
prs : IParser;
fileName : string;
begin
fileName := Format('.%sfiles%s%s.wsdl',[PathDelim,PathDelim,ADoc]);
{$IFNDEF FPC}
fileName := Format('..%s%s',[PathDelim,fileName]);
{$ENDIF}
fileName := wstExpandLocalFileName(TestFilesPath + ADoc + '.wsdl');
locDoc := LoadXmlFile(fileName);
try
Result := TwstPasTreeContainer.Create();

13
wst/trunk/tests/test_suite/test_soap_specific.pas
View File

@ -141,12 +141,7 @@ uses
function GetFileFullName(const AFileName: string): string;
begin
{$IFDEF FPC}
Result := Format('.%sfiles%s%s',[PathDelim,PathDelim,AFileName]);
{$ENDIF}
{$IFDEF DELPHI}
Result := Format('..%sfiles%s%s',[PathDelim,PathDelim,AFileName]);
{$ENDIF}
Result := wstExpandLocalFileName(TestFilesPath + AFileName);
end;
function LoadXmlFromFilesList(const AFileName: string): TXMLDocument;
@ -313,7 +308,7 @@ begin
f.EndCallResponse();
strm := TMemoryStream.Create();
f.SaveToStream(strm);
strm.SaveToFile('soap_multi_namespace_object.xml');
//strm.SaveToFile('soap_multi_namespace_object.xml');
strm.Position := 0;
ReadXMLFile(locDoc,strm);
@ -466,7 +461,7 @@ begin
locStream := TMemoryStream.Create();
try
ser.SaveToStream(locStream);
locStream.SaveToFile(wstExpandLocalFileName('write_header_simple_content_1.xml'));
//locStream.SaveToFile(wstExpandLocalFileName('write_header_simple_content_1.xml'));
locStream.Position := 0;
ReadXMLFile(locDoc,locStream);
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'write_header_simple_content_1.xml'));
@ -506,7 +501,7 @@ begin
locStream := TMemoryStream.Create();
try
ser.SaveToStream(locStream);
locStream.SaveToFile(wstExpandLocalFileName('write_header_simple_content_2.xml'));
//locStream.SaveToFile(wstExpandLocalFileName('write_header_simple_content_2.xml'));
locStream.Position := 0;
ReadXMLFile(locDoc,locStream);
ReadXMLFile(locExistDoc,wstExpandLocalFileName(TestFilesPath + 'write_header_simple_content_2.xml'));

2
wst/trunk/tests/test_suite/test_suite_utils.pas
View File

@ -33,7 +33,7 @@ implementation
function wstExpandLocalFileName(const AFileName : string) : string;
begin
Result := AFileName;
Result := ExtractFilePath(ParamStr(0)) + AFileName;
end;
function DumpMemory(AMem : Pointer; const ALength : PtrInt) : ansistring;

12
wst/trunk/tests/test_suite/test_support.pas
View File

@ -22,7 +22,7 @@ uses
TestFrameWork,
{$ENDIF}
TypInfo,
wst_types, base_service_intf, imp_utils;
wst_types, base_service_intf, imp_utils, test_suite_utils;
type
@ -2962,7 +2962,7 @@ begin
locStream := TMemoryStream.Create();
try
locStream.Write(locBuffer[1],Length(locBuffer));
locFileName := 'test_LoadBufferFromFile.bin';
locFileName := wstExpandLocalFileName('test_LoadBufferFromFile.bin');
locStream.SaveToFile(locFileName);
locLoadedBuffer := TBase64StringRemotable.Create();
locLoadedBuffer.LoadFromFile(locFileName);
@ -3023,7 +3023,7 @@ begin
locObj := TBase64StringRemotable.Create();
try
locObj.BinaryData := locBuffer;
locFileName := 'test_LoadBufferFromFile.bin';
locFileName := wstExpandLocalFileName('test_LoadBufferFromFile.bin');
DeleteFile(locFileName);
locObj.SaveToFile(locFileName);
Check(FileExists(locFileName));
@ -3178,7 +3178,7 @@ begin
locStream := TMemoryStream.Create();
try
locStream.Write(locBuffer[1],Length(locBuffer));
locFileName := 'test_LoadBufferFromFile.bin';
locFileName := wstExpandLocalFileName('test_LoadBufferFromFile.bin');
locStream.SaveToFile(locFileName);
locLoadedBuffer := TBase64StringExtRemotable.Create();
locLoadedBuffer.LoadFromFile(locFileName);
@ -3239,7 +3239,7 @@ begin
locObj := TBase64StringExtRemotable.Create();
try
locObj.BinaryData := locBuffer;
locFileName := 'test_LoadBufferFromFile.bin';
locFileName := wstExpandLocalFileName('test_LoadBufferFromFile.bin');
DeleteFile(locFileName);
locObj.SaveToFile(locFileName);
Check(FileExists(locFileName));
@ -3546,7 +3546,7 @@ begin
locStream := TMemoryStream.Create();
try
locStream.Write(locBuffer[1],Length(locBuffer));
locFileName := 'test_LoadBufferFromFile.bin';
locFileName := wstExpandLocalFileName('test_LoadBufferFromFile.bin');
locStream.SaveToFile(locFileName);
locLoadedBuffer := LoadBufferFromFile(locFileName);
Check( locLoadedBuffer = locBuffer );

62
wst/trunk/tests/test_suite/testformatter_unit.pas
View File

@ -748,7 +748,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_AnsiChar.xml');
f.SaveToStream(s);
xVal_1 := #0;
xVal_2 := #0;
@ -840,7 +840,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_WideChar.xml');
f.SaveToStream(s);
xVal_1 := #0;
xVal_2 := #0;
@ -933,7 +933,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_UnicodeChar.xml');
f.SaveToStream(s);
xVal_1 := #0;
xVal_2 := #0;
@ -1026,7 +1026,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.xml');
f.SaveToStream(s);
intVal_U := 0;
intVal_S := 0;
@ -1400,7 +1400,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Single_4.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1436,7 +1436,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Single_4.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1472,7 +1472,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Double_8.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1508,7 +1508,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Double_8.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1544,7 +1544,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Currency_8.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1580,7 +1580,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Currency_8.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1616,7 +1616,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Extended_10.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1652,7 +1652,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Extended_10.xml');
f.SaveToStream(s);
tmpVal := 0;
f := CreateFormatter(TypeInfo(TClass_Float));
@ -1769,7 +1769,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(Self.ClassName + '.' + 'Test_UnicodeString.xml');
f.SaveToStream(s);
locVal_1 := '';
locVal_3 := 'yyyyyyyy';
@ -1811,7 +1811,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(Self.ClassName + '.' + 'Test_WideString.xml');
f.SaveToStream(s);
locVal_1 := '';
locVal_3 := 'yyyyyyyy';
@ -1888,7 +1888,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_Bool.xml');
f.SaveToStream(s);
intVal_1 := False;
intVal_3 := True;
@ -2074,7 +2074,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '_test_int_withclass.xml');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_Int.Create();
@ -2233,7 +2233,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_CplxInt64SimpleContent_WithClass.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2309,7 +2309,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2385,7 +2385,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2461,7 +2461,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2537,7 +2537,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2608,7 +2608,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2671,7 +2671,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2735,7 +2735,7 @@ begin
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.txt');
f.SaveToStream(s);
FreeAndNil(a);
a := TClass_CplxSimpleContent.Create();
@ -2902,7 +2902,7 @@ begin
f.Put('a',TypeInfo(TArrayOfStringRemotable),a);
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_StringArray.xml');
f.SaveToStream(s);
FreeAndNil(a);
a := TArrayOfStringRemotable.Create();
a.SetLength(0);
@ -2966,7 +2966,7 @@ begin
f.Put('b',TypeInfo(TEmbeddedArrayOfStringRemotable),b);
f.EndScope();
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.XML');
f.SaveToStream(s);
FreeAndNil(a);
FreeAndNil(b);
intVal := 0;
@ -3777,7 +3777,7 @@ begin
a.fieldSmallint := 0;
a.fieldString := '';
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_Record_simple.xml');
f.SaveToStream(s);
f := CreateFormatter(TypeInfo(TClass_Int));
s.Position := 0;
@ -3851,7 +3851,7 @@ begin
f.EndScope();
a := VAL_EMPTY_RECORD;
s := TMemoryStream.Create();
f.SaveToStream(s); s.SaveToFile(ClassName + '.Test_Record_nested.xml');
f.SaveToStream(s);
f := CreateFormatter(TypeInfo(TClass_Int));
s.Position := 0;
@ -3929,7 +3929,7 @@ begin
FreeAndNil(intv);
ls := TStringList.Create();
f := CreateFormatter(TypeInfo(TClass_A)); s.SaveToFile(ClassName + '.test_GetScopeItemNames.xml');
f := CreateFormatter(TypeInfo(TClass_A));
s.Position := 0;
f.LoadFromStream(s);
x := 'Root';
@ -4748,7 +4748,7 @@ begin
f.EndExceptionList();
strm := TMemoryStream.Create();
try
f.SaveToStream(strm);strm.SaveToFile('TTest_SoapFormatterExceptionBlock.ExceptBlock.xml');
f.SaveToStream(strm);
strm.Position := 0;
ReadXMLFile(doc,strm);
if FindAttributeByValueInNode(sSOAP_ENV,doc.DocumentElement,nsShortName) or
@ -5048,7 +5048,7 @@ begin
f.EndExceptionList();
strm := TMemoryStream.Create();
try
f.SaveToStream(strm);strm.SaveToFile('TTest_XmlRpcFormatterExceptionBlock.ExceptBlock.xml');
f.SaveToStream(strm);
strm.Position := 0;
ReadXMLFile(doc,strm);
callNode := doc.DocumentElement;

58
wst/trunk/tests/test_suite/wst_test_suite.lpi
View File

@ -1,17 +1,16 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<PathDelim Value="\"/>
<PathDelim Value="/"/>
<Version Value="6"/>
<General>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<IconPath Value=".\"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/>
</General>
<PublishOptions>
<Version Value="2"/>
<DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions>
@ -19,7 +18,7 @@
<local>
<FormatVersion Value="1"/>
<CommandLineParams Value="--suite=TTest_XsdParser"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<Units Count="37">
@ -34,47 +33,47 @@
<UnitName Value="testformatter_unit"/>
</Unit1>
<Unit2>
<Filename Value="..\..\server_service_soap.pas"/>
<Filename Value="../../server_service_soap.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="server_service_soap"/>
</Unit2>
<Unit3>
<Filename Value="..\..\soap_formatter.pas"/>
<Filename Value="../../soap_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="soap_formatter"/>
</Unit3>
<Unit4>
<Filename Value="..\..\base_binary_formatter.pas"/>
<Filename Value="../../base_binary_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_binary_formatter"/>
</Unit4>
<Unit5>
<Filename Value="..\..\base_service_intf.pas"/>
<Filename Value="../../base_service_intf.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_service_intf"/>
</Unit5>
<Unit6>
<Filename Value="..\..\base_soap_formatter.pas"/>
<Filename Value="../../base_soap_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_soap_formatter"/>
</Unit6>
<Unit7>
<Filename Value="..\..\binary_formatter.pas"/>
<Filename Value="../../binary_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="binary_formatter"/>
</Unit7>
<Unit8>
<Filename Value="..\..\binary_streamer.pas"/>
<Filename Value="../../binary_streamer.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="binary_streamer"/>
</Unit8>
<Unit9>
<Filename Value="..\..\server_binary_formatter.pas"/>
<Filename Value="../../server_binary_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="server_binary_formatter"/>
</Unit9>
<Unit10>
<Filename Value="..\..\metadata_repository.pas"/>
<Filename Value="../../metadata_repository.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="metadata_repository"/>
</Unit10>
@ -84,27 +83,27 @@
<UnitName Value="testmetadata_unit"/>
</Unit11>
<Unit12>
<Filename Value="..\..\ws_helper\metadata_generator.pas"/>
<Filename Value="../../ws_helper/metadata_generator.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="metadata_generator"/>
</Unit12>
<Unit13>
<Filename Value="..\..\metadata_wsdl.pas"/>
<Filename Value="../../metadata_wsdl.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="metadata_wsdl"/>
</Unit13>
<Unit14>
<Filename Value="..\..\server_service_intf.pas"/>
<Filename Value="../../server_service_intf.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="server_service_intf"/>
</Unit14>
<Unit15>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Filename Value="../../base_xmlrpc_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_xmlrpc_formatter"/>
</Unit15>
<Unit16>
<Filename Value="..\..\wst_fpc_xml.pas"/>
<Filename Value="../../wst_fpc_xml.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wst_fpc_xml"/>
</Unit16>
@ -114,7 +113,7 @@
<UnitName Value="test_utilities"/>
</Unit17>
<Unit18>
<Filename Value="..\..\server_service_xmlrpc.pas"/>
<Filename Value="../../server_service_xmlrpc.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="server_service_xmlrpc"/>
</Unit18>
@ -124,27 +123,27 @@
<UnitName Value="test_parsers"/>
</Unit19>
<Unit20>
<Filename Value="..\..\ws_helper\wsdl_generator.pas"/>
<Filename Value="../../ws_helper/wsdl_generator.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wsdl_generator"/>
</Unit20>
<Unit21>
<Filename Value="..\..\ws_helper\xsd_generator.pas"/>
<Filename Value="../../ws_helper/xsd_generator.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="xsd_generator"/>
</Unit21>
<Unit22>
<Filename Value="..\..\ws_helper\xsd_consts.pas"/>
<Filename Value="../../ws_helper/xsd_consts.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="xsd_consts"/>
</Unit22>
<Unit23>
<Filename Value="..\..\ws_helper\wsdl_parser.pas"/>
<Filename Value="../../ws_helper/wsdl_parser.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wsdl_parser"/>
</Unit23>
<Unit24>
<Filename Value="..\..\base_json_formatter.pas"/>
<Filename Value="../../base_json_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_json_formatter"/>
</Unit24>
@ -154,7 +153,7 @@
<UnitName Value="test_support"/>
</Unit25>
<Unit26>
<Filename Value="..\..\basex_encode.pas"/>
<Filename Value="../../basex_encode.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="basex_encode"/>
</Unit26>
@ -164,12 +163,12 @@
<UnitName Value="test_basex_encode"/>
</Unit27>
<Unit28>
<Filename Value="..\..\json_formatter.pas"/>
<Filename Value="../../json_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="json_formatter"/>
</Unit28>
<Unit29>
<Filename Value="..\..\server_service_json.pas"/>
<Filename Value="../../server_service_json.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="server_service_json"/>
</Unit29>
@ -212,13 +211,12 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="8"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="wst_test_suite.exe"/>
</Target>
<SearchPaths>
<IncludeFiles Value="..\..\"/>
<OtherUnitFiles Value="..\..\;..\..\ws_helper\;..\..\wst_rtti_filter\;..\..\fcl-json\src\"/>
<IncludeFiles Value="../../"/>
<OtherUnitFiles Value="../../;../../ws_helper/;../../wst_rtti_filter/;../../fcl-json/src/"/>
<UnitOutputDirectory Value="obj"/>
</SearchPaths>
<Parsing>

5
wst/trunk/tests/test_suite/wst_test_suite_gui.lpi
View File

@ -131,9 +131,6 @@
<CompilerOptions>
<Version Value="8"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="wst_test_suite_gui.exe"/>
</Target>
<SearchPaths>
<IncludeFiles Value="..\..\"/>
<OtherUnitFiles Value="..\..\;..\..\ws_helper\;..\..\wst_rtti_filter\;..\..\fcl-json\src\"/>
@ -162,6 +159,8 @@
</Options>
</Linking>
<Other>
<CustomOptions Value="-FE./
"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>

3
wst/trunk/ws_helper/wsdl_parser.pas
View File

@ -202,7 +202,8 @@ begin
if Assigned(FOnMessage) then begin
FOnMessage(AMsgType,AMsg);
end else if IsConsole then begin
GetLogger().Log(AMsgType, AMsg);
if HasLogger() then
GetLogger().Log(AMsgType, AMsg);
end;
end;