Repository: cloudstack Updated Branches: refs/heads/master 166df0f15 -> ab7473eea
Changing the JUnit runner in order to avoid problems with Java 8 - All tests passed using different approaches - Maven with parameters: -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 - Maven without parameters All builds were executed using javac 1.8.0_31 Signed-off-by: Rohit Yadav <[email protected]> This closes #266 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab7473ee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab7473ee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab7473ee Branch: refs/heads/master Commit: ab7473eea0cf34ce50fbdeb62f2e3ddd8adfd839 Parents: 166df0f Author: wilderrodrigues <[email protected]> Authored: Mon May 18 16:24:00 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Wed May 20 09:53:46 2015 +0100 ---------------------------------------------------------------------- .../hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 4 ++-- .../xenserver/resource/wrapper/CitrixRequestWrapperTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab7473ee/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 7f378a3..456265b 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -68,7 +68,7 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.runners.MockitoJUnitRunner; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -170,7 +170,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; import com.cloud.vm.VirtualMachine.Type; -@RunWith(PowerMockRunner.class) +@RunWith(MockitoJUnitRunner.class) public class LibvirtComputingResourceTest { @Mock http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab7473ee/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java index 28fc370..6a1be8c 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java @@ -41,8 +41,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachIsoCommand; @@ -134,7 +134,7 @@ import com.xensource.xenapi.Pool; import com.xensource.xenapi.Types.BadServerResponse; import com.xensource.xenapi.Types.XenAPIException; -@RunWith(PowerMockRunner.class) +@RunWith(MockitoJUnitRunner.class) public class CitrixRequestWrapperTest { @Mock
