Skip to content

Commit d21e6cd

Browse files
committed
This commit includes following cleanup tasks for coverity tool commands
1) Removed the "PrepareCommand" method from the constructor of each command and call "PrepareCommand" before runCommand. 2) Use "AssertArrayEquals" to check the expected arguments and actual arguments of the commands 3) Instead of using EasyMock, "Mockito" and "PowerMockito" are used. 4) Used "try-catch" block to test the expected exceptions 5) Added "try-finally" block for unit tests that involves writing some physical test files.
1 parent ab487ce commit d21e6cd

19 files changed

Lines changed: 355 additions & 641 deletions

pom.xml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,28 @@
196196
<version>4.11</version>
197197
</dependency>
198198
<dependency>
199-
<groupId>org.easymock</groupId>
200-
<artifactId>easymock</artifactId>
201-
<version>3.1</version>
199+
<groupId>org.powermock</groupId>
200+
<artifactId>powermock-module-testng</artifactId>
201+
<version>1.6.6</version>
202+
<scope>test</scope>
203+
</dependency>
204+
<dependency>
205+
<groupId>org.powermock</groupId>
206+
<artifactId>powermock-module-junit4</artifactId>
207+
<version>1.6.6</version>
208+
<scope>test</scope>
209+
</dependency>
210+
<dependency>
211+
<groupId>org.powermock</groupId>
212+
<artifactId>powermock-api-mockito</artifactId>
213+
<version>1.6.6</version>
214+
<scope>test</scope>
215+
</dependency>
216+
<dependency>
217+
<groupId>org.mockito</groupId>
218+
<artifactId>mockito-all</artifactId>
219+
<version>1.10.19</version>
220+
<scope>test</scope>
202221
</dependency>
203222
</dependencies>
204223

src/main/java/jenkins/plugins/coverity/CoverityTool/CovAnalyzeCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class CovAnalyzeCommand extends CovCommand {
3030

3131
public CovAnalyzeCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskListener listener, CoverityPublisher publisher, String home, EnvVars envVars) {
3232
super(command, build, launcher, listener, publisher, home, envVars);
33-
prepareCommand();
3433
}
3534

3635
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovBuildCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class CovBuildCommand extends CovCommand {
2727

2828
public CovBuildCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskListener listener, CoverityPublisher publisher, String home, EnvVars envVars) {
2929
super(command, build, launcher, listener, publisher, home, envVars);
30-
prepareCommand();
3130
}
3231

3332
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovCaptureCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public class CovCaptureCommand extends CovCommand {
2626

2727
public CovCaptureCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskListener listener, CoverityPublisher publisher, String home, EnvVars envVars) {
2828
super(command, build, launcher, listener, publisher, home, envVars);
29-
prepareCommand();
3029
}
3130

3231
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public int runCommand() throws IOException, InterruptedException {
101101
if (invocationAssistance != null && invocationAssistance.getUseAdvancedParser()){
102102
useAdvancedParser = true;
103103
}
104-
104+
prepareCommand();
105105
return CoverityUtils.runCmd(commandLine, build, launcher, listener, envVars, useAdvancedParser);
106106
}
107107

src/main/java/jenkins/plugins/coverity/CoverityTool/CovCommitDefectsCommand.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ public CovCommitDefectsCommand(
4747
invocationAssistance = invocationAssistance.merge(cimStream.getInvocationAssistanceOverride());
4848
}
4949
}
50-
51-
prepareCommand();
5250
}
5351

5452
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovEmitJavaCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public CovEmitJavaCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskList
3232
super(command, build, launcher, listener, publisher, home, envVars);
3333
this.envVars = envVars;
3434
this.useAdvancedParser = useAdvancedParser;
35-
prepareCommand();
3635
}
3736

3837
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovImportMsvscaCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class CovImportMsvscaCommand extends CovCommand {
2828
public CovImportMsvscaCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskListener listener, CoverityPublisher publisher, String home, EnvVars envVars, File[] outputFiles) {
2929
super(command, build, launcher, listener, publisher, home, envVars);
3030
this.outputFiles = outputFiles;
31-
prepareCommand();
3231
}
3332

3433
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovImportScmCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public CovImportScmCommand(AbstractBuild<?, ?> build, Launcher launcher, TaskLis
3737
if (publisher != null && publisher.getInvocationAssistance() != null){
3838
useAdvancedParser = publisher.getInvocationAssistance().getUseAdvancedParser();
3939
}
40-
prepareCommand();
4140
}
4241

4342
@Override

src/main/java/jenkins/plugins/coverity/CoverityTool/CovManageHistoryCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public CovManageHistoryCommand(
3838
this.cimStream = cimStream;
3939
this.cimInstance = cimInstance;
4040
this.version = version;
41-
prepareCommand();
4241
}
4342

4443
@Override

0 commit comments

Comments
 (0)