You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/28 17:39:06 UTC
svn commit: r798568 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
Author: dkulp
Date: Tue Jul 28 15:39:05 2009
New Revision: 798568
URL: http://svn.apache.org/viewvc?rev=798568&view=rev
Log:
Merged revisions 798533 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r798533 | peterjones | 2009-07-28 10:27:14 -0400 (Tue, 28 Jul 2009) | 3 lines
Work-around issue with EasyMock failing detecting finalize calls during test
with ibm jdk (use data members rather than local variables).
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 15:39:05 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798533
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java?rev=798568&r1=798567&r2=798568&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java Tue Jul 28 15:39:05 2009
@@ -38,7 +38,13 @@
public class EndpointReferenceDomainExpressionTest extends Assert {
private IMocksControl control;
-
+
+ // Avoid spurious failures on EasyMock detecting finalize calls
+ // by using data members rather than local variables for these.
+ private ServiceInfo si;
+ private BindingOperationInfo boi;
+ private BindingMessageInfo bmi;
+ private BindingFaultInfo bfi;
@Before
public void setUp() {
@@ -54,10 +60,10 @@
eprde.setEndpointReference(epr);
assertSame(epr, eprde.getEndpointReference());
- ServiceInfo si = control.createMock(ServiceInfo.class);
- BindingOperationInfo boi = control.createMock(BindingOperationInfo.class);
- BindingMessageInfo bmi = control.createMock(BindingMessageInfo.class);
- BindingFaultInfo bfi = control.createMock(BindingFaultInfo.class);
+ si = control.createMock(ServiceInfo.class);
+ boi = control.createMock(BindingOperationInfo.class);
+ bmi = control.createMock(BindingMessageInfo.class);
+ bfi = control.createMock(BindingFaultInfo.class);
assertTrue(!eprde.appliesTo(si));
assertTrue(!eprde.appliesTo(boi));
@@ -80,6 +86,11 @@
control.replay();
assertTrue(eprde.appliesTo(ei));
control.verify();
+
+ bfi = null;
+ bmi = null;
+ boi = null;
+ si = null;
}
}