Author: dkulp
Date: Thu Sep 11 20:36:52 2008
New Revision: 694597
URL: http://svn.apache.org/viewvc?rev=694597&view=rev
Log:
Fix checkstyle error and build failure
Modified:
cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
Modified:
cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java?rev=694597&r1=694596&r2=694597&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
Thu Sep 11 20:36:52 2008
@@ -36,7 +36,6 @@
import org.apache.cxf.configuration.spring.MapProvider;
import org.apache.cxf.extension.BusExtension;
import org.apache.cxf.extension.RegistryImpl;
-import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.policy.builder.xml.XmlPrimitiveAssertion;
/**
Modified:
cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java?rev=694597&r1=694596&r2=694597&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
Thu Sep 11 20:36:52 2008
@@ -23,6 +23,7 @@
import org.w3c.dom.Element;
+import org.apache.cxf.Bus;
import org.apache.cxf.ws.policy.builder.xml.XmlPrimitiveAssertion;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
@@ -50,7 +51,10 @@
@Test
public void testBuildUnknownAssertion() {
- AssertionBuilderRegistry reg = new AssertionBuilderRegistryImpl();
+ AssertionBuilderRegistryImpl reg = new AssertionBuilderRegistryImpl();
+ Bus bus = control.createMock(Bus.class);
+ EasyMock.expect(bus.getExtension(PolicyConstants.class)).andReturn(new
PolicyConstants()).anyTimes();
+ reg.setBus(bus);
reg.setIgnoreUnknownAssertions(false);
Element[] elems = new Element[11];
QName[] qnames = new QName[11];