Skip to content

Migrate tests to JUnit5 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2025
Merged

Migrate tests to JUnit5 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 129 additions & 140 deletions src/test/java/alex/jenkins/plugins/ChangeSequenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,148 +1,137 @@
package alex.jenkins.plugins;

import alex.jenkins.plugins.FileSystemListParameterDefinition.FilesLister;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;

import java.io.File;
import java.net.URL;
import java.util.List;
import java.util.TreeMap;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import alex.jenkins.plugins.FileSystemListParameterDefinition.FilesLister;


public class ChangeSequenceTest {

@Rule
public JenkinsRule j = new JenkinsRule();

String path;
FileSystemListParameterGlobalConfiguration globalConfigAllowedPaths;

@Before
public void setup(){
URL resource = getClass().getResource("/1");
Assert.assertNotNull("Test test directory missing", resource);
path = resource.getPath();

TestUtils tu = new TestUtils();
globalConfigAllowedPaths = tu.createTestGC(path);
}

@Test
public void testSorting() {
//boolean sortByLastModified = true;
//boolean sortReverseOrder = false;

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
File f1 = new File(test1);
File f2 = new File(test2);

map.put(f1.getName(), (long) 2);
map.put(f2.getName(), (long) 1);


List<String> sortedList = Utils.createTimeSortedList(map);

Assert.assertEquals(test2,sortedList.get(0));
Assert.assertEquals(test1,sortedList.get(1));


}

@Test
public void testReverseOrder() {
boolean sortByLastModified = true;
boolean sortReverseOrder = true;
boolean includePathInValue = false;
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, "", "FILE","SINGLE_SELECT", "", "", sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
FilesLister fl = new FilesLister(pd.getSelectedEnumType(), pd.getRegexIncludePattern(), pd.getRegexExcludePattern(), pd.getPath(), pd.isSortByLastModified(), pd.isSortReverseOrder());

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
File f1 = new File(test1);
File f2 = new File(test2);

map.put(f1.getName(), (long) 2);
map.put(f2.getName(), (long) 1);

List<String> sortedList = fl.sortList(map);

Assert.assertEquals(test1,sortedList.get(0));
Assert.assertEquals(test2,sortedList.get(1));


}

@Test
public void testAlphabeticOrder() {
boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, "", "FILE","SINGLE_SELECT", "", "", sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
FilesLister fl = new FilesLister(pd.getSelectedEnumType(), pd.getRegexIncludePattern(), pd.getRegexExcludePattern(), pd.getPath(), pd.isSortByLastModified(), pd.isSortReverseOrder());

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
String test3 = "test3";
File f1 = new File(test1);
File f2 = new File(test2);
File f3 = new File(test3);

map.put(f1.getName(), (long) 1);
map.put(f3.getName(), (long) 3);
map.put(f2.getName(), (long) 2);

List<String> sortedList = fl.sortList(map);

Assert.assertEquals(test1,sortedList.get(0));
Assert.assertEquals(test2,sortedList.get(1));
Assert.assertEquals(test3,sortedList.get(2));


}

@Test
public void testGetExistingDefaultValue() throws Exception {

boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
String includePattern = "";
String excludePattern = "";
String definition_default = "test2.txt";
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, definition_default, "FILE","SINGLE_SELECT", includePattern, excludePattern, sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);

String result_default = (String) pd.getDefaultParameterValue().getValue();
Assert.assertEquals(definition_default, result_default);

}

@Test
public void testGetNonExistingDefaultValue() {

boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
String includePattern = "";
String excludePattern = "";
String definition_default = "test4.txt";
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, definition_default, "FILE","SINGLE_SELECT", includePattern, excludePattern, sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
String result_default = (String) pd.getDefaultParameterValue().getValue();
Assert.assertNotEquals(definition_default, result_default);

}


import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;


@WithJenkins
class ChangeSequenceTest {

private JenkinsRule j;

private String path;
private FileSystemListParameterGlobalConfiguration globalConfigAllowedPaths;

@BeforeEach
void setUp(JenkinsRule rule) {
j = rule;
URL resource = getClass().getResource("/1");
assertNotNull(resource, "Test test directory missing");
path = resource.getPath();
globalConfigAllowedPaths = TestUtils.createTestGC(path);
}

@Test
void testSorting() {
//boolean sortByLastModified = true;
//boolean sortReverseOrder = false;

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
File f1 = new File(test1);
File f2 = new File(test2);

map.put(f1.getName(), (long) 2);
map.put(f2.getName(), (long) 1);


List<String> sortedList = Utils.createTimeSortedList(map);

assertEquals(test2, sortedList.get(0));
assertEquals(test1, sortedList.get(1));
}

@Test
void testReverseOrder() {
boolean sortByLastModified = true;
boolean sortReverseOrder = true;
boolean includePathInValue = false;
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, "", "FILE", "SINGLE_SELECT", "", "", sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
FilesLister fl = new FilesLister(pd.getSelectedEnumType(), pd.getRegexIncludePattern(), pd.getRegexExcludePattern(), pd.getPath(), pd.isSortByLastModified(), pd.isSortReverseOrder());

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
File f1 = new File(test1);
File f2 = new File(test2);

map.put(f1.getName(), (long) 2);
map.put(f2.getName(), (long) 1);

List<String> sortedList = fl.sortList(map);

assertEquals(test1, sortedList.get(0));
assertEquals(test2, sortedList.get(1));
}

@Test
void testAlphabeticOrder() {
boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, "", "FILE", "SINGLE_SELECT", "", "", sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
FilesLister fl = new FilesLister(pd.getSelectedEnumType(), pd.getRegexIncludePattern(), pd.getRegexExcludePattern(), pd.getPath(), pd.isSortByLastModified(), pd.isSortReverseOrder());

TreeMap<String, Long> map = new TreeMap<>();
String test1 = "test1";
String test2 = "test2";
String test3 = "test3";
File f1 = new File(test1);
File f2 = new File(test2);
File f3 = new File(test3);

map.put(f1.getName(), (long) 1);
map.put(f3.getName(), (long) 3);
map.put(f2.getName(), (long) 2);

List<String> sortedList = fl.sortList(map);

assertEquals(test1, sortedList.get(0));
assertEquals(test2, sortedList.get(1));
assertEquals(test3, sortedList.get(2));
}

@Test
void testGetExistingDefaultValue() {
boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
String includePattern = "";
String excludePattern = "";
String definitionDefault = "test2.txt";
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, definitionDefault, "FILE", "SINGLE_SELECT", includePattern, excludePattern, sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);

String resultDefault = (String) pd.getDefaultParameterValue().getValue();
assertEquals(definitionDefault, resultDefault);
}

@Test
void testGetNonExistingDefaultValue() {
boolean sortByLastModified = false;
boolean sortReverseOrder = false;
boolean includePathInValue = false;
String includePattern = "";
String excludePattern = "";
String definitionDefault = "test4.txt";
FileSystemListParameterDefinition pd = new FileSystemListParameterDefinition("name", "description", "master", path, definitionDefault, "FILE", "SINGLE_SELECT", includePattern, excludePattern, sortByLastModified, sortReverseOrder, includePathInValue);
FileSystemListParameterDefinition.addTestGC(globalConfigAllowedPaths);
String resultDefault = (String) pd.getDefaultParameterValue().getValue();
assertNotEquals(definitionDefault, resultDefault);
}
}
15 changes: 6 additions & 9 deletions src/test/java/alex/jenkins/plugins/FileSystemListParameterDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@

import hudson.model.FreeStyleProject;
import hudson.model.ParametersDefinitionProperty;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.For;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;

@For(FileSystemListParameterDefinition.class)
public class FileSystemListParameterDefinitionTest {

@Rule
public JenkinsRule j = new JenkinsRule();
@WithJenkins
class FileSystemListParameterDefinitionTest {

@Test
@Issue("JENKINS-49649")
public void smokeRoundtrip() throws Exception {
void smokeRoundtrip(JenkinsRule j) throws Exception {
FreeStyleProject p = j.createFreeStyleProject();
FileSystemListParameterDefinition d = new FileSystemListParameterDefinition("name", "description", "master", "path", "", "FILE","SINGLE_SELECT", "", "", true, false, false);
FileSystemListParameterDefinition d = new FileSystemListParameterDefinition("name", "description", "master", "path", "", "FILE", "SINGLE_SELECT", "", "", true, false, false);
ParametersDefinitionProperty params = new ParametersDefinitionProperty(d);
p.addProperty(params);

j.configRoundtrip(p);
}

}
2 changes: 1 addition & 1 deletion src/test/java/alex/jenkins/plugins/FileSystemListParameterGlobalConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package alex.jenkins.plugins;


public class FileSystemListParameterGlobalConfigurationTest {
class FileSystemListParameterGlobalConfigurationTest {
//TODO
}

Loading
Loading