Skip to content

Commit 3bb3c7c

Browse files
committed
Fix order of assertions in tests
Signed-off-by: Keshav Priyadarshi <[email protected]>
1 parent 2e15802 commit 3bb3c7c

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

src/test/java/com/github/packageurl/PurlSpecRefTest.java

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,33 @@
2525

2626
package com.github.packageurl;
2727

28-
import java.net.URL;
29-
30-
import static org.junit.jupiter.api.Assertions.assertEquals;
31-
import static org.junit.jupiter.api.Assertions.assertFalse;
32-
import static org.junit.jupiter.api.Assertions.assertTrue;
33-
3428
import java.io.IOException;
3529
import java.io.InputStream;
30+
import java.net.URL;
3631
import java.nio.file.Files;
37-
import java.nio.file.Paths;
3832
import java.nio.file.Path;
33+
import java.nio.file.Paths;
3934
import java.util.Collections;
4035
import java.util.List;
36+
import java.util.Map;
4137
import java.util.stream.Collectors;
4238
import java.util.stream.Stream;
43-
import com.fasterxml.jackson.databind.ObjectMapper;
44-
45-
import com.fasterxml.jackson.databind.JsonNode;
4639

40+
import static org.junit.jupiter.api.Assertions.assertEquals;
41+
import static org.junit.jupiter.api.Assertions.assertFalse;
42+
import static org.junit.jupiter.api.Assertions.assertTrue;
4743
import org.junit.jupiter.params.ParameterizedTest;
4844
import org.junit.jupiter.params.provider.MethodSource;
4945

5046
import com.fasterxml.jackson.annotation.JsonProperty;
5147
import com.fasterxml.jackson.core.JsonParser;
52-
import com.fasterxml.jackson.core.ObjectCodec;
5348
import com.fasterxml.jackson.core.JsonProcessingException;
54-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
55-
56-
import com.fasterxml.jackson.databind.JsonDeserializer;
49+
import com.fasterxml.jackson.core.ObjectCodec;
5750
import com.fasterxml.jackson.databind.DeserializationContext;
58-
59-
import java.util.Map;
51+
import com.fasterxml.jackson.databind.JsonDeserializer;
52+
import com.fasterxml.jackson.databind.JsonNode;
53+
import com.fasterxml.jackson.databind.ObjectMapper;
54+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6055

6156
public class PurlSpecRefTest {
6257

@@ -143,14 +138,13 @@ static Stream<TestCase> collectTestCases() throws Exception {
143138
void runRoundtripTest(TestCase testCase) throws Exception {
144139
String result;
145140
try {
146-
result = new PackageURL(testCase.input.purl).canonicalize().toString();
141+
result = new PackageURL(testCase.input.purl).canonicalize();
147142
} catch (Exception e) {
148143
assertTrue(testCase.expected_failure, "Unexpected failure: " + e.getMessage());
149144
return;
150145
}
151146
assertFalse(testCase.expected_failure, "Expected failure but parsing succeeded");
152-
153-
assertEquals(result, testCase.expected_output.purl);
147+
assertEquals(testCase.expected_output.purl, result);
154148

155149
}
156150

@@ -159,14 +153,14 @@ void runBuildTest(TestCase testCase) throws Exception {
159153
String result;
160154
try {
161155
result = new PackageURL(input.type, input.namespace, input.name, input.version, input.qualifiers,
162-
input.subpath).canonicalize().toString();
156+
input.subpath).canonicalize();
163157
} catch (Exception e) {
164158
assertTrue(testCase.expected_failure, "Unexpected failure: " + e.getMessage());
165159
return;
166160
}
167161

168162
assertFalse(testCase.expected_failure, "Expected failure but build succeeded");
169-
assertEquals(result, testCase.expected_output.purl);
163+
assertEquals(testCase.expected_output.purl, result);
170164
}
171165

172166
void runParseTest(TestCase testCase) throws Exception {

0 commit comments

Comments
 (0)