Skip to content

Commit 9d45a38

Browse files
authored
Merge pull request #191 from secvisogram/test/fix_static_year
test: fix static year
2 parents b961b6e + a63c2f7 commit 9d45a38

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/test/java/de/bsi/secvisogram/csaf_cms_backend/json/AdvisoryWrapperTest.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import static de.bsi.secvisogram.csaf_cms_backend.json.VersioningType.Integer;
77
import static de.bsi.secvisogram.csaf_cms_backend.json.VersioningType.Semantic;
88
import static org.hamcrest.MatcherAssert.assertThat;
9-
import static org.hamcrest.Matchers.*;
9+
import static org.hamcrest.Matchers.equalTo;
10+
import static org.hamcrest.Matchers.is;
11+
import static org.hamcrest.Matchers.nullValue;
12+
import static org.hamcrest.Matchers.startsWith;
1013
import static org.junit.jupiter.api.Assertions.assertEquals;
1114
import static org.junit.jupiter.api.Assertions.assertThrows;
1215

@@ -23,7 +26,9 @@
2326
import java.nio.charset.StandardCharsets;
2427
import java.time.Instant;
2528
import java.time.LocalDate;
29+
import java.time.ZonedDateTime;
2630
import java.time.format.DateTimeFormatter;
31+
import java.time.temporal.ChronoField;
2732
import java.util.ArrayList;
2833
import java.util.List;
2934
import java.util.stream.Stream;
@@ -33,6 +38,7 @@
3338
import org.junit.jupiter.params.provider.MethodSource;
3439
import org.springframework.http.HttpStatus;
3540

41+
3642
public class AdvisoryWrapperTest {
3743

3844
@Test
@@ -592,9 +598,9 @@ public void setFinalTrackingIdTest() throws IOException, CsafException {
592598
AdvisoryWrapper advisory = AdvisoryWrapper.createNewFromCsaf(csafToRequest(csafJsonWithReleaseDate), "Mustermann", Semantic.name());
593599
advisory.setTemporaryTrackingId("tempExamle", "7", 123L);
594600
advisory.setFinalTrackingIdAndUrl("https://example.com", "example", "5", 158L);
595-
596-
assertEquals("example-2023-00158", advisory.getDocumentTrackingId());
597-
assertEquals("https://example.com/WHITE/2023/example-2023-00158.json", advisory.at("/csaf/document/references/0/url").asText());
601+
long year = ZonedDateTime.now().getYear();
602+
assertEquals("example-" + year + "-00158", advisory.getDocumentTrackingId());
603+
assertEquals("https://example.com/WHITE/" + year + "/example-" + year + "-00158.json", advisory.at("/csaf/document/references/0/url").asText());
598604
assertEquals("URL generated by system", advisory.at("/csaf/document/references/0/summary").asText());
599605
assertEquals("self", advisory.at("/csaf/document/references/0/category").asText());
600606
assertEquals("tempExamle-TEMP-0000123", advisory.getTempTrackingIdInFromMeta());

0 commit comments

Comments
 (0)