Author: dkulp
Date: Fri Feb 17 16:38:53 2012
New Revision: 1245646
URL: http://svn.apache.org/viewvc?rev=1245646&view=rev
Log:
Merged revisions 1245645 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1245645 | dkulp | 2012-02-17 11:37:27 -0500 (Fri, 17 Feb 2012) | 2 lines
Fix failing test that relied on some stuff that was not back portable to 2.4.x
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java?rev=1245646&r1=1245645&r2=1245646&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
Fri Feb 17 16:38:53 2012
@@ -641,9 +641,8 @@ public class BeanTest extends AbstractAe
type.setSchemaType(new QName("urn:foo", "ExtendingInterface"));
Set<AegisType> dependencies = type.getDependencies();
- assertEquals(2, dependencies.size());
- dependencies.remove(stringType);
- assertEquals(SimpleInterface.class,
dependencies.iterator().next().getTypeClass());
+ assertEquals(1, dependencies.size());
+ assertEquals(String.class,
dependencies.iterator().next().getTypeClass());
}
@Test
