Author: sergeyb
Date: Mon Nov 14 13:44:34 2011
New Revision: 1201699
URL: http://svn.apache.org/viewvc?rev=1201699&view=rev
Log:
Merged revisions 1201698 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1201698 | sergeyb | 2011-11-14 13:42:44 +0000 (Mon, 14 Nov 2011) | 1 line
Fixing a failing test
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 13:44:34 2011
@@ -1 +1 @@
-/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876,1200920,1200934,1201680
+/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876,1200920,1200934,1201680,1201698
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java?rev=1201699&r1=1201698&r2=1201699&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
Mon Nov 14 13:44:34 2011
@@ -100,9 +100,8 @@ public class InjectionUtilsTest extends
assertEquals("lv22", map.get("d.c").get(1));
assertEquals(2, map.get("d.s").size());
- assertEquals("set1", map.get("d.s").get(0));
- assertEquals("set2", map.get("d.s").get(1));
-
+ assertTrue(map.get("d.s").contains("set1"));
+ assertTrue(map.get("d.s").contains("set2"));
}
static class CustomerBean1 {