You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/05/10 14:33:00 UTC
svn commit: r405735 - in /incubator/tuscany/cpp/sdo: projects/tuscany_sdo/
runtime/core/src/commonj/sdo/ runtime/core/test/
Author: edslattery
Date: Wed May 10 05:32:57 2006
New Revision: 405735
URL: http://svn.apache.org/viewcvs?rev=405735&view=rev
Log:
A minor change to allow a data object to be created open when we encounter an element which contains an element, but has no type specified
Modified:
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/48736_xsd.txt
incubator/tuscany/cpp/sdo/runtime/core/test/b47137b.txt
incubator/tuscany/cpp/sdo/runtime/core/test/b47293.txt
incubator/tuscany/cpp/sdo/runtime/core/test/b48633b_xsd.txt
incubator/tuscany/cpp/sdo/runtime/core/test/b48686_xsd.txt
incubator/tuscany/cpp/sdo/runtime/core/test/bug48300_xsd.txt
incubator/tuscany/cpp/sdo/runtime/core/test/inc1.txt
incubator/tuscany/cpp/sdo/runtime/core/test/inc2.txt
incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/maintest.txt
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/teststyles.txt
incubator/tuscany/cpp/sdo/runtime/core/test/travel.txt
incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp Wed May 10 05:32:57 2006
@@ -60,6 +60,7 @@
addType(Type::SDOTypeNamespaceURI,"String");
addType(Type::SDOTypeNamespaceURI,"DataObject");
+ addType(Type::SDOTypeNamespaceURI,"OpenDataObject", false, true, false, false);
addType(Type::SDOTypeNamespaceURI,"Date");
addType(Type::SDOTypeNamespaceURI,"Double");
addType(Type::SDOTypeNamespaceURI,"Float");
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp Wed May 10 05:32:57 2006
@@ -181,7 +181,7 @@
{
if (typeUnset)
{
- return Type::UndefinedOpenPropertyType;
+ return Type::OpenDataObjectType;
}
return theFactory->getType(typeURI, typeName).getTypeEnum();
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp Wed May 10 05:32:57 2006
@@ -23,14 +23,14 @@
namespace sdo
{
PropertySetting::PropertySetting()
- : dataObject(NULL), isNULL(false), isIDREF(false)
+ : dataObject(NULL), isNULL(false), isIDREF(false), pendingUnknownType(false)
{
}
PropertySetting::PropertySetting(DataObjectPtr dataObj, const SDOXMLString& propertyName,
bool isNull, bool IDREF)
- : dataObject(dataObj), name(propertyName), isNULL(isNull),isIDREF(IDREF)
+ : dataObject(dataObj), name(propertyName), isNULL(isNull),isIDREF(IDREF),pendingUnknownType(false)
{
}
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.h?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertySetting.h Wed May 10 05:32:57 2006
@@ -51,6 +51,7 @@
DataObjectPtr dataObject;
bool isIDREF;
bool isNULL;
+ bool pendingUnknownType;
};
} // End - namespace sdo
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp Wed May 10 05:32:57 2006
@@ -540,6 +540,8 @@
pprop = ((DataObjectImpl*)dob)->defineList(propertyName);
currentPropertySetting = PropertySetting(currentDataObject, propertyName,
bToBeNull);
+ currentPropertySetting.pendingUnknownType = true;
+
}
}
return pprop;
@@ -599,6 +601,26 @@
ignoreTag.tagCount = 0;
return;
}
+
+ // special case - we may have created an open type, but not been able
+ // to decide on the type. If we find a start element within the open
+ // type - then we can assume its a data object. We dont have a type,
+ // so create it as an open type data object
+ if (currentPropertySetting.pendingUnknownType)
+ {
+ if (currentDataObject != 0)
+ {
+ DataObjectPtr newDO = dataFactory->create(
+ Type::SDOTypeNamespaceURI, "OpenDataObject");
+
+ DataObjectList& dol = currentDataObject->getList
+ (currentPropertySetting.name);
+ dol.append(newDO);
+ setCurrentDataObject(newDO);
+ currentPropertySetting = PropertySetting();
+ }
+ }
+
if (dealingWithChangeSummary)
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h Wed May 10 05:32:57 2006
@@ -73,7 +73,7 @@
DataObjectType,
ChangeSummaryType,
TextType,
- UndefinedOpenPropertyType,
+ OpenDataObjectType,
num_types
};
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp Wed May 10 05:32:57 2006
@@ -59,7 +59,8 @@
"URI" ,
"DataObject",
"ChangeSummary",
- "Text"
+ "Text",
+ "OpenDataObject"
};
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/48736_xsd.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/48736_xsd.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/48736_xsd.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/48736_xsd.txt Wed May 10 05:32:57 2006
@@ -22,6 +22,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b47137b.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/b47137b.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b47137b.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b47137b.txt Wed May 10 05:32:57 2006
@@ -11,6 +11,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b47293.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/b47293.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b47293.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b47293.txt Wed May 10 05:32:57 2006
@@ -1,4 +1,4 @@
-Type:catalogNS#CatalogTypeType:catalogNS#RootTypeType:commonj.sdo#BigDecimalType:commonj.sdo#BigIntegerType:commonj.sdo#BooleanType:commonj.sdo#ByteType:commonj.sdo#BytesType:commonj.sdo#ChangeSummaryType:commonj.sdo#CharacterType:commonj.sdo#DataObjectType:commonj.sdo#DateType:commonj.sdo#DoubleType:commonj.sdo#FloatType:commonj.sdo#IntegerType:commonj.sdo#LongType:commonj.sdo#ShortType:commonj.sdo#StringType:commonj.sdo#URIType:customerNS#AddressTypeType:customerNS#CustomerTypeType:customerNS#PaymentTypeType:customerNS#RootTypeType:orderNS#OrderStatusType:orderNS#OrderTypeType:orderNS#RootTypeType:orderNS#itemType:catalogNS#CatalogType
+Type:catalogNS#CatalogTypeType:catalogNS#RootTypeType:commonj.sdo#BigDecimalType:commonj.sdo#BigIntegerType:commonj.sdo#BooleanType:commonj.sdo#ByteType:commonj.sdo#BytesType:commonj.sdo#ChangeSummaryType:commonj.sdo#CharacterType:commonj.sdo#DataObjectType:commonj.sdo#DateType:commonj.sdo#DoubleType:commonj.sdo#FloatType:commonj.sdo#IntegerType:commonj.sdo#LongType:commonj.sdo#OpenDataObjectType:commonj.sdo#ShortType:commonj.sdo#StringType:commonj.sdo#URIType:customerNS#AddressTypeType:customerNS#CustomerTypeType:customerNS#PaymentTypeType:customerNS#RootTypeType:orderNS#OrderStatusType:orderNS#OrderTypeType:orderNS#RootTypeType:orderNS#itemType:catalogNS#CatalogType
Type:catalogNS#RootType
Type:commonj.sdo#BigDecimal
Type:commonj.sdo#BigInteger
@@ -13,6 +13,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b48633b_xsd.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/b48633b_xsd.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b48633b_xsd.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b48633b_xsd.txt Wed May 10 05:32:57 2006
@@ -14,6 +14,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/b48686_xsd.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/b48686_xsd.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/b48686_xsd.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/b48686_xsd.txt Wed May 10 05:32:57 2006
@@ -12,6 +12,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/bug48300_xsd.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/bug48300_xsd.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/bug48300_xsd.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/bug48300_xsd.txt Wed May 10 05:32:57 2006
@@ -12,6 +12,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/inc1.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/inc1.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/inc1.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/inc1.txt Wed May 10 05:32:57 2006
@@ -11,6 +11,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/inc2.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/inc2.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/inc2.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/inc2.txt Wed May 10 05:32:57 2006
@@ -11,6 +11,7 @@
Type:commonj.sdo#Float
Type:commonj.sdo#Integer
Type:commonj.sdo#Long
+Type:commonj.sdo#OpenDataObject
Type:commonj.sdo#Short
Type:commonj.sdo#String
Type:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp Wed May 10 05:32:57 2006
@@ -28,119 +28,124 @@
extern "C"{
+#define TEST(testname)\
+ value = testname;\
+ if (value == 0) {\
+ cout << "Test Failed:" << totaltests << endl;\
+ }\
+ testspassed += value;\
+ totaltests++;
+
int main (int argc, char** argv)
{
//Logger::setLogging(20);
int testspassed=0;
int totaltests=0;
+ int value = 0;
/* general tests */
- totaltests++;testspassed += sdotest::definetest();
-
- totaltests++;testspassed += sdotest::emptycs();
- totaltests++;testspassed += sdotest::openseq();
- totaltests++;testspassed += sdotest::testanytwo("b48633b.xsd","b48633.xsd","b48633.xml");
- totaltests++;testspassed += sdotest::testany("b48686.xsd",
- 0, "b48686.xml", 0);
- totaltests++;testspassed += sdotest::testany("b48636.xsd",
- "Use of undefined group NameGroup","b48636.xml", 0);
- totaltests++;testspassed += sdotest::b48602();
- totaltests++;testspassed += sdotest::compatiblefactory();
- totaltests++;testspassed += sdotest::simple();
- totaltests++;testspassed += sdotest::testOrder("employee.xsd","extension.xsd",
- "order1.dat","order1.txt");
- totaltests++;testspassed += sdotest::testOrder("extension.xsd","employee.xsd",
- "order2.dat","order2.txt");
- totaltests++;testspassed += sdotest::testOpen();
- totaltests++;testspassed += sdotest::testinc2("calculator2.wsdl","inc1.dat","inc1.txt");
- totaltests++;testspassed += sdotest::testinc2("calculator2a.wsdl","inc2.dat","inc2.txt");
- totaltests++;testspassed += sdotest::teststyles();
- totaltests++;testspassed += sdotest::badelement();
- totaltests++;testspassed += sdotest::oddchars();
- totaltests++;testspassed += sdotest::notns();
- totaltests++;testspassed += sdotest::unsetlist();
- totaltests++;testspassed += sdotest::travel();
- totaltests++;testspassed += sdotest::testwsdl();
- totaltests++;testspassed += sdotest::bunique();
- totaltests++;testspassed += sdotest::buniqueread();
- totaltests++;testspassed += sdotest::propdefaulttest();
- totaltests++;testspassed += sdotest::graham5();
- totaltests++;testspassed += sdotest::graham4();
- totaltests++;testspassed += sdotest::detachtest();
- totaltests++;testspassed += sdotest::includetest();
- totaltests++;testspassed += sdotest::testLoad();
- totaltests++;testspassed += sdotest::leak();
- totaltests++;testspassed += sdotest::twolists();
- totaltests++;testspassed += sdotest::testUtil();
- totaltests++;testspassed += sdotest::clonetest();
- totaltests++;testspassed += sdotest::notfound();
- totaltests++;testspassed += sdotest::testErrors();
- totaltests++;testspassed += sdotest::loadManyOpen();
- totaltests++;testspassed += sdotest::doctest();
- totaltests++;testspassed += sdotest::graham3();
- totaltests++;testspassed += sdotest::graham1();
- totaltests++;testspassed += sdotest::graham2();
- totaltests++;testspassed += sdotest::merle1();
- totaltests++;testspassed += sdotest::loadOpenNS();
- totaltests++;testspassed += sdotest::saveOpen();
- totaltests++;testspassed += sdotest::loadOpen();
- totaltests++;testspassed += sdotest::testui();
- totaltests++;testspassed += sdotest::testSCA();
- totaltests++;testspassed += sdotest::testabstract();
- totaltests++;testspassed += sdotest::testsubsload();
- totaltests++;testspassed += sdotest::testsubs();
- totaltests++;testspassed += sdotest::setnull();
- totaltests++;testspassed += sdotest::bug2();
- totaltests++;testspassed += sdotest::cssave2();
- totaltests++;testspassed += sdotest::csload2();
- totaltests++;testspassed += sdotest::cssave();
- totaltests++;testspassed += sdotest::csload();
- totaltests++;testspassed += sdotest::bug1();
- totaltests++;testspassed += sdotest::eqhelpertest();
- totaltests++;testspassed += sdotest::cohelpertest();
- totaltests++;testspassed += sdotest::datetest();
- totaltests++;testspassed += sdotest::carotest3();
- totaltests++;testspassed += sdotest::matttest1();
- totaltests++;testspassed += sdotest::adddeletetest();
- totaltests++;testspassed += sdotest::carotest2();
- totaltests++;testspassed += sdotest::carotest();
- totaltests++;testspassed += sdotest::setmany();
- totaltests++;testspassed += sdotest::noncontest();
- totaltests++;testspassed += sdotest::versiontest();
- totaltests++;testspassed += sdotest::defaulttest();
- totaltests++;testspassed += sdotest::nulltest();
- totaltests++;testspassed += sdotest::usertest();
- totaltests++;testspassed += sdotest::querytest();
- totaltests++;testspassed += sdotest::getproptest();
- totaltests++;testspassed += sdotest::rcptest();
- totaltests++;testspassed += sdotest::seqtest();
- totaltests++;testspassed += sdotest::changesummarytest();
- totaltests++;testspassed += sdotest::conversiontest();
- totaltests++;testspassed += sdotest::boolbug();
- totaltests++;testspassed += sdotest::scope1();
- totaltests++;testspassed += sdotest::scope2();
- totaltests++;testspassed += sdotest::scope3();
- totaltests++;testspassed += sdotest::maintest();
+ TEST ( sdotest::stocktest() );
+ TEST ( sdotest::definetest() );
+ TEST ( sdotest::emptycs() );
+ TEST ( sdotest::openseq() );
+ TEST ( sdotest::testanytwo("b48633b.xsd","b48633.xsd","b48633.xml") );
+ TEST ( sdotest::testany("b48686.xsd",0, "b48686.xml", 0) );
+ TEST ( sdotest::testany("b48636.xsd","Use of undefined group NameGroup","b48636.xml", 0) );
+ TEST ( sdotest::b48602() );
+ TEST ( sdotest::compatiblefactory() );
+ TEST ( sdotest::simple() );
+ TEST ( sdotest::testOrder("employee.xsd","extension.xsd","order1.dat","order1.txt") );
+ TEST ( sdotest::testOrder("extension.xsd","employee.xsd","order2.dat","order2.txt") );
+ TEST ( sdotest::testOpen() );
+ TEST ( sdotest::testinc2("calculator2.wsdl","inc1.dat","inc1.txt") );
+ TEST ( sdotest::testinc2("calculator2a.wsdl","inc2.dat","inc2.txt") );
+ TEST ( sdotest::teststyles() );
+ TEST ( sdotest::badelement() );
+ TEST ( sdotest::oddchars() );
+ TEST ( sdotest::notns() );
+ TEST ( sdotest::unsetlist() );
+ TEST ( sdotest::travel() );
+ TEST ( sdotest::testwsdl() );
+ TEST ( sdotest::bunique() );
+ TEST ( sdotest::buniqueread() );
+ TEST ( sdotest::propdefaulttest() );
+ TEST ( sdotest::graham5() );
+ TEST ( sdotest::graham4() );
+ TEST ( sdotest::detachtest() );
+ TEST ( sdotest::includetest() );
+ TEST ( sdotest::testLoad() );
+ TEST ( sdotest::leak() );
+ TEST ( sdotest::twolists() );
+ TEST ( sdotest::testUtil() );
+ TEST ( sdotest::clonetest() );
+ TEST ( sdotest::notfound() );
+ TEST ( sdotest::testErrors() );
+ TEST ( sdotest::loadManyOpen() );
+ TEST ( sdotest::doctest() );
+ TEST ( sdotest::graham3() );
+ TEST ( sdotest::graham1() );
+ TEST ( sdotest::graham2() );
+ TEST ( sdotest::merle1() );
+ TEST ( sdotest::loadOpenNS() );
+ TEST ( sdotest::saveOpen() );
+ TEST ( sdotest::loadOpen() );
+ TEST ( sdotest::testui() );
+ TEST ( sdotest::testSCA() );
+ TEST ( sdotest::testabstract() );
+ TEST ( sdotest::testsubsload() );
+ TEST ( sdotest::testsubs() );
+ TEST ( sdotest::setnull() );
+ TEST ( sdotest::bug2() );
+ TEST ( sdotest::cssave2() );
+ TEST ( sdotest::csload2() );
+ TEST ( sdotest::cssave() );
+ TEST ( sdotest::csload() );
+ TEST ( sdotest::bug1() );
+ TEST ( sdotest::eqhelpertest() );
+ TEST ( sdotest::cohelpertest() );
+ TEST ( sdotest::datetest() );
+ TEST ( sdotest::carotest3() );
+ TEST ( sdotest::matttest1() );
+ TEST ( sdotest::adddeletetest() );
+ TEST ( sdotest::carotest2() );
+ TEST ( sdotest::carotest() );
+ TEST ( sdotest::setmany() );
+ TEST ( sdotest::noncontest() );
+ TEST ( sdotest::versiontest() );
+ TEST ( sdotest::defaulttest() );
+ TEST ( sdotest::nulltest() );
+ TEST ( sdotest::usertest() );
+ TEST ( sdotest::querytest() );
+ TEST ( sdotest::getproptest() );
+ TEST ( sdotest::rcptest() );
+ TEST ( sdotest::seqtest() );
+ TEST ( sdotest::changesummarytest() );
+ TEST ( sdotest::conversiontest() );
+ TEST ( sdotest::boolbug() );
+ TEST ( sdotest::scope1() );
+ TEST ( sdotest::scope2() );
+ TEST ( sdotest::scope3() );
+ TEST ( sdotest::maintest() );
/* regression tests */
- totaltests++;testspassed += sdotest::b48736();
- totaltests++;testspassed += sdotest::b48601();
- totaltests++;testspassed += sdotest::b47293();
- totaltests++;testspassed += sdotest::b48300();
- totaltests++;testspassed += sdotest::b47663();
- totaltests++;testspassed += sdotest::b47802();
- totaltests++;testspassed += sdotest::b47137();
- totaltests++;testspassed += sdotest::b47137b();
- totaltests++;testspassed += sdotest::b46633();
- totaltests++;testspassed += sdotest::b46693();
- totaltests++;testspassed += sdotest::b46734();
- totaltests++;testspassed += sdotest::b46634();
- totaltests++;testspassed += sdotest::b46617b();
- totaltests++;testspassed += sdotest::b46617();
- totaltests++;testspassed += sdotest::b46613();
- totaltests++;testspassed += sdotest::b45933();
+ TEST ( sdotest::b48736() );
+ TEST ( sdotest::b48601() );
+ TEST ( sdotest::b47293() );
+ TEST ( sdotest::b48300() );
+ TEST ( sdotest::b47663() );
+ TEST ( sdotest::b47802() );
+ TEST ( sdotest::b47137() );
+ TEST ( sdotest::b47137b() );
+ TEST ( sdotest::b46633() );
+ TEST ( sdotest::b46693() );
+ TEST ( sdotest::b46734() );
+ TEST ( sdotest::b46634() );
+ TEST ( sdotest::b46617b() );
+ TEST ( sdotest::b46617() );
+ TEST ( sdotest::b46613() );
+ TEST ( sdotest::b45933() );
cout << "Total tests:" << totaltests << " Tests passed:" << testspassed;
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/maintest.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/maintest.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/maintest.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/maintest.txt Wed May 10 05:32:57 2006
@@ -27,6 +27,7 @@
Type Float
Type Integer
Type Long
+Type OpenDataObject
Type Short
Type String
Type URI
@@ -84,6 +85,7 @@
Type Float
Type Integer
Type Long
+Type OpenDataObject
Type Short
Type String
Type URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.h Wed May 10 05:32:57 2006
@@ -58,6 +58,7 @@
/* tests */
static int definetest();
+ static int stocktest();
static int testgenerate(const char* xsd, const char* output);
static int emptycs();
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp Wed May 10 05:32:57 2006
@@ -561,7 +561,7 @@
delete name1;
delete name3;
- return rc;
+ if (rc == 0)return rc;
}
@@ -1139,3 +1139,83 @@
}
+int sdotest::stocktest()
+{
+ return sdotest::testany("stock.wsdl",0,"stock.xml",0);
+}
+
+
+/******************************************************
+int sdotest::stocktest()
+{
+ int i,j;
+
+ try {
+
+ DataFactoryPtr mdg = DataFactory::getDataFactory();
+
+ XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg);
+
+ xsh->defineFile("stock.wsdl");
+
+ if ((i = xsh->getErrorCount()) > 0)
+ {
+ cout << "PROBLEM: Testany XSD reported some errors:" << endl;
+ for (j=0;j<i;j++)
+ {
+ const char *m = xsh->getErrorMessage(j);
+ if (m != 0) cout << m;
+ cout << endl;
+ }
+ }
+
+ TypeList tl = mdg->getTypes();
+
+ printf("***** TYPES BEFORE RESOLVE **********************************\n");
+
+ for (i=0;i<tl.size();i++)
+ {
+ printf("Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
+ PropertyList pl = tl[i].getProperties();
+ for (int j=0;j<pl.size();j++)
+ {
+ printf("Property:%s ",pl[j].getName());
+ if (pl[j].isMany())
+ printf("(many) ");
+ printf(" of type %s\n",pl[j].getType().getName());
+ }
+ }
+
+ printf("*******************************END TYPES******************\n");
+
+
+
+ XMLHelperPtr xmh = HelperProvider::getXMLHelper(mdg);
+
+ XMLDocumentPtr doc = xmh->loadFile("stock.xml");
+
+ if ((i = xmh->getErrorCount()) > 0)
+ {
+ cout << "TestAny XML found errors:" << endl;
+ for (j=0;j<i;j++)
+ {
+ const char *m = xmh->getErrorMessage(j);
+ if (m != 0) cout << m;
+ cout << endl;
+ }
+ }
+
+
+ DataObjectPtr dob = doc->getRootDataObject();
+ printDataObject(stdout, dob);
+
+ return 1;
+
+ }
+ catch (SDORuntimeException e)
+ {
+ if (!silent)cout << "Exception in TestAny" << e << endl;
+ return 0;
+ }
+}
+**************************************************/
\ No newline at end of file
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/teststyles.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/teststyles.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/teststyles.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/teststyles.txt Wed May 10 05:32:57 2006
@@ -12,6 +12,7 @@
Type: commonj.sdo#Float
Type: commonj.sdo#Integer
Type: commonj.sdo#Long
+Type: commonj.sdo#OpenDataObject
Type: commonj.sdo#Short
Type: commonj.sdo#String
Type: commonj.sdo#URI
@@ -42,6 +43,7 @@
Type: commonj.sdo#Float
Type: commonj.sdo#Integer
Type: commonj.sdo#Long
+Type: commonj.sdo#OpenDataObject
Type: commonj.sdo#Short
Type: commonj.sdo#String
Type: commonj.sdo#URI
@@ -72,6 +74,7 @@
Type: commonj.sdo#Float
Type: commonj.sdo#Integer
Type: commonj.sdo#Long
+Type: commonj.sdo#OpenDataObject
Type: commonj.sdo#Short
Type: commonj.sdo#String
Type: commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/travel.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/travel.txt?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/travel.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/travel.txt Wed May 10 05:32:57 2006
@@ -21,6 +21,7 @@
TYPE:commonj.sdo#Float
TYPE:commonj.sdo#Integer
TYPE:commonj.sdo#Long
+TYPE:commonj.sdo#OpenDataObject
TYPE:commonj.sdo#Short
TYPE:commonj.sdo#String
TYPE:commonj.sdo#URI
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp?rev=405735&r1=405734&r2=405735&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp Wed May 10 05:32:57 2006
@@ -26,7 +26,7 @@
#include "sdotest.h"
-bool sdotest::silent = false;
+bool sdotest::silent = true;
bool sdotest::ramping = false;
void sdotest::printOldValues(FILE *f, ChangeSummaryPtr cs, DataObjectPtr dol)
@@ -192,6 +192,7 @@
case Type::BytesType:
fprintf(f,"bytes:%s\n",dp->getCString(p));
break;
+ case Type::OpenDataObjectType:
case Type::DataObjectType:
{
fprintf(f,"dataObject\n" );
@@ -267,6 +268,7 @@
case Type::BytesType:
fprintf(f,"bytes[%d]=%s\n",i,dobl.getCString(i));
break;
+ case Type::OpenDataObjectType:
case Type::DataObjectType:
{
fprintf(f,"dataObject[%d]=\n",i);