You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2006/11/24 11:07:33 UTC
svn commit: r478825 - in /incubator/tuscany/java:
das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/
sdo/impl/src/main/java/org/apache/tuscany/sdo/util/
sdo/impl/src/test/java/org/apache/tuscany/sdo/test/
Author: kelvingoodson
Date: Fri Nov 24 02:07:32 2006
New Revision: 478825
URL: http://svn.apache.org/viewvc?view=rev&rev=478825
Log:
TUSCANY-885 and TUSCANY-932 patches applied synchronously to avoid DAS test case failure
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java?view=diff&rev=478825&r1=478824&r2=478825
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java Fri Nov 24 02:07:32 2006
@@ -82,12 +82,7 @@
DataObject root = readCustomers.executeQuery();
// Verify
- try {
- assertEquals(5, root.getList("invalidProperty").size());
- fail("Should fail since there will be no feature named invalidProperty");
- } catch (IllegalArgumentException e) {
- // OK
- }
+ assertNull(root.getList("invalidProperty"));
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java?view=diff&rev=478825&r1=478824&r2=478825
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java Fri Nov 24 02:07:32 2006
@@ -1801,7 +1801,7 @@
}
}
}
- throw new IllegalArgumentException("Class '" + eObject.eClass().getName() + "' does not have a feature named '" + featureName + "'");
+ return null;
}
public static List getAliasNames(EStructuralFeature eStructuralFeature)
@@ -1999,7 +1999,7 @@
public boolean isSet()
{
- return eObject.eIsSet(feature);
+ return feature != null && eObject.eIsSet(feature);
}
public boolean isSetAndRecyle()
@@ -2052,6 +2052,7 @@
if (name != null)
{
feature = (EStructuralFeature)((DataObject)eObject).getProperty(name);
+ if (feature == null) setEObject(null);
}
else
{
@@ -2102,15 +2103,12 @@
if ('/' == c)
{
setEObject((EObject)get());
+ if (eObject == null) break;
}
else if ("..".equals(token))
{
- EObject container = eObject.eContainer();
- if (container == null)
- {
- throw new IllegalArgumentException("No containing object for " + eObject);
- }
- setEObject(container);
+ setEObject(eObject.eContainer());
+ if (eObject == null) break;
}
else if ('.' == c)
{
@@ -2145,6 +2143,7 @@
if (index < 0)
{
setEObject(null);
+ break;
}
else
{
@@ -2159,6 +2158,7 @@
else
{
setFeatureName(token);
+ if (eObject == null) break;
}
}
}
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java?view=diff&rev=478825&r1=478824&r2=478825
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java Fri Nov 24 02:07:32 2006
@@ -64,6 +64,9 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "stockQuote", baos);
+ assertFalse(quote.isSet("undefined"));
+ assertSame(quote.get("undefined"), null);
+
assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(QUOTE_XML)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org