Skip to content

Commit 3a196b3

Browse files
stefanseifertstefanseifert
authored
Switch to Global Parent 75, fix unit tests (#110)
1 parent b8b06a6 commit 3a196b3

5 files changed

Lines changed: 64 additions & 74 deletions

File tree

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ under the License.
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<parent>
26-
<groupId>io.wcm.devops</groupId>
27-
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>2.1.2</version>
26+
<groupId>io.wcm.maven</groupId>
27+
<artifactId>io.wcm.maven.global-parent</artifactId>
28+
<version>75</version>
2929
<relativePath />
3030
</parent>
3131

‎src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828

2929
import junit.framework.TestCase;
3030

31-
import org.apache.maven.execution.DefaultRuntimeInformation;
31+
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
32+
import org.apache.maven.execution.RuntimeInformation;
3233
import org.apache.maven.model.Build;
3334
import org.apache.maven.model.Model;
3435
import org.apache.maven.model.Resource;
@@ -52,8 +53,13 @@ private EclipsePlugin newMojo()
5253
throws Exception
5354
{
5455
EclipsePlugin mojo = new EclipsePlugin();
55-
DefaultRuntimeInformation rti = new DefaultRuntimeInformation();
56-
rti.initialize();
56+
RuntimeInformation rti = new RuntimeInformation()
57+
{
58+
public org.apache.maven.artifact.versioning.ArtifactVersion getApplicationVersion()
59+
{
60+
return new DefaultArtifactVersion( "3.3.9" );
61+
}
62+
};
5763
Field field = AbstractIdeSupportMojo.class.getDeclaredField( "runtimeInformation" );
5864
field.setAccessible( true );
5965
field.set( mojo, rti );

‎src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java‎

Lines changed: 38 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
import java.io.IOException;
2323
import java.lang.reflect.Field;
2424
import java.net.URL;
25+
import java.util.ArrayList;
2526
import java.util.Collections;
27+
import java.util.List;
2628

2729
import org.junit.Assert;
2830
import junit.framework.TestCase;
@@ -41,14 +43,12 @@
4143
import org.apache.maven.project.ProjectBuildingException;
4244
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
4345
import org.apache.maven.shared.osgi.Maven2OsgiConverter;
44-
import org.apache.maven.shared.tools.easymock.MockManager;
4546
import org.apache.maven.shared.tools.easymock.TestFileManager;
4647
import org.codehaus.plexus.archiver.manager.ArchiverManager;
4748
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
4849
import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
4950
import org.codehaus.plexus.components.interactivity.InputHandler;
50-
import org.codehaus.plexus.logging.console.ConsoleLogger;
51-
import org.easymock.MockControl;
51+
import org.easymock.EasyMock;
5252

5353
public class InstallPluginsMojoTest
5454
extends TestCase
@@ -59,7 +59,7 @@ public class InstallPluginsMojoTest
5959

6060
private TestFileManager fileManager;
6161

62-
private MockManager mm = new MockManager();
62+
private List<Object> mocks = new ArrayList<>();
6363

6464
private File eclipseDir;
6565

@@ -83,7 +83,7 @@ public void testJira_MECLIPSE_418_correct_bundle_headers()
8383
assertInstalledFileExists( artifact );
8484
assertInstalledDirDoesNotExist( artifact );
8585

86-
mm.verifyAll();
86+
EasyMock.verify( mocks.toArray() );
8787
}
8888

8989
/**
@@ -102,7 +102,7 @@ public void testJira_MECLIPSE_418_no_bundle_name()
102102
assertInstalledFileExists( artifact );
103103
assertInstalledDirDoesNotExist( artifact );
104104

105-
mm.verifyAll();
105+
EasyMock.verify( mocks.toArray() );
106106
}
107107

108108
/**
@@ -121,7 +121,7 @@ public void testJira_MECLIPSE_418_no_bundle_symbolicname()
121121
assertInstalledFileExists( artifact );
122122
assertInstalledDirDoesNotExist( artifact );
123123

124-
mm.verifyAll();
124+
EasyMock.verify( mocks.toArray() );
125125
}
126126

127127
/**
@@ -140,7 +140,7 @@ public void testJira_MECLIPSE_418_no_manifest_headers()
140140
assertInstalledFileDoesNotExist( artifact );
141141
assertInstalledDirDoesNotExist( artifact );
142142

143-
mm.verifyAll();
143+
EasyMock.verify( mocks.toArray() );
144144
}
145145

146146
/**
@@ -159,7 +159,7 @@ public void testJira_MECLIPSE_488()
159159
assertInstalledFileDoesNotExist( jira488_missingManifest );
160160
assertInstalledDirDoesNotExist( jira488_missingManifest );
161161

162-
mm.verifyAll();
162+
EasyMock.verify( mocks.toArray() );
163163
}
164164

165165
public void testShouldInstallAsJarWhenPropertyNotSpecified()
@@ -170,7 +170,7 @@ public void testShouldInstallAsJarWhenPropertyNotSpecified()
170170
assertInstalledFileExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
171171
assertInstalledDirDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
172172

173-
mm.verifyAll();
173+
EasyMock.verify( mocks.toArray() );
174174
}
175175

176176
public void testShouldInstallAsJarWhenPropertyIsTrue()
@@ -181,7 +181,7 @@ public void testShouldInstallAsJarWhenPropertyIsTrue()
181181
assertInstalledFileExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
182182
assertInstalledDirDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
183183

184-
mm.verifyAll();
184+
EasyMock.verify( mocks.toArray() );
185185
}
186186

187187
public void testShouldInstallAsDirWhenPropertyIsFalse()
@@ -192,7 +192,7 @@ public void testShouldInstallAsDirWhenPropertyIsFalse()
192192
assertInstalledFileDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
193193
assertInstalledDirExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
194194

195-
mm.verifyAll();
195+
EasyMock.verify( mocks.toArray() );
196196
}
197197

198198
public void testShouldInstallWhenTypeContainedInPluginTypesListWithMultipleValues()
@@ -203,7 +203,7 @@ public void testShouldInstallWhenTypeContainedInPluginTypesListWithMultipleValue
203203
assertInstalledFileExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
204204
assertInstalledDirDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
205205

206-
mm.verifyAll();
206+
EasyMock.verify( mocks.toArray() );
207207
}
208208

209209
public void testShouldNotInstallWhenTypeNotContainedInPluginTypesList()
@@ -214,7 +214,7 @@ public void testShouldNotInstallWhenTypeNotContainedInPluginTypesList()
214214
assertInstalledFileDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
215215
assertInstalledDirDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
216216

217-
mm.verifyAll();
217+
EasyMock.verify( mocks.toArray() );
218218
}
219219

220220
public void testShouldRemoveOldDirectoryBeforeInstallingNewJarWhenOverwriteIsFalse()
@@ -231,7 +231,7 @@ public void testShouldRemoveOldDirectoryBeforeInstallingNewJarWhenOverwriteIsFal
231231
assertInstalledFileDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
232232
assertInstalledDirExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
233233

234-
mm.verifyAll();
234+
EasyMock.verify( mocks.toArray() );
235235
}
236236

237237
public void testShouldRemoveOldDirectoryBeforeInstallingNewJarWhenOverwriteIsTrue()
@@ -248,7 +248,7 @@ public void testShouldRemoveOldDirectoryBeforeInstallingNewJarWhenOverwriteIsTru
248248
assertInstalledFileExists( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
249249
assertInstalledDirDoesNotExist( ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME );
250250

251-
mm.verifyAll();
251+
EasyMock.verify( mocks.toArray() );
252252
}
253253

254254
private void assertInstalledFileDoesNotExist( Artifact artifact )
@@ -282,6 +282,7 @@ private void assertInstalledDirExists( Artifact artifact )
282282
public void setUp()
283283
{
284284
fileManager = new TestFileManager( "InstallPluginsMojo.test.", "" );
285+
mocks = new ArrayList<>();
285286

286287
ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME = createArtifact( "org.eclipse.core", "runtime", "3.2.0-v20060603" );
287288
}
@@ -318,13 +319,13 @@ private void performTestInstall( Boolean installAsJar, boolean overwrite, Artifa
318319
String type = artifact.getType();
319320

320321
ArtifactRepository localRepo = createLocalRepository();
321-
MavenProjectBuilder projectBuilder = createProjectBuilder(typeList.contains(type), installAsJar );
322-
ArchiverManager archiverManager = createArchiverManager(typeList.contains(type), installAsJar );
322+
MavenProjectBuilder projectBuilder = createProjectBuilder( typeList.contains( type ), installAsJar );
323+
ArchiverManager archiverManager = createArchiverManager( typeList.contains( type ), installAsJar );
323324
InputHandler inputHandler = createInputHandler();
324325

325326
Log log = new SystemStreamLog();
326327

327-
mm.replayAll();
328+
EasyMock.replay( mocks.toArray() );
328329

329330
InstallPluginsMojo mojo =
330331
new InstallPluginsMojo( eclipseDir, overwrite, Collections.singletonList( artifact ), typeList, localRepo,
@@ -362,31 +363,23 @@ private File createPluginsDir()
362363

363364
private InputHandler createInputHandler()
364365
{
365-
MockControl control = MockControl.createControl( InputHandler.class );
366-
367-
mm.add( control );
368-
369-
InputHandler handler = (InputHandler) control.getMock();
370-
366+
InputHandler handler = EasyMock.createNiceMock( InputHandler.class );
367+
mocks.add( handler );
371368
return handler;
372369
}
373370

374371
private ArchiverManager createArchiverManager( boolean isReachable, Boolean installAsJar )
375372
{
376-
MockControl control = MockControl.createControl( ArchiverManager.class );
377-
378-
mm.add( control );
379-
380-
ArchiverManager manager = (ArchiverManager) control.getMock();
373+
ArchiverManager manager = EasyMock.createMock( ArchiverManager.class );
374+
mocks.add( manager );
381375

382376
if ( isReachable && installAsJar == Boolean.FALSE )
383377
{
384378
try
385379
{
386-
manager.getUnArchiver( (File) null );
387-
control.setMatcher( MockControl.ALWAYS_MATCHER );
388380
ZipUnArchiver zipUnArchiver = new ZipUnArchiver();
389-
control.setReturnValue( zipUnArchiver, MockControl.ONE_OR_MORE );
381+
EasyMock.expect( manager.getUnArchiver( EasyMock.<File>anyObject() ) )
382+
.andReturn( zipUnArchiver ).atLeastOnce();
390383
}
391384
catch ( NoSuchArchiverException e )
392385
{
@@ -399,11 +392,8 @@ private ArchiverManager createArchiverManager( boolean isReachable, Boolean inst
399392

400393
private MavenProjectBuilder createProjectBuilder( boolean expectBuildFromRepository, Boolean installAsJar )
401394
{
402-
MockControl control = MockControl.createControl( MavenProjectBuilder.class );
403-
404-
mm.add( control );
405-
406-
MavenProjectBuilder projectBuilder = (MavenProjectBuilder) control.getMock();
395+
MavenProjectBuilder projectBuilder = EasyMock.createMock( MavenProjectBuilder.class );
396+
mocks.add( projectBuilder );
407397

408398
if ( expectBuildFromRepository )
409399
{
@@ -413,14 +403,17 @@ private MavenProjectBuilder createProjectBuilder( boolean expectBuildFromReposit
413403

414404
if ( installAsJar != null )
415405
{
416-
model.addProperty( InstallPluginsMojo.PROP_UNPACK_PLUGIN, "" + ( !installAsJar) );
406+
model.addProperty( InstallPluginsMojo.PROP_UNPACK_PLUGIN, "" + ( !installAsJar ) );
417407
}
418408

419409
MavenProject project = new MavenProject( model );
420410

421-
projectBuilder.buildFromRepository( null, null, null, true );
422-
control.setMatcher( MockControl.ALWAYS_MATCHER );
423-
control.setReturnValue( project, MockControl.ONE_OR_MORE );
411+
EasyMock.expect( projectBuilder.buildFromRepository(
412+
EasyMock.<Artifact>anyObject(),
413+
EasyMock.anyObject(),
414+
EasyMock.<ArtifactRepository>anyObject(),
415+
EasyMock.anyBoolean() ) )
416+
.andReturn( project ).atLeastOnce();
424417
}
425418
catch ( ProjectBuildingException e )
426419
{
@@ -433,12 +426,8 @@ private MavenProjectBuilder createProjectBuilder( boolean expectBuildFromReposit
433426

434427
private ArtifactRepository createLocalRepository()
435428
{
436-
MockControl control = MockControl.createControl( ArtifactRepository.class );
437-
438-
mm.add( control );
439-
440-
ArtifactRepository repo = (ArtifactRepository) control.getMock();
441-
429+
ArtifactRepository repo = EasyMock.createNiceMock( ArtifactRepository.class );
430+
mocks.add( repo );
442431
return repo;
443432
}
444433

@@ -484,4 +473,4 @@ private File locateInstalledFile( Artifact artifact )
484473
{
485474
return new File( pluginsDir, formatEclipsePluginName( artifact ) + ".jar" );
486475
}
487-
}
476+
}

‎src/test/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocationsTest.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
import org.apache.maven.plugin.eclipse.TempEclipseWorkspace;
2323
import org.apache.maven.plugin.eclipse.WorkspaceConfiguration;
2424
import org.apache.maven.plugin.logging.Log;
25-
import org.apache.maven.shared.tools.easymock.MockManager;
26-
import org.easymock.MockControl;
25+
import org.easymock.EasyMock;
2726

2827
/**
2928
* @author <a href="mailto:baerrach@apache.org">Barrie Treloar</a>
@@ -42,9 +41,8 @@ public class ReadWorkspaceLocationsTest
4241
// private static final File WORKSPACE_PROJECT_METADATA_DIRECTORY =
4342
// new File( WORKSPACE_DIRECTORY, ReadWorkspaceLocations.METADATA_PLUGINS_ORG_ECLIPSE_CORE_RESOURCES_PROJECTS );
4443

45-
private MockManager mm = new MockManager();
46-
private File workspaceLocation;
47-
private File metaDataDirectory;
44+
private File workspaceLocation;
45+
private File metaDataDirectory;
4846

4947
/**
5048
* {@inheritDoc}
@@ -125,40 +123,35 @@ public void testGetProjectLocation_ForProjectsOutsideWorkspace()
125123
public void testReadDefinedServers_PrefsFileDoesNotExist()
126124
throws Exception
127125
{
128-
MockControl logControl = MockControl.createControl( Log.class );
129-
mm.add( logControl );
126+
Log logger = EasyMock.createNiceMock( Log.class );
127+
EasyMock.replay( logger );
130128

131-
Log logger = (Log) logControl.getMock();
132129
WorkspaceConfiguration workspaceConfiguration = new WorkspaceConfiguration();
133130
workspaceConfiguration.setWorkspaceDirectory( new File( "/does/not/exist" ) );
134131

135-
mm.replayAll();
136-
137132
ReadWorkspaceLocations objectUnderTest = new ReadWorkspaceLocations();
138133
Map<String, String> servers = objectUnderTest.readDefinedServers( workspaceConfiguration, logger );
139134

140-
mm.verifyAll();
135+
EasyMock.verify( logger );
141136
assertTrue( servers.isEmpty() );
142137
}
143138

144139
public void testReadDefinedServers_PrefsFileExistsWithMissingRuntimes()
145140
throws Exception
146141
{
147-
MockControl logControl = MockControl.createControl( Log.class );
148-
mm.add( logControl );
142+
Log logger = EasyMock.createNiceMock( Log.class );
143+
EasyMock.replay( logger );
149144

150-
Log logger = (Log) logControl.getMock();
151145
WorkspaceConfiguration workspaceConfiguration = new WorkspaceConfiguration();
152146
File prefsFile =
153147
new File(
154148
"target/test-classes/eclipse/dynamicWorkspace/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs" );
155149
workspaceConfiguration.setWorkspaceDirectory( prefsFile );
156-
mm.replayAll();
157150

158151
ReadWorkspaceLocations objectUnderTest = new ReadWorkspaceLocations();
159152
Map<String, String> servers = objectUnderTest.readDefinedServers( workspaceConfiguration, logger );
160153

161-
mm.verifyAll();
154+
EasyMock.verify( logger );
162155
assertTrue( servers.isEmpty() );
163156
}
164157

0 commit comments

Comments
 (0)