Skip to content

Commit

Permalink
[JENKINS-23446] Added test case that verifies warning column.
Browse files Browse the repository at this point in the history
  • Loading branch information
@uhafner
uhafner committed Sep 24, 2014
1 parent 1ecf120 commit 70eea3a
Show file tree
Hide file tree
Showing 3 changed files with 180 additions and 76 deletions.
17 changes: 17 additions & 0 deletions src/main/java/org/jenkinsci/test/acceptance/plugins/warnings/WarningsColumn.java
View file
@@ -0,0 +1,17 @@
package org.jenkinsci.test.acceptance.plugins.warnings;

import org.jenkinsci.test.acceptance.po.AbstractListViewColumn;
import org.jenkinsci.test.acceptance.po.Describable;
import org.jenkinsci.test.acceptance.po.ListView;

/**
* View Column showing the number of compiler warnings.
*
* @author Ulli Hafner
*/
@Describable("Number of compiler warnings")
public class WarningsColumn extends AbstractListViewColumn {
public WarningsColumn(final ListView parent, final String path) {
super(parent, path);
}
}
141 changes: 78 additions & 63 deletions src/test/java/plugins/AbstractAnalysisTest.java
View file
Expand Up @@ -13,8 +13,8 @@
import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
import org.jenkinsci.test.acceptance.junit.Resource;
import org.jenkinsci.test.acceptance.plugins.analysis_core.AnalysisConfigurator;
import org.jenkinsci.test.acceptance.plugins.analysis_core.AnalysisSettings;
import org.jenkinsci.test.acceptance.plugins.analysis_core.AnalysisMavenSettings;
import org.jenkinsci.test.acceptance.plugins.analysis_core.AnalysisSettings;
import org.jenkinsci.test.acceptance.plugins.dashboard_view.AbstractDashboardViewPortlet;
import org.jenkinsci.test.acceptance.plugins.dashboard_view.DashboardView;
import org.jenkinsci.test.acceptance.plugins.maven.MavenBuildStep;
Expand All @@ -25,6 +25,7 @@
import org.jenkinsci.test.acceptance.po.Job;
import org.jenkinsci.test.acceptance.po.ListView;
import org.jenkinsci.test.acceptance.po.ListViewColumn;
import org.jenkinsci.test.acceptance.po.MatrixProject;
import org.jenkinsci.test.acceptance.po.PostBuildStep;
import org.jenkinsci.test.acceptance.po.Slave;
import org.jenkinsci.test.acceptance.po.View;
Expand All @@ -46,38 +47,38 @@ public abstract class AbstractAnalysisTest extends AbstractJUnitTest {
SlaveController slaveController;

/**
* Set up a Job of a certain type with a given resource and a publisher which can be
* configured by providing a configurator
* Set up a Job of a certain type with a given resource and a publisher which can be configured by providing a
* configurator
*
* @param resourceToCopy Resource to copy to build (Directory or File path)
* @param jobClass the type the job shall be created of, e.g. FreeStyleJob
* @param resourceToCopy Resource to copy to build (Directory or File path)
* @param jobClass the type the job shall be created of, e.g. FreeStyleJob
* @param publisherBuildSettingsClass the type of the publisher to be added
* @param configurator the configuration of the publisher
* @param configurator the configuration of the publisher
* @return the new job
*/
public <J extends Job, T extends AnalysisSettings & PostBuildStep> J setupJob(String resourceToCopy,
Class<J> jobClass,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
Class<J> jobClass,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
return setupJob(resourceToCopy, jobClass, publisherBuildSettingsClass, configurator, null);
}

/**
* Set up a Job of a certain type with a given resource and a publisher which can be
* configured by providing a configurator
* Set up a Job of a certain type with a given resource and a publisher which can be configured by providing a
* configurator
*
* @param resourceToCopy Resource to copy to build (Directory or File path)
* @param jobClass the type the job shall be created of, e.g. FreeStyleJob
* @param resourceToCopy Resource to copy to build (Directory or File path)
* @param jobClass the type the job shall be created of, e.g. FreeStyleJob
* @param publisherBuildSettingsClass the type of the publisher to be added
* @param configurator the configuration of the publisher
* @param goal a maven goal to be added to the job or null otherwise
* @param configurator the configuration of the publisher
* @param goal a maven goal to be added to the job or null otherwise
* @return the new job
*/
public <J extends Job, T extends AnalysisSettings & PostBuildStep> J setupJob(String resourceToCopy,
Class<J> jobClass,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator,
String goal) {
Class<J> jobClass,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator,
String goal) {
if (jobClass.isAssignableFrom(MavenModuleSet.class)) {
MavenInstallation.ensureThatMavenIsInstalled(jenkins);
}
Expand All @@ -94,7 +95,8 @@ public <J extends Job, T extends AnalysisSettings & PostBuildStep> J setupJob(St
if (goal != null) {
if (jobClass.isAssignableFrom(MavenModuleSet.class)) {
((MavenModuleSet) job).goals.set(goal);
} else if (jobClass.isAssignableFrom(FreeStyleJob.class)) {
}
else if (isFreeStyleOrMatrixJob(jobClass)) {
job.addBuildStep(MavenBuildStep.class).targets.set(goal);
}
}
Expand All @@ -103,7 +105,8 @@ public <J extends Job, T extends AnalysisSettings & PostBuildStep> J setupJob(St

if (jobClass.isAssignableFrom(MavenModuleSet.class)) {
buildSettings = ((MavenModuleSet) job).addBuildSettings(publisherBuildSettingsClass);
} else if (jobClass.isAssignableFrom(FreeStyleJob.class)) {
}
else if (isFreeStyleOrMatrixJob(jobClass)) {
buildSettings = job.addPublisher(publisherBuildSettingsClass);
}

Expand All @@ -115,73 +118,81 @@ public <J extends Job, T extends AnalysisSettings & PostBuildStep> J setupJob(St
return job;
}

private <J extends Job> boolean isFreeStyleOrMatrixJob(final Class<J> jobClass) {
return jobClass.isAssignableFrom(FreeStyleJob.class)
|| jobClass.isAssignableFrom((MatrixProject.class));
}

/**
* Provides the ability to edit an existing job by changing or adding the resource to copy
* and/or by changing the configuration of a publisher
* Provides the ability to edit an existing job by changing or adding the resource to copy and/or by changing the
* configuration of a publisher
*
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not to be changed
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not to be
* changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param job the job to be changed
* @return the edited job
*/
public <J extends Job, T extends AnalysisSettings & PostBuildStep> J editJob(String newResourceToCopy,
boolean isAdditionalResource,
J job) {
boolean isAdditionalResource,
J job) {
return edit(newResourceToCopy, isAdditionalResource, job, null, null);
}

/**
* Provides the ability to edit an existing job by changing or adding the resource to copy
* and/or by changing the configuration of a publisher
* Provides the ability to edit an existing job by changing or adding the resource to copy and/or by changing the
* configuration of a publisher
*
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not to be changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not
* to be changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param publisherBuildSettingsClass the type of the publisher to be modified
* @param configurator the new configuration of the publisher
* @param configurator the new configuration of the publisher
* @return the edited job
*/
public <J extends Job, T extends AnalysisSettings & PostBuildStep> J editJob(String newResourceToCopy,
boolean isAdditionalResource,
J job,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
boolean isAdditionalResource,
J job,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
return edit(newResourceToCopy, isAdditionalResource, job, publisherBuildSettingsClass, configurator);
}

/**
* Provides the ability to edit an existing job by changing or adding the resource to copy
* and/or by changing the configuration of a publisher
* Provides the ability to edit an existing job by changing or adding the resource to copy and/or by changing the
* configuration of a publisher
*
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param publisherBuildSettingsClass the type of the publisher to be modified
* @param configurator the new configuration of the publisher
* @param configurator the new configuration of the publisher
* @return the edited job
*/
public <J extends Job, T extends AnalysisSettings & PostBuildStep> J editJob(boolean isAdditionalResource,
J job,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
J job,
Class<T> publisherBuildSettingsClass,
AnalysisConfigurator<T> configurator) {
return edit(null, isAdditionalResource, job, publisherBuildSettingsClass, configurator);
}

/**
* Provides the ability to edit an existing job by changing or adding the resource to copy
* and/or by changing the configuration of a publisher
* Provides the ability to edit an existing job by changing or adding the resource to copy and/or by changing the
* configuration of a publisher
*
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not to be changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param newResourceToCopy the new resource to be copied to build (Directory or File path) or null if not
* to be changed
* @param isAdditionalResource decides whether the old resource is kept (FALSE) or deleted (TRUE)
* @param job the job to be changed
* @param publisherBuildSettingsClass the type of the publisher to be modified
* @param configurator the new configuration of the publisher
* @param configurator the new configuration of the publisher
* @return the edited job
*/
private <J extends Job, T extends AnalysisSettings & PostBuildStep> J edit(String newResourceToCopy,
boolean isAdditionalResource,
J job,
Class<T> publisherBuildSettingsClass,
@CheckForNull AnalysisConfigurator<T> configurator) {
boolean isAdditionalResource,
J job,
Class<T> publisherBuildSettingsClass,
@CheckForNull AnalysisConfigurator<T> configurator) {
job.configure();

if (newResourceToCopy != null) {
Expand All @@ -199,7 +210,8 @@ private <J extends Job, T extends AnalysisSettings & PostBuildStep> J edit(Strin

if (job instanceof MavenModuleSet) {
configurator.configure(((MavenModuleSet) job).getBuildSettings(publisherBuildSettingsClass));
} else if (job instanceof FreeStyleJob) {
}
else if (job instanceof FreeStyleJob) {
configurator.configure(job.getPublisher(publisherBuildSettingsClass));
}

Expand Down Expand Up @@ -230,17 +242,18 @@ public Slave makeASlaveAndConfigureJob(Job job) throws ExecutionException, Inter
/**
* Setup a maven build.
*
* @param resourceProjectDir A Folder in resources which shall be copied to the working directory. Should contain the pom.xml
* @param resourceProjectDir A Folder in resources which shall be copied to the working directory. Should
* contain the pom.xml
* @param goal The maven goals to set.
* @param codeStyleBuildSettings The code analyzer to use or null if you do not want one.
* @param configurator A configurator to custommize the code analyzer settings you want to use.
* @param <T> The type of the Analyzer.
* @return The configured job.
*/
public <T extends AnalysisMavenSettings> MavenModuleSet setupMavenJob(String resourceProjectDir,
String goal,
Class<T> codeStyleBuildSettings,
AnalysisConfigurator<T> configurator) {
String goal,
Class<T> codeStyleBuildSettings,
AnalysisConfigurator<T> configurator) {
MavenInstallation.ensureThatMavenIsInstalled(jenkins);

MavenModuleSet job = jenkins.jobs.create(MavenModuleSet.class);
Expand Down Expand Up @@ -336,8 +349,9 @@ protected <T extends ListViewColumn> ListView addDashboardListViewColumn(Class<T

/**
* Creates a new view with a random name that matches all jobs.
*
* @param viewClass The view that shall be used.
* @param <T> The type constraint of the view.
* @param <T> The type constraint of the view.
* @return The view.
*/
private <T extends View> T createNewViewForAllJobs(Class<T> viewClass) {
Expand All @@ -359,7 +373,8 @@ protected <J extends Job> J addResourceToJob(J job, String resourceToCopy) {
//decide whether to utilize copyResource or copyDir
if (res.asFile().isDirectory()) {
job.copyDir(res);
} else {
}
else {
job.copyResource(res);
}

Expand All @@ -370,7 +385,7 @@ protected <J extends Job> J addResourceToJob(J job, String resourceToCopy) {
* Creates a new Dashboard-View and adds the given portlet as "bottom portlet".
*
* @param portlet The Portlet that shall be added.
* @param <T> The type constraint of the portlet.
* @param <T> The type constraint of the portlet.
* @return The view.
*/
protected <T extends AbstractDashboardViewPortlet> DashboardView addDashboardViewAndBottomPortlet(Class<T> portlet) {
Expand Down

0 comments on commit 70eea3a

Please sign in to comment.