OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converting tests to junit5 (#4699)

Browse Source 
* started converting tests to junit5

* replaced TempFolder with JUnit TempDir

* migrated some test classes to JUnit5

* migrated a parameterized testclass to junit5

* Update core/pom.xml

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>

* replaced junit4 with junit5-vintage engine

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
This commit is contained in:
StefanSpiekerandMark Waite authored and GitHub committed 2020-07-20 23:14:21 +02:00
1 parent 8cc32e956d
commit dcc9a924d8
15 files changed
+155 -135
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/PluginManagerTest.java
+18 -14
View File
@@ -28,35 +28,40 @@ import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import org.apache.tools.ant.filters.StringInputStream;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.xml.sax.SAXException;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.FileUtils;
import org.jvnet.hudson.test.Issue;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertEquals;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.Issue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests of {@link PluginManager}.
*/
public class PluginManagerTest {
@Rule public TemporaryFolder tmp = new TemporaryFolder();
@TempDir Path tmp;
@Test public void parseRequestedPlugins() throws Exception {
assertEquals("{other=2.0, stuff=1.2}", new LocalPluginManager(tmp.getRoot())
@Test
public void parseRequestedPlugins() throws Exception {
Path output = Files.createFile(
tmp.resolve("output.txt")
);
assertEquals("{other=2.0, stuff=1.2}", new LocalPluginManager(output.toFile())
.parseRequestedPlugins(new StringInputStream("<root><stuff plugin='stuff@1.0'><more plugin='other@2.0'><things plugin='stuff@1.2'/></more></stuff></root>")).toString());
}
@@ -145,12 +150,11 @@ public class PluginManagerTest {
"Plugin-Developers: ";
private File createHpiWithManifest() throws IOException {
File newFolder = tmp.newFolder("myJar");
String manifestPath = "META-INF/MANIFEST.MF";
new File("META-INF").mkdir();
FileUtils.write(new File(newFolder, manifestPath), SAMPLE_MANIFEST_FILE, StandardCharsets.UTF_8);
FileUtils.write(new File(tmp.toFile(), manifestPath), SAMPLE_MANIFEST_FILE, StandardCharsets.UTF_8);
final File f = new File(tmp.getRoot(), "my.hpi");
final File f = new File(tmp.toFile(), "my.hpi");
try(ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(f.toPath()))) {
ZipEntry e = new ZipEntry(manifestPath);
out.putNextEntry(e);