|
1 | 1 | /*
|
2 |
| - * Copyright 2008-2022 the original author or authors. |
| 2 | + * Copyright 2008-2023 the original author or authors. |
3 | 3 | *
|
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License");
|
5 | 5 | * you may not use this file except in compliance with the License.
|
|
20 | 20 | import java.util.Iterator;
|
21 | 21 | import java.util.List;
|
22 | 22 | import java.util.Map;
|
23 |
| -import java.util.Properties; |
| 23 | +import java.util.Set; |
24 | 24 |
|
25 | 25 | import org.junit.jupiter.api.BeforeEach;
|
26 | 26 | import org.junit.jupiter.api.Test;
|
|
29 | 29 | import org.springframework.batch.core.job.SimpleJob;
|
30 | 30 | import org.springframework.batch.core.launch.support.RunIdIncrementer;
|
31 | 31 |
|
| 32 | +import static org.assertj.core.api.Assertions.assertThat; |
32 | 33 | import static org.junit.jupiter.api.Assertions.assertEquals;
|
33 | 34 | import static org.junit.jupiter.api.Assertions.assertFalse;
|
34 | 35 | import static org.junit.jupiter.api.Assertions.assertThrows;
|
@@ -121,31 +122,27 @@ void testCopy() {
|
121 | 122 | }
|
122 | 123 |
|
123 | 124 | @Test
|
124 |
| - void testOrderedTypes() { |
| 125 | + void testNotOrderedTypes() { |
125 | 126 | this.parametersBuilder.addDate("SCHEDULE_DATE", date);
|
126 | 127 | this.parametersBuilder.addLong("LONG", 1L);
|
127 | 128 | this.parametersBuilder.addString("STRING", "string value");
|
128 |
| - Iterator<String> parameters = this.parametersBuilder.toJobParameters().getParameters().keySet().iterator(); |
129 |
| - assertEquals("SCHEDULE_DATE", parameters.next()); |
130 |
| - assertEquals("LONG", parameters.next()); |
131 |
| - assertEquals("STRING", parameters.next()); |
| 129 | + Set<String> parameters = this.parametersBuilder.toJobParameters().getParameters().keySet(); |
| 130 | + assertThat(parameters).containsExactlyInAnyOrder("STRING", "LONG", "SCHEDULE_DATE"); |
132 | 131 | }
|
133 | 132 |
|
134 | 133 | @Test
|
135 |
| - void testOrderedStrings() { |
| 134 | + void testNotOrderedStrings() { |
136 | 135 | this.parametersBuilder.addString("foo", "value foo");
|
137 | 136 | this.parametersBuilder.addString("bar", "value bar");
|
138 | 137 | this.parametersBuilder.addString("spam", "value spam");
|
139 |
| - Iterator<String> parameters = this.parametersBuilder.toJobParameters().getParameters().keySet().iterator(); |
140 |
| - assertEquals("foo", parameters.next()); |
141 |
| - assertEquals("bar", parameters.next()); |
142 |
| - assertEquals("spam", parameters.next()); |
| 138 | + Set<String> parameters = this.parametersBuilder.toJobParameters().getParameters().keySet(); |
| 139 | + assertThat(parameters).containsExactlyInAnyOrder("foo", "bar", "spam"); |
143 | 140 | }
|
144 | 141 |
|
145 | 142 | @Test
|
146 | 143 | void testAddJobParameter() {
|
147 | 144 | JobParameter jobParameter = new JobParameter("bar", String.class);
|
148 |
| - this.parametersBuilder.addParameter("foo", jobParameter); |
| 145 | + this.parametersBuilder.addJobParameter("foo", jobParameter); |
149 | 146 | Map<String, JobParameter<?>> parameters = this.parametersBuilder.toJobParameters().getParameters();
|
150 | 147 | assertEquals(1, parameters.size());
|
151 | 148 | assertEquals("bar", parameters.get("foo").getValue());
|
|
0 commit comments