Skip to content
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

Jump to bottom

Use @TempDir and don't create files inside build directory #58

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Use @TempDir and don't create files inside build directory #58

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
16 changes: 6 additions & 10 deletions rpm/src/test/java/org/eclipse/packager/rpm/EmptyWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,18 @@
import org.eclipse.packager.rpm.build.RpmBuilder;
import org.eclipse.packager.rpm.build.RpmBuilder.PackageInformation;
import org.eclipse.packager.rpm.parse.RpmInputStream;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

public class EmptyWriterTest {
private static final Path OUT_BASE = Path.of("target", "data", "out.empty");

@BeforeAll
public static void setup() throws IOException {
Files.createDirectories(OUT_BASE);
}
class EmptyWriterTest {
@TempDir
private Path outBase;

@Test
public void test3() throws IOException, PGPException {
void test3() throws IOException, PGPException {
Path outFile;

try (RpmBuilder builder = new RpmBuilder("testEmpty", "1.0.0", "1", "noarch", OUT_BASE)) {
try (RpmBuilder builder = new RpmBuilder("testEmpty", "1.0.0", "1", "noarch", outBase)) {
final PackageInformation pinfo = builder.getInformation();

pinfo.setLicense("EPL");
Expand Down
18 changes: 7 additions & 11 deletions rpm/src/test/java/org/eclipse/packager/rpm/Issue130Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,20 @@
import org.eclipse.packager.rpm.build.RpmBuilder.PackageInformation;
import org.eclipse.packager.rpm.parse.InputHeader;
import org.eclipse.packager.rpm.parse.RpmInputStream;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

public class Issue130Test {
private static final Path OUT_BASE = Path.of("target", "data", "out");

class Issue130Test {
private static final List<String> PREFIXES = Arrays.asList("/opt", "/var/log");

@BeforeAll
public static void setup() throws IOException {
Files.createDirectories(OUT_BASE);
}
@TempDir
private Path outBase;

@Test
public void test() throws IOException {
Path outFile;
void test() throws IOException {
final Path outFile;

try (RpmBuilder builder = new RpmBuilder("prefixes-test", "1.0.0", "1", "noarch", OUT_BASE)) {
try (final RpmBuilder builder = new RpmBuilder("prefixes-test", "1.0.0", "1", "noarch", outBase)) {
final PackageInformation pinfo = builder.getInformation();

pinfo.setPrefixes(PREFIXES);
Expand Down
17 changes: 6 additions & 11 deletions rpm/src/test/java/org/eclipse/packager/rpm/Issue136Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,13 @@
import org.eclipse.packager.rpm.info.RpmInformations;
import org.eclipse.packager.rpm.parse.InputHeader;
import org.eclipse.packager.rpm.parse.RpmInputStream;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

public class Issue136Test {
private static final Path OUT_BASE = Path.of("target", "data", "out");

@BeforeAll
public static void setup() throws IOException {
Files.createDirectories(OUT_BASE);
}
class Issue136Test {
@TempDir
private Path outBase;

@ParameterizedTest
@ValueSource(strings = {
Expand All @@ -48,10 +44,10 @@ public static void setup() throws IOException {
"012345678901234567890123456789012345678901234567890123456789012345",
"0123456789012345678901234567890123456789012345678901234567890123456",
})
public void test(final String originalName) throws IOException {
void test(final String originalName) throws IOException {
Path outFile;

try (RpmBuilder builder = new RpmBuilder(originalName, "1.0.0", "1", "noarch", OUT_BASE)) {
try (RpmBuilder builder = new RpmBuilder(originalName, "1.0.0", "1", "noarch", outBase)) {
outFile = builder.getTargetFile();

builder.build();
Expand All @@ -71,5 +67,4 @@ public void test(final String originalName) throws IOException {
assertTrue(leadNameBytes.length < 66, () -> "Expected lead name bytes to be less than 66, was " + leadNameBytes.length);
}
}

}
27 changes: 11 additions & 16 deletions rpm/src/test/java/org/eclipse/packager/rpm/Issue24Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,28 @@
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import org.eclipse.packager.rpm.build.BuilderOptions;
import org.eclipse.packager.rpm.build.RpmBuilder;
import org.eclipse.packager.rpm.build.RpmFileNameProvider;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

public class Issue24Test {
private static final Path OUT_BASE = Path.of("target", "data", "out");

@BeforeAll
public static void setup() throws IOException {
Files.createDirectories(OUT_BASE);
}
class Issue24Test {
@TempDir
private Path outBase;

@Test
public void test() throws IOException {
void test() throws IOException {
final String name = "issue-24-test";
final String version = "1.0.0";
final String release = "1";
final String architecture = "noarch";
BuilderOptions options = new BuilderOptions();
final BuilderOptions options = new BuilderOptions();
options.setFileNameProvider(RpmFileNameProvider.DEFAULT_FILENAME_PROVIDER);

try (final RpmBuilder builder = new RpmBuilder(name, new RpmVersion(version, release), architecture, OUT_BASE, options)) {
try (final RpmBuilder builder = new RpmBuilder(name, new RpmVersion(version, release), architecture, outBase, options)) {
final Path outFile = builder.getTargetFile();

builder.build();
Expand All @@ -53,16 +48,16 @@ public void test() throws IOException {
assertEquals(expectedRpmFileName, outFile.getFileName().toString());
}

options = new BuilderOptions();
options.setFileNameProvider(RpmFileNameProvider.LEGACY_FILENAME_PROVIDER);
final BuilderOptions options2 = new BuilderOptions();
options2.setFileNameProvider(RpmFileNameProvider.LEGACY_FILENAME_PROVIDER);

try (final RpmBuilder builder = new RpmBuilder(name, new RpmVersion(version, release), architecture, OUT_BASE, options)) {
try (final RpmBuilder builder = new RpmBuilder(name, new RpmVersion(version, release), architecture, outBase, options2)) {
final Path outFile = builder.getTargetFile();

builder.build();

final String expectedRpmFileName = name + "-" + version + "-" + release + "-" + architecture + ".rpm";
final String rpmFileName = options.getFileNameProvider().getRpmFileName(builder.getName(), builder.getVersion(), builder.getArchitecture());
final String rpmFileName = options2.getFileNameProvider().getRpmFileName(builder.getName(), builder.getVersion(), builder.getArchitecture());
assertEquals(expectedRpmFileName, rpmFileName);
assertEquals(expectedRpmFileName, outFile.getFileName().toString());
}
Expand Down
14 changes: 5 additions & 9 deletions rpm/src/test/java/org/eclipse/packager/rpm/SetVerifyFlagsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.eclipse.packager.rpm.build.RpmBuilder;
import org.eclipse.packager.rpm.parse.InputHeader;
import org.eclipse.packager.rpm.parse.RpmInputStream;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -40,19 +40,15 @@
class SetVerifyFlagsTest {
private final static Logger LOGGER = LoggerFactory.getLogger(SetVerifyFlagsTest.class);

private static final Path OUT_BASE = Path.of("target", "data", "out");

@BeforeAll
static void setup() throws IOException {
Files.createDirectories(OUT_BASE);
}

private static final String DIRNAME = "/opt/testing/";

private static final String NAME_myconf = "my.conf";

private static final String NAME_myreadme = "readme.txt";

@TempDir
private Path outBase;

/**
* Firstly, writes a RPM file with two file entries having different type flags
* and different verification flags;
Expand All @@ -61,7 +57,7 @@ static void setup() throws IOException {
@Test
void writeRpmWithVerifyFlags() throws IOException {
final Path outFile;
try (RpmBuilder builder = new RpmBuilder("vflag0-test", "1.0.0", "1", "noarch", OUT_BASE)) {
try (RpmBuilder builder = new RpmBuilder("vflag0-test", "1.0.0", "1", "noarch", outBase)) {
final String content_myconf = "Hallo, myconf!";
builder.newContext().addFile(DIRNAME + NAME_myconf, content_myconf.getBytes(), (targetName, object, type) -> {
if ((DIRNAME + NAME_myconf).equals(targetName)) {
Expand Down
23 changes: 11 additions & 12 deletions rpm/src/test/java/org/eclipse/packager/rpm/WriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.DockerImageName;

public class WriterTest {
class WriterTest {
private static final Path IN_BASE = Path.of("src", "test", "resources", "data", "in");

private static final String COMMAND = "sleep infinity";

@TempDir
Path outBase;
private Path outBase;

@Test
public void test1() throws IOException {
void test1() throws IOException {
final Path rpm1 = outBase.resolve("test1-1.0.0.rpm");

final Header<RpmTag> header = new Header<>();
Expand Down Expand Up @@ -93,8 +93,8 @@ public void test1() throws IOException {
requirements.add(new Dependency("rpmlib(CompressedFileNames)", "3.0.4-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB));
Dependencies.putRequirements(header, requirements);

try (PayloadRecorder payloadRecorder = new PayloadRecorder(); PayloadRecorder.Finished finished = payloadRecorder.finish()) {
try (RpmWriter writer = new RpmWriter(rpm1, new LeadBuilder("test1", new RpmVersion("1.0.0")), header)) {
try (final PayloadRecorder.Finished finished = new PayloadRecorder().finish()) {
try (final RpmWriter writer = new RpmWriter(rpm1, new LeadBuilder("test1", new RpmVersion("1.0.0")), header)) {
writer.setPayload(finished);
}
}
Expand All @@ -105,10 +105,10 @@ public void test1() throws IOException {
}

@Test
public void test2() throws IOException {
void test2() throws IOException {
final Path outFile = outBase.resolve("test2-1.0.0.1.rpm");

try (PayloadRecorder payload = new PayloadRecorder()) {
try (final PayloadRecorder payload = new PayloadRecorder()) {
final Header<RpmTag> header = new Header<>();

header.putString(RpmTag.PAYLOAD_FORMAT, "cpio");
Expand Down Expand Up @@ -155,10 +155,10 @@ public void test2() throws IOException {
}

@Test
public void test3() throws IOException, PGPException {
void test3() throws IOException, PGPException {
Path outFile;

try (RpmBuilder builder = new RpmBuilder("test3", "1.0.0", "1", "noarch", outBase)) {
try (final RpmBuilder builder = new RpmBuilder("test3", "1.0.0", "1", "noarch", outBase)) {
final PackageInformation pinfo = builder.getInformation();

pinfo.setLicense("EPL");
Expand Down Expand Up @@ -210,10 +210,10 @@ public void test3() throws IOException, PGPException {
}

@Test
public void test4() throws IOException, InterruptedException {
void test4() throws IOException, InterruptedException {
final Path outFile;

try (RpmBuilder builder = new RpmBuilder("test4", "1.0.0", "1", "noarch", outBase)) {
try (final RpmBuilder builder = new RpmBuilder("test4", "1.0.0", "1", "noarch", outBase)) {
final PackageInformation pinfo = builder.getInformation();

pinfo.setLicense("EPL");
Expand Down Expand Up @@ -264,5 +264,4 @@ public void test4() throws IOException, InterruptedException {
assertTrue(stdout.contains("name-enhances"));
}
}

}