@@ -25,7 +25,7 @@ public class JobInstanceDaoTest {
2525 private static final String JOB_NAME2 = "The job 2" ;
2626
2727 @ Autowired
28- private JobInstanceDao jobInstanceDao ;
28+ private JobInstanceDao instanceDao ;
2929
3030 @ Autowired
3131 private JobRepository jobRepository ;
@@ -41,8 +41,8 @@ void dropDatabase() {
4141 @ Test
4242 void testCreateAndGetJobInstanceNoArgs () {
4343 var params = new JobParameters ();
44- var instance = jobInstanceDao .createJobInstance (JOB_NAME , params );
45- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
44+ var instance = instanceDao .createJobInstance (JOB_NAME , params );
45+ assertThat (instanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
4646 }
4747
4848 @ Test
@@ -51,15 +51,15 @@ void testCreateAndGetJobInstanceWithArgsNonIdentifiable() {
5151 .addDate ("DATE" , new Date ())
5252 .addString ("TEST" , "VAL1" )
5353 .toJobParameters ();
54- var instance = jobInstanceDao .createJobInstance (JOB_NAME , params );
55- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
54+ var instance = instanceDao .createJobInstance (JOB_NAME , params );
55+ assertThat (instanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
5656
5757 params = new JobParametersBuilder ()
5858 .addDate ("DATE" , new Date ())
5959 .addString ("TEST" , "VAL2" )
6060 .toJobParameters ();
61- instance = jobInstanceDao .createJobInstance (JOB_NAME , params );
62- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
61+ instance = instanceDao .createJobInstance (JOB_NAME , params );
62+ assertThat (instanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
6363 }
6464
6565 @ Test
@@ -70,17 +70,17 @@ void testCreateAndGetJobInstanceWithAllTypeArgsNonIdentifiable() {
7070 .addDouble ("DOUBLE" , 1.0 )
7171 .addString ("TEST" , "VAL1" )
7272 .toJobParameters ();
73- var instance = jobInstanceDao .createJobInstance (JOB_NAME , params );
74- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
73+ var instance = instanceDao .createJobInstance (JOB_NAME , params );
74+ assertThat (instanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
7575
7676 params = new JobParametersBuilder ()
7777 .addDate ("DATE" , new Date ())
7878 .addLong ("LONG" , 2L )
7979 .addDouble ("DOUBLE" , 2.0 )
8080 .addString ("TEST" , "VAL2" )
8181 .toJobParameters ();
82- instance = jobInstanceDao .createJobInstance (JOB_NAME , params );
83- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
82+ instance = instanceDao .createJobInstance (JOB_NAME , params );
83+ assertThat (instanceDao .getJobInstance (JOB_NAME , params )).isEqualTo (instance );
8484 }
8585
8686 @ Test
@@ -89,16 +89,16 @@ void testCreateAndGetJobInstanceWithArgsIdentifiable() {
8989 .addDate ("DATE" , new Date (), true )
9090 .addString ("TEST" , "VAL" , true )
9191 .toJobParameters ();
92- var instance1 = jobInstanceDao .createJobInstance (JOB_NAME , params1 );
92+ var instance1 = instanceDao .createJobInstance (JOB_NAME , params1 );
9393
9494 var params2 = new JobParametersBuilder ()
9595 .addDate ("DATE" , new Date (), true )
9696 .addString ("TEST" , "VAL1" , true )
9797 .toJobParameters ();
98- var instance2 = jobInstanceDao .createJobInstance (JOB_NAME , params2 );
98+ var instance2 = instanceDao .createJobInstance (JOB_NAME , params2 );
9999
100- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params2 )).isEqualTo (instance2 );
101- assertThat (jobInstanceDao .getJobInstance (JOB_NAME , params1 )).isEqualTo (instance1 );
100+ assertThat (instanceDao .getJobInstance (JOB_NAME , params2 )).isEqualTo (instance2 );
101+ assertThat (instanceDao .getJobInstance (JOB_NAME , params1 )).isEqualTo (instance1 );
102102 }
103103
104104 @ Test
@@ -109,7 +109,7 @@ void testCreateAndGetJobInstanceViaId() {
109109 .addDouble ("DOUBLE" , 1.0 )
110110 .addString ("TEST" , "VAL1" )
111111 .toJobParameters ();
112- var instance1 = jobInstanceDao .createJobInstance (JOB_NAME , params );
112+ var instance1 = instanceDao .createJobInstance (JOB_NAME , params );
113113
114114
115115 params = new JobParametersBuilder ()
@@ -118,69 +118,69 @@ void testCreateAndGetJobInstanceViaId() {
118118 .addDouble ("DOUBLE" , 2.0 )
119119 .addString ("TEST" , "VAL2" )
120120 .toJobParameters ();
121- var instance2 = jobInstanceDao .createJobInstance (JOB_NAME , params );
121+ var instance2 = instanceDao .createJobInstance (JOB_NAME , params );
122122
123- assertThat (jobInstanceDao .getJobInstance (instance2 .getInstanceId ())).isEqualTo (instance2 );
124- assertThat (jobInstanceDao .getJobInstance (instance1 .getInstanceId ())).isEqualTo (instance1 );
123+ assertThat (instanceDao .getJobInstance (instance2 .getInstanceId ())).isEqualTo (instance2 );
124+ assertThat (instanceDao .getJobInstance (instance1 .getInstanceId ())).isEqualTo (instance1 );
125125 }
126126
127127 @ Test
128128 void testCreateAndGetJobInstanceViaExecution () {
129- var instance1 = jobInstanceDao .createJobInstance (JOB_NAME , new JobParameters ());
129+ var instance1 = instanceDao .createJobInstance (JOB_NAME , new JobParameters ());
130130 var execution1 = jobRepository .createJobExecution (instance1 , new JobParameters (), "" );
131131
132- var instance2 = jobInstanceDao .createJobInstance (JOB_NAME , new JobParameters ());
132+ var instance2 = instanceDao .createJobInstance (JOB_NAME , new JobParameters ());
133133 var execution2 = jobRepository .createJobExecution (instance2 , new JobParameters (), "" );
134134
135- assertThat (jobInstanceDao .getJobInstance (execution1 )).isEqualTo (instance1 );
136- assertThat (jobInstanceDao .getJobInstance (execution2 )).isEqualTo (instance2 );
135+ assertThat (instanceDao .getJobInstance (execution1 )).isEqualTo (instance1 );
136+ assertThat (instanceDao .getJobInstance (execution2 )).isEqualTo (instance2 );
137137 }
138138
139139 @ Test
140140 void testFindByNameJobInstances () {
141141 var params = new JobParameters ();
142- var instance1 = jobInstanceDao .createJobInstance (JOB_NAME , params );
143- var instance2 = jobInstanceDao .createJobInstance (JOB_NAME1 , params );
144- var instance3 = jobInstanceDao .createJobInstance (JOB_NAME2 , params );
145-
146- assertThat (jobInstanceDao .findJobInstancesByName (JOB_NAME , 0 , 1 )).containsOnly (instance1 );
147- assertThat (jobInstanceDao .findJobInstancesByName (JOB_NAME1 , 0 , 3 )).containsOnly (instance2 );
148- assertThat (jobInstanceDao .findJobInstancesByName (JOB_NAME2 , 0 , 3 )).containsOnly (instance3 );
149- assertThat (jobInstanceDao .findJobInstancesByName (JOB_NAME , 0 , 3 ))
142+ var instance1 = instanceDao .createJobInstance (JOB_NAME , params );
143+ var instance2 = instanceDao .createJobInstance (JOB_NAME1 , params );
144+ var instance3 = instanceDao .createJobInstance (JOB_NAME2 , params );
145+
146+ assertThat (instanceDao .findJobInstancesByName (JOB_NAME , 0 , 1 )).containsOnly (instance1 );
147+ assertThat (instanceDao .findJobInstancesByName (JOB_NAME1 , 0 , 3 )).containsOnly (instance2 );
148+ assertThat (instanceDao .findJobInstancesByName (JOB_NAME2 , 0 , 3 )).containsOnly (instance3 );
149+ assertThat (instanceDao .findJobInstancesByName (JOB_NAME , 0 , 3 ))
150150 .containsExactly (instance1 , instance2 , instance3 );
151- assertThat (jobInstanceDao .findJobInstancesByName (JOB_NAME , 2 , 3 )).containsOnly (instance3 );
151+ assertThat (instanceDao .findJobInstancesByName (JOB_NAME , 2 , 3 )).containsOnly (instance3 );
152152 }
153153
154154 @ Test
155155 void testGetByNameJobInstances () {
156156 var params = new JobParameters ();
157- var instance1 = jobInstanceDao .createJobInstance (JOB_NAME , params );
158- var instance2 = jobInstanceDao .createJobInstance (JOB_NAME1 , params );
159- var instance3 = jobInstanceDao .createJobInstance (JOB_NAME2 , params );
160-
161- assertThat (jobInstanceDao .getJobInstances (JOB_NAME , 0 , 1 )).containsOnly (instance1 );
162- assertThat (jobInstanceDao .getJobInstances (JOB_NAME1 , 0 , 3 )).containsOnly (instance2 );
163- assertThat (jobInstanceDao .getJobInstances (JOB_NAME2 , 0 , 3 )).containsOnly (instance3 );
164- assertThat (jobInstanceDao .getJobInstances (JOB_NAME , 0 , 3 )).containsOnly (instance1 );
157+ var instance1 = instanceDao .createJobInstance (JOB_NAME , params );
158+ var instance2 = instanceDao .createJobInstance (JOB_NAME1 , params );
159+ var instance3 = instanceDao .createJobInstance (JOB_NAME2 , params );
160+
161+ assertThat (instanceDao .getJobInstances (JOB_NAME , 0 , 1 )).containsOnly (instance1 );
162+ assertThat (instanceDao .getJobInstances (JOB_NAME1 , 0 , 3 )).containsOnly (instance2 );
163+ assertThat (instanceDao .getJobInstances (JOB_NAME2 , 0 , 3 )).containsOnly (instance3 );
164+ assertThat (instanceDao .getJobInstances (JOB_NAME , 0 , 3 )).containsOnly (instance1 );
165165 }
166166
167167 @ Test
168168 void testGetJobInstanceNames () {
169169 var params = new JobParameters ();
170- jobInstanceDao .createJobInstance (JOB_NAME1 , params );
171- jobInstanceDao .createJobInstance (JOB_NAME2 , params );
170+ instanceDao .createJobInstance (JOB_NAME1 , params );
171+ instanceDao .createJobInstance (JOB_NAME2 , params );
172172
173- assertThat (jobInstanceDao .getJobNames ()).containsExactlyInAnyOrder (JOB_NAME1 , JOB_NAME2 );
173+ assertThat (instanceDao .getJobNames ()).containsExactlyInAnyOrder (JOB_NAME1 , JOB_NAME2 );
174174 }
175175
176176 @ Test
177177 @ SneakyThrows
178178 void testGetJobInstanceCount () {
179179 var params = new JobParameters ();
180- jobInstanceDao .createJobInstance (JOB_NAME , params );
181- jobInstanceDao .createJobInstance (JOB_NAME , params );
182- jobInstanceDao .createJobInstance (JOB_NAME , params );
180+ instanceDao .createJobInstance (JOB_NAME , params );
181+ instanceDao .createJobInstance (JOB_NAME , params );
182+ instanceDao .createJobInstance (JOB_NAME , params );
183183
184- assertThat (jobInstanceDao .getJobInstanceCount (JOB_NAME )).isEqualTo (3 );
184+ assertThat (instanceDao .getJobInstanceCount (JOB_NAME )).isEqualTo (3 );
185185 }
186186}
0 commit comments