modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java | 13 ++++++++++ 1 file changed, 13 insertions(+)
New commits: commit 9983f60ec49f72b5bb0afcfb452afde616c622a6 Author: Thomas Segismont tsegismo@redhat.com Date: Tue Jul 16 17:51:59 2013 +0200
Fix InterruptibleOperationsTest. Mock resource context needs a ComponentInvocationContext instance.
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java index 192117c..b0acf4d 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java @@ -47,6 +47,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -95,6 +96,7 @@ public class InterruptibleOperationsTest { int httpPort = setupJettyServer(); setupResourceContext(httpPort); executorService = Executors.newSingleThreadExecutor(); + when(resourceContext.getComponentInvocationContext()).thenReturn(new MockComponentInvocationContext()); serverComponent.start(resourceContext); }
@@ -160,6 +162,17 @@ public class InterruptibleOperationsTest { assertEquals(operationResult.getSimpleResult(), "Success"); }
+ private static class MockComponentInvocationContext implements ComponentInvocationContext { + @Override + public boolean isInterrupted() { + return false; + } + + @Override + public void markInterrupted() { + } + } + private class RestartJetty implements Runnable { @Override public void run() {
rhq-commits@lists.fedorahosted.org