diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/ConventionalCommits.java b/src/main/java/io/jenkins/plugins/conventionalcommits/ConventionalCommits.java index a061dd6..e07f05c 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/ConventionalCommits.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/ConventionalCommits.java @@ -2,11 +2,11 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.utils.LogUtils; - import java.util.List; import java.util.logging.Level; import java.util.stream.Collectors; +/** Class to process conventional commit messages to get next version. */ public class ConventionalCommits { LogUtils logger = new LogUtils(); @@ -15,6 +15,13 @@ private List filterMergeCommits(List commits) { return commits.stream().filter(s -> !s.startsWith("Merge")).collect(Collectors.toList()); } + /** + * Return the next semantic version. + * + * @param in The current semantic version. + * @param commits List of commit messages from the last tag. + * @return The next calculated version (based on Semver). + */ public Version nextVersion(Version in, List commits) { List filtered = filterMergeCommits(commits); List breaking = diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/NextVersionStep.java b/src/main/java/io/jenkins/plugins/conventionalcommits/NextVersionStep.java index 1ade17b..dee2719 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/NextVersionStep.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/NextVersionStep.java @@ -8,11 +8,6 @@ import hudson.FilePath; import hudson.model.TaskListener; import io.jenkins.plugins.conventionalcommits.utils.CurrentVersion; -import org.jenkinsci.plugins.workflow.steps.*; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.DataBoundSetter; - -import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -21,7 +16,16 @@ import java.util.Arrays; import java.util.List; import java.util.Set; +import javax.annotation.Nonnull; +import org.jenkinsci.plugins.workflow.steps.Step; +import org.jenkinsci.plugins.workflow.steps.StepContext; +import org.jenkinsci.plugins.workflow.steps.StepDescriptor; +import org.jenkinsci.plugins.workflow.steps.StepExecution; +import org.jenkinsci.plugins.workflow.steps.SynchronousStepExecution; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.DataBoundSetter; +/** Base class of the plugin. */ public class NextVersionStep extends Step { private String outputFormat; @@ -53,6 +57,13 @@ private static String execute(File dir, String... commandAndArgs) return stdout(process.getInputStream()); } + /** + * Reads data from stdout. + * + * @param in InputStream object. + * @return read data. + * @throws IOException If an error occur reading files. + */ public static String stdout(InputStream in) throws IOException { StringBuilder builder = new StringBuilder(); LineReader reader = new LineReader(new InputStreamReader(in, StandardCharsets.UTF_8)); @@ -82,6 +93,7 @@ public StepExecution start(StepContext stepContext) throws Exception { return new Execution(outputFormat, startTag, stepContext); } + /** This class extends Step Execution class, contains the run method. */ public static class Execution extends SynchronousStepExecution { private static final long serialVersionUID = 1L; @@ -150,6 +162,7 @@ protected String run() throws Exception { } } + /** This Class implements the abstract class StepDescriptor. */ @Extension public static class DescriptorImpl extends StepDescriptor { diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/dto/HelmChart.java b/src/main/java/io/jenkins/plugins/conventionalcommits/dto/HelmChart.java index b9bccec..1b93244 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/dto/HelmChart.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/dto/HelmChart.java @@ -3,34 +3,34 @@ import java.io.Serializable; import java.util.Objects; -/** - * DTO to represent an helm chart's file. - */ +/** DTO to represent an helm chart's file. */ public class HelmChart implements Serializable { - // Version attribute - private String version; + // Version attribute + private String version; - public String getVersion() { - return version; - } + public String getVersion() { + return version; + } - public void setVersion(String version) { - this.version = version; - } + public void setVersion(String version) { + this.version = version; + } - @Override - public boolean equals(Object anotherObject) { - if (this == anotherObject) return true; - if (anotherObject == null || getClass() != anotherObject.getClass()) return false; - HelmChart helmChart = (HelmChart) anotherObject; - return Objects.equals(version, helmChart.version); + @Override + public boolean equals(Object anotherObject) { + if (this == anotherObject) { + return true; } - - @Override - public int hashCode() { - return Objects.hash(version); + if (anotherObject == null || getClass() != anotherObject.getClass()) { + return false; } - - + HelmChart helmChart = (HelmChart) anotherObject; + return Objects.equals(version, helmChart.version); + } + + @Override + public int hashCode() { + return Objects.hash(version); + } } diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectTOML.java b/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectTOML.java deleted file mode 100644 index faaf2f8..0000000 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectTOML.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.jenkins.plugins.conventionalcommits.dto; - -import com.moandjiezana.toml.Toml; - -import java.io.File; - -/** DTO to represent a pyproject.toml file. */ -public class PyProjectTOML { - - public String getVersion(String TOMLFilePath) { - Toml tomlFile = new Toml().read(new File(TOMLFilePath)); - - Toml project = tomlFile.getTable("project"); - return project.getString("version"); - } -} diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectToml.java b/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectToml.java new file mode 100644 index 0000000..da61780 --- /dev/null +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/dto/PyProjectToml.java @@ -0,0 +1,21 @@ +package io.jenkins.plugins.conventionalcommits.dto; + +import com.moandjiezana.toml.Toml; +import java.io.File; + +/** DTO to represent a pyproject.toml file. */ +public class PyProjectToml { + + /** + * Return the next version of the version attribute. + * + * @param tomlFilePath The path to the pyproject.toml file. + * @return Current Version of the project mentioned in the pyproject.toml file. + */ + public String getVersion(String tomlFilePath) { + Toml tomlFile = new Toml().read(new File(tomlFilePath)); + + Toml project = tomlFile.getTable("project"); + return project.getString("version"); + } +} diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/process/DefaultProcessHelper.java b/src/main/java/io/jenkins/plugins/conventionalcommits/process/DefaultProcessHelper.java index f64cd3c..e8c8fc1 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/process/DefaultProcessHelper.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/process/DefaultProcessHelper.java @@ -1,12 +1,12 @@ package io.jenkins.plugins.conventionalcommits.process; -import org.apache.commons.io.IOUtils; - import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; +import org.apache.commons.io.IOUtils; +/** This class runs a given command using ProcessBuilder. */ public class DefaultProcessHelper implements ProcessHelper { @Override @@ -22,5 +22,4 @@ public String runProcessBuilder(File directory, List command) return results; } - ; } diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/process/ProcessHelper.java b/src/main/java/io/jenkins/plugins/conventionalcommits/process/ProcessHelper.java index 5f5a755..b7a8252 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/process/ProcessHelper.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/process/ProcessHelper.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.List; +/** Interface intended to run CLI commands using ProcessBuilder. */ public interface ProcessHelper { String runProcessBuilder(File directory, List command) throws IOException, InterruptedException; diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersion.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersion.java index 0657de3..4fa1376 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersion.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersion.java @@ -3,10 +3,10 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.DefaultProcessHelper; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; +/** This class focus on getting the current version (latest release version) of a project. */ public class CurrentVersion { private ProcessHelper processHelper; @@ -19,6 +19,15 @@ private Version getCurrentVersionTag(String latestTag) { return Version.valueOf(latestTag.isEmpty() ? "0.0.0" : latestTag); } + /** + * Return the next version of the version attribute. + * + * @param directory The project's directory. + * @param latestTag The last tagged version. + * @return The current version (based on Semver). + * @throws IOException If an error occur reading files. + * @throws InterruptedException If an error occurs while executing command using processHelper. + */ public Version getCurrentVersion(File directory, String latestTag) throws IOException, InterruptedException { @@ -26,9 +35,13 @@ public Version getCurrentVersion(File directory, String latestTag) ProjectType projectType = ProjectTypeFactory.getProjectType(directory); if (projectType != null) { - if (processHelper == null) processHelper = new DefaultProcessHelper(); + if (processHelper == null) { + processHelper = new DefaultProcessHelper(); + } currentVersion = projectType.getCurrentVersion(directory, processHelper); - } else currentVersion = getCurrentVersionTag(latestTag); + } else { + currentVersion = getCurrentVersionTag(latestTag); + } return currentVersion; } diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/GradleProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/GradleProjectType.java index 66ca99e..811ecfa 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/GradleProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/GradleProjectType.java @@ -2,12 +2,12 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; +/** Represent a Gradle project type (i.e with a build.gradle file). */ public class GradleProjectType extends ProjectType { public boolean check(File directory) { diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/HelmProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/HelmProjectType.java index 052c1e9..1717bf8 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/HelmProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/HelmProjectType.java @@ -6,47 +6,47 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.dto.HelmChart; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; import java.util.Objects; -/** - * Represent an Helm project type (i.e with a Chart.yaml file). - */ +/** Represent an Helm project type (i.e with a Chart.yaml file). */ public class HelmProjectType extends ProjectType { - // Helm chart's file name - private static final String CHART_YAML_NAME = "Chart.yaml"; + // Helm chart's file name + private static final String CHART_YAML_NAME = "Chart.yaml"; - /** - * To know if the project is an Helm project type. - * - * @param directory The directory to check. Mandatory - * @return true if a Chart.yaml file is found. - */ - @Override - public boolean check(File directory) { - Objects.requireNonNull(directory); - return new File(directory.getAbsoluteFile() + File.separator + CHART_YAML_NAME).exists(); - } + /** + * To know if the project is an Helm project type. + * + * @param directory The directory to check. Mandatory + * @return true if a Chart.yaml file is found. + */ + @Override + public boolean check(File directory) { + Objects.requireNonNull(directory); + return new File(directory.getAbsoluteFile() + File.separator + CHART_YAML_NAME).exists(); + } - /** - * Return the next version of the version attribute. - * - * @param directory The project's directory. - * @param processHelper Not used. - * @return The next calculated version (based on Semver). - * @throws IOException If an error occur reading files. - */ - @Override - public Version getCurrentVersion(File directory, ProcessHelper processHelper) throws IOException { - Objects.requireNonNull(directory); + /** + * Return the next version of the version attribute. + * + * @param directory The project's directory. + * @param processHelper Not used. + * @return The next calculated version (based on Semver). + * @throws IOException If an error occur reading files. + */ + @Override + public Version getCurrentVersion(File directory, ProcessHelper processHelper) throws IOException { + Objects.requireNonNull(directory); - ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - // Convert Chart.yaml to a DTO - HelmChart chart = mapper.readValue(new File(directory.getAbsoluteFile() + File.separator + CHART_YAML_NAME), HelmChart.class); - return Version.valueOf(chart.getVersion()); - } + // Convert Chart.yaml to a DTO + HelmChart chart = + mapper.readValue( + new File(directory.getAbsoluteFile() + File.separator + CHART_YAML_NAME), + HelmChart.class); + return Version.valueOf(chart.getVersion()); + } } diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/LogUtils.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/LogUtils.java index 10f2929..e4a6038 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/LogUtils.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/LogUtils.java @@ -1,12 +1,12 @@ package io.jenkins.plugins.conventionalcommits.utils; import io.jenkins.plugins.conventionalcommits.ConventionalCommits; - import java.util.logging.ConsoleHandler; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; +/** Handles Logging. */ public class LogUtils { private static final Logger LOGGER = Logger.getLogger(ConventionalCommits.class.getName()); @@ -24,6 +24,17 @@ private void afterLogging(Level loggerLevel, Level consoleLevel) { consoleHandler.setLevel(consoleLevel); } + /** + * Logs to console. + * + * @param initialLogLevel Log Level before the current log. + * @param initialConsoleLevel ConsoleHandler's level before the current log. + * @param requiredLogLevel Log Level at which current log is to be written. + * @param requiredConsoleLevel ConsoleHandler's level for the current log string. + * @param revertAfterLogging If True, revert to initial log and console level after logging the + * current log string. + * @param message Log message. + */ public void log( Level initialLogLevel, Level initialConsoleLevel, @@ -31,12 +42,11 @@ public void log( Level requiredConsoleLevel, boolean revertAfterLogging, String message) { - /* - revertAfterLogging (boolean): revert to initial log and console level after logging the current log string - */ beforeLogging(requiredLogLevel, requiredConsoleLevel); LOGGER.log(requiredLogLevel, message); - if (revertAfterLogging) afterLogging(initialLogLevel, initialConsoleLevel); + if (revertAfterLogging) { + afterLogging(initialLogLevel, initialConsoleLevel); + } } } diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MakeProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MakeProjectType.java index b71ac31..3be6183 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MakeProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MakeProjectType.java @@ -2,12 +2,12 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Scanner; +/** Represent a Make project type (i.e with a Makefile). */ public class MakeProjectType extends ProjectType { private static final String MAKEFILE_FILENAME = "Makefile"; diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MavenProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MavenProjectType.java index 05cc504..b02e9e5 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MavenProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/MavenProjectType.java @@ -2,12 +2,12 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; +/** Represent a Maven project type (i.e with a pom.xml file). */ public class MavenProjectType extends ProjectType { public boolean check(File directory) { diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/NpmProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/NpmProjectType.java index 0e4a2f1..9813449 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/NpmProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/NpmProjectType.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; import java.nio.file.Paths; diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectType.java index 52745ab..8ee1506 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectType.java @@ -2,7 +2,6 @@ import com.github.zafarkhaja.semver.Version; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; - import java.io.File; import java.io.IOException; diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeFactory.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeFactory.java index 079eccd..b033c5e 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeFactory.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeFactory.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; +/** Factory class to support multiple project types. */ public class ProjectTypeFactory { static Map projectTypeMap = new HashMap<>(); @@ -17,6 +18,12 @@ public class ProjectTypeFactory { projectTypeMap.put("helm", new HelmProjectType()); } + /** + * Detects & returns the type of the project. + * + * @param directory The project's directory. + * @return Detected project type. + */ public static ProjectType getProjectType(File directory) { ProjectType projectType = null; diff --git a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/PythonProjectType.java b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/PythonProjectType.java index 6354c3c..5a8eb21 100644 --- a/src/main/java/io/jenkins/plugins/conventionalcommits/utils/PythonProjectType.java +++ b/src/main/java/io/jenkins/plugins/conventionalcommits/utils/PythonProjectType.java @@ -1,20 +1,19 @@ package io.jenkins.plugins.conventionalcommits.utils; import com.github.zafarkhaja.semver.Version; -import io.jenkins.plugins.conventionalcommits.dto.PyProjectTOML; +import io.jenkins.plugins.conventionalcommits.dto.PyProjectToml; import io.jenkins.plugins.conventionalcommits.process.ProcessHelper; -import org.apache.commons.lang.NotImplementedException; - import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Scanner; +import org.apache.commons.lang.NotImplementedException; /** - * Represent a python project type. Projects any of the having following files are supported: - * 1. setup.py 2. setup.cfg 3. pyproject.toml + * Represent a python project type. Projects any of the having following files are supported: 1. + * setup.py 2. setup.cfg 3. pyproject.toml */ public class PythonProjectType extends ProjectType { @@ -26,13 +25,13 @@ private boolean checkSetupCfg(File directory) { return new File(directory, "setup.cfg").exists(); } - private boolean checkPyProjectTOML(File directory) { + private boolean checkPyProjectToml(File directory) { return new File(directory, "pyproject.toml").exists(); } @Override public boolean check(File directory) { - return checkSetupCfg(directory) || checkSetupPy(directory) || checkPyProjectTOML(directory); + return checkSetupCfg(directory) || checkSetupPy(directory) || checkPyProjectToml(directory); } @Override @@ -66,9 +65,9 @@ public Version getCurrentVersion(File directory, ProcessHelper processHelper) } } - } else if (checkPyProjectTOML(directory)) { - String TOMLFilePath = directory.getAbsolutePath() + File.separator + "pyproject.toml"; - result = new PyProjectTOML().getVersion(TOMLFilePath); + } else if (checkPyProjectToml(directory)) { + String tomlFilePath = directory.getAbsolutePath() + File.separator + "pyproject.toml"; + result = new PyProjectToml().getVersion(tomlFilePath); } else { throw new NotImplementedException("Project not supported"); diff --git a/src/test/java/io/jenkins/plugins/conventionalcommits/JenkinsTest.java b/src/test/java/io/jenkins/plugins/conventionalcommits/JenkinsTest.java index 048ddf8..6ad3994 100644 --- a/src/test/java/io/jenkins/plugins/conventionalcommits/JenkinsTest.java +++ b/src/test/java/io/jenkins/plugins/conventionalcommits/JenkinsTest.java @@ -30,13 +30,13 @@ public void testPipelineWithNoTags() throws Exception { WorkflowRun b = rule.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get()); - System.out.println(rule.getLog(b)); + System.out.println(JenkinsRule.getLog(b)); - assertThat(rule.getLog(b), containsString("Started")); - assertThat(rule.getLog(b), containsString("nextVersion")); - assertThat(rule.getLog(b), containsString("No tags found")); - assertThat(rule.getLog(b), containsString("0.1.0")); - assertThat(rule.getLog(b), containsString("Finished: SUCCESS")); + assertThat(JenkinsRule.getLog(b), containsString("Started")); + assertThat(JenkinsRule.getLog(b), containsString("nextVersion")); + assertThat(JenkinsRule.getLog(b), containsString("No tags found")); + assertThat(JenkinsRule.getLog(b), containsString("0.1.0")); + assertThat(JenkinsRule.getLog(b), containsString("Finished: SUCCESS")); } @Test @@ -52,13 +52,13 @@ public void testPipelineWithTags() throws Exception { WorkflowRun b = rule.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get()); - System.out.println(rule.getLog(b)); + System.out.println(JenkinsRule.getLog(b)); - assertThat(rule.getLog(b), containsString("Started")); - assertThat(rule.getLog(b), containsString("nextVersion")); - assertThat(rule.getLog(b), containsString("Current Tag is: 0.1.0")); - assertThat(rule.getLog(b), containsString("0.1.1")); - assertThat(rule.getLog(b), containsString("Finished: SUCCESS")); + assertThat(JenkinsRule.getLog(b), containsString("Started")); + assertThat(JenkinsRule.getLog(b), containsString("nextVersion")); + assertThat(JenkinsRule.getLog(b), containsString("Current Tag is: 0.1.0")); + assertThat(JenkinsRule.getLog(b), containsString("0.1.1")); + assertThat(JenkinsRule.getLog(b), containsString("Finished: SUCCESS")); } @Test @@ -86,13 +86,13 @@ public void testDeclarativePipelineWithTags() throws Exception { WorkflowRun b = rule.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get()); - System.out.println(rule.getLog(b)); + System.out.println(JenkinsRule.getLog(b)); - assertThat(rule.getLog(b), containsString("Started")); - assertThat(rule.getLog(b), containsString("nextVersion")); - assertThat(rule.getLog(b), containsString("Current Tag is: 0.1.0")); - assertThat(rule.getLog(b), containsString("0.1.1")); - assertThat(rule.getLog(b), containsString("Finished: SUCCESS")); + assertThat(JenkinsRule.getLog(b), containsString("Started")); + assertThat(JenkinsRule.getLog(b), containsString("nextVersion")); + assertThat(JenkinsRule.getLog(b), containsString("Current Tag is: 0.1.0")); + assertThat(JenkinsRule.getLog(b), containsString("0.1.1")); + assertThat(JenkinsRule.getLog(b), containsString("Finished: SUCCESS")); } @Test @@ -127,12 +127,12 @@ public void testDeclarativePipelineWithTagsInEnvironmentBlock() throws Exception WorkflowRun b = rule.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get()); - System.out.println(rule.getLog(b)); + System.out.println(JenkinsRule.getLog(b)); - assertThat(rule.getLog(b), containsString("Started")); - assertThat(rule.getLog(b), containsString("nextVersion")); - assertThat(rule.getLog(b), containsString("Current Tag is: 0.1.0")); - assertThat(rule.getLog(b), containsString("next version = 0.1.1")); - assertThat(rule.getLog(b), containsString("Finished: SUCCESS")); + assertThat(JenkinsRule.getLog(b), containsString("Started")); + assertThat(JenkinsRule.getLog(b), containsString("nextVersion")); + assertThat(JenkinsRule.getLog(b), containsString("Current Tag is: 0.1.0")); + assertThat(JenkinsRule.getLog(b), containsString("next version = 0.1.1")); + assertThat(JenkinsRule.getLog(b), containsString("Finished: SUCCESS")); } } diff --git a/src/test/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersionTest.java b/src/test/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersionTest.java index 9cb292e..2ed6c25 100644 --- a/src/test/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersionTest.java +++ b/src/test/java/io/jenkins/plugins/conventionalcommits/utils/CurrentVersionTest.java @@ -225,15 +225,15 @@ public void shouldReadHelmChartCurrentVersion() throws IOException, InterruptedE File chartYaml = rootFolder.newFile(helmDir.getName() + File.separator + "Chart.yaml"); String packageJsonContent = - "apiVersion: v2\n" + - "description: Chart's description\n" + - "home: https://github.com/xxx\n" + - "name: xxx\n" + - "version: 1.0.0\n" + - "appVersion: 0.0.1\n" + - "engine: gotpl\n" + - "sources:\n" + - " - https://github.com/xxxx"; + "apiVersion: v2\n" + + "description: Chart's description\n" + + "home: https://github.com/xxx\n" + + "name: xxx\n" + + "version: 1.0.0\n" + + "appVersion: 0.0.1\n" + + "engine: gotpl\n" + + "sources:\n" + + " - https://github.com/xxxx"; FileWriter chartYamlWriter = new FileWriter(chartYaml); chartYamlWriter.write(packageJsonContent); diff --git a/src/test/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeTest.java b/src/test/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeTest.java index 636293e..82dd9c2 100644 --- a/src/test/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeTest.java +++ b/src/test/java/io/jenkins/plugins/conventionalcommits/utils/ProjectTypeTest.java @@ -114,7 +114,7 @@ public void isHelmNotProject() throws IOException { ProjectType projectType = new HelmProjectType(); assertFalse(projectType.check(helmDir)); } - + @Test public void isPythonProjectWithTOMLFile() throws IOException { File pyDir = rootFolder.newFolder("SamplePythonProject");