From 6d5d0be628f79c28a4b11f1053c0cdbbec27100a Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 19 Jan 2016 13:45:57 +0000 Subject: [PATCH] Bug 472765: change from easymock to mockito Due to improvements in target platform in 12843ef it is now possible to use mockito instead of easymock. This commit does that switch. Note because of Bug 334540 we need to explicitly require the org.hamcrest bundle so that it resolves. From the bug, Matthias Sohn says in Comment 1: "I would just use Require-Bundle to get around this." Change-Id: Ib49a767c826aa04f4daf1de0bf1b25a4f8ae07ba Signed-off-by: Jonah Graham --- .../META-INF/MANIFEST.MF | 3 ++- .../tests/dsf/gdb/tests/SourceLookupTest.java | 21 ++++++++----------- releng/org.eclipse.cdt.target/cdt.target | 3 +-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF index 14aac4c893d..98b7c97617d 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.gdb, org.eclipse.cdt.dsf.gdb, org.eclipse.core.variables, - org.easymock + org.mockito, + org.hamcrest Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: . diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java index ca9bd790a13..315f7991a6e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java @@ -10,9 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.gdb.tests; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -20,6 +17,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.File; import java.nio.file.Files; @@ -571,14 +570,13 @@ public class SourceLookupTest extends BaseTestCase { protected IBinary createMockIBinary(String path) { IPath absPath = new Path(new File(path).getAbsolutePath()); - IResource exeResource = createNiceMock(IResource.class); - expect(exeResource.getFullPath()).andReturn(absPath); - expect(exeResource.getProject()).andReturn(null); - replay(exeResource); + IResource exeResource = mock(IResource.class); + when(exeResource.getFullPath()).thenReturn(absPath); + when(exeResource.getProject()).thenReturn(null); - IBinary exeBin = createNiceMock(IBinary.class); - expect(exeBin.getPath()).andReturn(absPath); - expect(exeBin.getAdapter(IResource.class)).andReturn(exeResource); + IBinary exeBin = mock(IBinary.class); + when(exeBin.getPath()).thenReturn(absPath); + when(exeBin.getAdapter(IResource.class)).thenReturn(exeResource); /* * we use the adapter factory CSourceFinderFactory to convert IBinary to * ISourceFinder. The way the adapter is resolved it will first try and @@ -587,8 +585,7 @@ public class SourceLookupTest extends BaseTestCase { * explicitly provide the null, an exception would be raised because an * unexpected method is invoked. */ - expect(exeBin.getAdapter(ISourceFinder.class)).andReturn(null); - replay(exeBin); + when(exeBin.getAdapter(ISourceFinder.class)).thenReturn(null); return exeBin; } diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 3ecc8a2df67..ce84139b4f9 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,5 +1,5 @@ - + @@ -13,7 +13,6 @@ -