Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed test, for JENKINS-26484
  • Loading branch information
MadsNielsen committed Jan 30, 2015
1 parent e8e241b commit 2ff769e
Show file tree
Hide file tree
Showing 37 changed files with 282 additions and 224 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Expand Up @@ -12,7 +12,7 @@
</properties>

<artifactId>clearcase-ucm-plugin</artifactId>
<version>1.5.6-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<name>ClearCase UCM Plugin!</name>
<description>Integrates Jenkins to ClearCase UCM</description>
<url>https://wiki.jenkins-ci.org/display/JENKINS/ClearCase+UCM+Plugin</url>
Expand Down Expand Up @@ -430,14 +430,14 @@
<dependency>
<groupId>net.praqma</groupId>
<artifactId>cool</artifactId>
<version>0.6.37-PERFORMANCE-SNAPSHOT</version>
<version>0.6.37</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>net.praqma</groupId>
<artifactId>cool</artifactId>
<version>0.6.37-PERFORMANCE-SNAPSHOT</version>
<version>0.6.37</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/praqma/hudson/Config.java
Expand Up @@ -19,7 +19,6 @@ private Config() { }

public static List<String> getLevels() {
List<String> levels = Project.getPromotionLevels();
levels.add( "ANY" );
return levels;
}

Expand Down
8 changes: 1 addition & 7 deletions src/main/java/net/praqma/hudson/notifier/CCUCMNotifier.java
Expand Up @@ -228,13 +228,7 @@ private void processBuild( AbstractBuild<?, ?> build, Launcher launcher, BuildLi
if( pstate.doRecommend() ) {
out.println( String.format( "%s Cannot recommend Baseline when not created", logShortPrefix ) );
}

//JENKINS-18107
if( pstate.getPolling().isPollingSelf() && pstate.doCreateBaseline() ) {
out.println("You cannot create a baseline in poll self mode.");
logger.warning("You cannot create a baseline in poll self mode.");
}


/* Set unstable? */
logger.warning( "Failing build because baseline could not be created" );
build.setResult( Result.FAILURE );
Expand Down
168 changes: 66 additions & 102 deletions src/main/java/net/praqma/hudson/scm/CCUCMScm.java

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions src/main/java/net/praqma/hudson/scm/pollingmode/PollChildMode.java
Expand Up @@ -6,21 +6,24 @@
package net.praqma.hudson.scm.pollingmode;

import hudson.Extension;
import hudson.util.ListBoxModel;
import net.praqma.hudson.Config;
import net.praqma.hudson.scm.Polling;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

/**
*
* @author Mads
*/
public class PollChildMode extends PollingMode implements BaselineCreationEnabled{

private boolean createBaseline;
private boolean createBaseline = false;

@DataBoundConstructor
public PollChildMode(boolean createBaseline) {
polling = new Polling(Polling.PollingType.childs);
this.createBaseline = createBaseline;
public PollChildMode(String levelToPoll) {
super(levelToPoll);
polling = new Polling(Polling.PollingType.childs);
}

/**
Expand All @@ -34,6 +37,7 @@ public boolean isCreateBaseline() {
/**
* @param createBaseline the createBaseline to set
*/
@DataBoundSetter
public void setCreateBaseline(boolean createBaseline) {
this.createBaseline = createBaseline;
}
Expand All @@ -48,5 +52,13 @@ public String getDisplayName() {
return "Poll child";
}

public ListBoxModel doFillLevelToPollItems() {
ListBoxModel model = new ListBoxModel();
for(String s : Config.getLevels()) {
model.add(s);
}
return model;
}

}
}
Expand Up @@ -6,6 +6,8 @@
package net.praqma.hudson.scm.pollingmode;

import hudson.Extension;
import hudson.util.ListBoxModel;
import net.praqma.hudson.Config;
import net.praqma.hudson.scm.Polling;
import org.kohsuke.stapler.DataBoundConstructor;

Expand All @@ -16,7 +18,8 @@
public class PollSelfMode extends PollingMode {

@DataBoundConstructor
public PollSelfMode() {
public PollSelfMode(String levelToPoll) {
super(levelToPoll);
polling = new Polling(Polling.PollingType.self);
}

Expand All @@ -29,6 +32,16 @@ public PollSelfDescriptor() {}
public String getDisplayName() {
return "Poll self";
}

public ListBoxModel doFillLevelToPollItems() {
ListBoxModel model = new ListBoxModel();
model.add("ANY");
for(String s : Config.getLevels()) {
model.add(s);
}

return model;
}

}
}
Expand Up @@ -6,27 +6,29 @@
package net.praqma.hudson.scm.pollingmode;

import hudson.Extension;
import hudson.util.ListBoxModel;
import net.praqma.hudson.Config;
import net.praqma.hudson.scm.Polling;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

/**
*
* @author Mads
*/
public class PollSiblingMode extends PollingMode implements BaselineCreationEnabled {

private boolean useHyperLinkForPolling;
private boolean createBaseline;
private boolean useHyperLinkForPolling = false;
private boolean createBaseline = false;

@DataBoundConstructor
public PollSiblingMode(boolean useHyperLinkForPolling, boolean createBaseline) {
public PollSiblingMode(String levelToPoll) {
super(levelToPoll);
if(useHyperLinkForPolling) {
polling = new Polling(Polling.PollingType.siblingshlink);
} else {
polling = new Polling(Polling.PollingType.siblings);
}
this.useHyperLinkForPolling = useHyperLinkForPolling;
this.createBaseline = createBaseline;
}

/**
Expand All @@ -39,6 +41,7 @@ public boolean isUseHyperLinkForPolling() {
/**
* @param useHyperLinkForPolling the useHyperLinkForPolling to set
*/
@DataBoundSetter
public void setUseHyperLinkForPolling(boolean useHyperLinkForPolling) {
this.useHyperLinkForPolling = useHyperLinkForPolling;
}
Expand All @@ -54,6 +57,7 @@ public boolean isCreateBaseline() {
/**
* @param createBaseline the createBaseline to set
*/
@DataBoundSetter
public void setCreateBaseline(boolean createBaseline) {
this.createBaseline = createBaseline;
}
Expand All @@ -68,5 +72,13 @@ public String getDisplayName() {
return "Poll sibling";
}

public ListBoxModel doFillLevelToPollItems() {
ListBoxModel model = new ListBoxModel();
for(String s : Config.getLevels()) {
model.add(s);
}
return model;
}

}
}
35 changes: 33 additions & 2 deletions src/main/java/net/praqma/hudson/scm/pollingmode/PollingMode.java
Expand Up @@ -10,6 +10,8 @@
import hudson.model.Describable;
import hudson.model.Descriptor;
import jenkins.model.Jenkins;
import net.praqma.clearcase.ucm.entities.Project;
import net.praqma.hudson.Util;
import net.praqma.hudson.scm.Polling;
import org.kohsuke.stapler.DataBoundConstructor;

Expand All @@ -20,10 +22,12 @@
public class PollingMode implements Describable<PollingMode>, ExtensionPoint {

protected Polling polling;
private String levelToPoll = "INITIAL";

@DataBoundConstructor
public PollingMode() { }

public PollingMode(String levelToPoll) {
this.levelToPoll = levelToPoll;
}

@Override
public Descriptor<PollingMode> getDescriptor() {
Expand All @@ -47,4 +51,31 @@ public Polling getPolling() {
public void setPolling(Polling polling) {
this.polling = polling;
}

public boolean createBaselineEnabled() {
if(this instanceof PollSelfMode) {
return false;
} else {
return ((BaselineCreationEnabled)this).isCreateBaseline();
}
}

/**
* @return the levelToPoll
*/
public String getLevelToPoll() {
return levelToPoll;
}

public void setLevelToPoll(String levelToPoll) {
this.levelToPoll = levelToPoll;
}

/**
*
* @return A converted enum from the value entered in the UI.
*/
public Project.PromotionLevel getPromotionLevel() {
return Util.getLevel(levelToPoll);
}
}
Expand Up @@ -9,15 +9,6 @@
<f:textbox name="CCUCM.component" value="${scm.component}"/>
</f:entry>

<j:set var="levels" value="${descriptor.getLevels()}"/>
<f:entry title="Promotion level" help="/plugin/clearcase-ucm-plugin/scm/help-pLevel.html">
<select class="setting-input" name="CCUCM.levelToPoll">
<j:forEach var="l" items="${levels}">
<f:option selected="${scm.levelToPoll==l}" value="${l}">${l}</f:option>
</j:forEach>
</select>
</f:entry>

<f:entry title="Load modules" help="/plugin/clearcase-ucm-plugin/scm/help-loadModules.html">
<select class="setting-input" name="CCUCM.loadModule">
<j:set var="modules" value="${descriptor.getLoadModules()}"/>
Expand Down
@@ -1,5 +1,6 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<st:include page="config.jelly" class="net.praqma.hudson.scm.pollingmode.PollingMode"></st:include>
<f:entry field="createBaseline" title="Create baseline">
<f:checkbox/>
</f:entry>
Expand Down
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

<st:include page="config.jelly" class="net.praqma.hudson.scm.pollingmode.PollingMode"></st:include>
</j:jelly>
@@ -1,5 +1,6 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<st:include page="config.jelly" class="net.praqma.hudson.scm.pollingmode.PollingMode"></st:include>
<f:entry field="useHyperLinkForPolling" title="Use hyperlink to specify deliver target">
<f:checkbox/>
</f:entry>
Expand Down
@@ -0,0 +1,8 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

<f:entry field="levelToPoll" title="Promotion level">
<f:select></f:select>
</f:entry>

</j:jelly>

0 comments on commit 2ff769e

Please sign in to comment.