@@ -222,7 +222,7 @@ testComparable "10.10.113" "10010113"
222222# test function:
223223# tests the JavaVersionSatisfiesRequirement() function
224224# #########################################################
225- function testCompare () {
225+ function testSatisfies () {
226226 java_version=$1
227227 java_requirement=$2
228228 expected_result=$3
@@ -251,95 +251,95 @@ echo "########################################################"
251251echo " Testing function JavaVersionSatisfiesRequirement()"
252252echo " "
253253echo " Tests with Java 1.6:"
254- testCompare " 1.6" " 1.6" " 0"
255- testCompare " 1.6" " 1.6+" " 0"
256- testCompare " 1.6" " 1.6*" " 0"
257- testCompare " 1.6" " 1.6.0_45" " 2"
258- testCompare " 1.6" " 1.7" " 1"
259- testCompare " 1.6" " 1.7+" " 1"
260- testCompare " 1.6" " 1.7*" " 1"
261- testCompare " 1.6" " 1.7.0_71" " 2"
262- testCompare " 1.6" " 1.8" " 1"
263- testCompare " 1.6" " 1.8+" " 1"
264- testCompare " 1.6" " 1.8*" " 1"
265- testCompare " 1.6" " 1.8.0_121" " 2"
266- testCompare " 1.6" " 9" " 1"
267- testCompare " 1.6" " 9+" " 1"
268- testCompare " 1.6" " 9*" " 1"
269- testCompare " 1.6" " 9.1.2" " 1"
254+ testSatisfies " 1.6" " 1.6" " 0"
255+ testSatisfies " 1.6" " 1.6+" " 0"
256+ testSatisfies " 1.6" " 1.6*" " 0"
257+ testSatisfies " 1.6" " 1.6.0_45" " 2"
258+ testSatisfies " 1.6" " 1.7" " 1"
259+ testSatisfies " 1.6" " 1.7+" " 1"
260+ testSatisfies " 1.6" " 1.7*" " 1"
261+ testSatisfies " 1.6" " 1.7.0_71" " 2"
262+ testSatisfies " 1.6" " 1.8" " 1"
263+ testSatisfies " 1.6" " 1.8+" " 1"
264+ testSatisfies " 1.6" " 1.8*" " 1"
265+ testSatisfies " 1.6" " 1.8.0_121" " 2"
266+ testSatisfies " 1.6" " 9" " 1"
267+ testSatisfies " 1.6" " 9+" " 1"
268+ testSatisfies " 1.6" " 9*" " 1"
269+ testSatisfies " 1.6" " 9.1.2" " 1"
270270echo " "
271271echo " Tests with Java 1.7:"
272- testCompare " 1.7" " 1.6" " 1"
273- testCompare " 1.7" " 1.6+" " 0"
274- testCompare " 1.7" " 1.6*" " 1"
275- testCompare " 1.7" " 1.6.0_45" " 2"
276- testCompare " 1.7" " 1.7" " 0"
277- testCompare " 1.7" " 1.7+" " 0"
278- testCompare " 1.7" " 1.7*" " 0"
279- testCompare " 1.7" " 1.7.0_71" " 2"
280- testCompare " 1.7" " 1.8" " 1"
281- testCompare " 1.7" " 1.8+" " 1"
282- testCompare " 1.7" " 1.8*" " 1"
283- testCompare " 1.7" " 1.8.0_121" " 2"
284- testCompare " 1.7" " 9" " 1"
285- testCompare " 1.7" " 9+" " 1"
286- testCompare " 1.7" " 9*" " 1"
287- testCompare " 1.7" " 9.1.2" " 1"
272+ testSatisfies " 1.7" " 1.6" " 1"
273+ testSatisfies " 1.7" " 1.6+" " 0"
274+ testSatisfies " 1.7" " 1.6*" " 1"
275+ testSatisfies " 1.7" " 1.6.0_45" " 2"
276+ testSatisfies " 1.7" " 1.7" " 0"
277+ testSatisfies " 1.7" " 1.7+" " 0"
278+ testSatisfies " 1.7" " 1.7*" " 0"
279+ testSatisfies " 1.7" " 1.7.0_71" " 2"
280+ testSatisfies " 1.7" " 1.8" " 1"
281+ testSatisfies " 1.7" " 1.8+" " 1"
282+ testSatisfies " 1.7" " 1.8*" " 1"
283+ testSatisfies " 1.7" " 1.8.0_121" " 2"
284+ testSatisfies " 1.7" " 9" " 1"
285+ testSatisfies " 1.7" " 9+" " 1"
286+ testSatisfies " 1.7" " 9*" " 1"
287+ testSatisfies " 1.7" " 9.1.2" " 1"
288288echo " "
289289echo " Tests with Java 1.8:"
290- testCompare " 1.8" " 1.6" " 1"
291- testCompare " 1.8" " 1.6+" " 0"
292- testCompare " 1.8" " 1.6*" " 1"
293- testCompare " 1.8" " 1.6.0_45" " 2"
294- testCompare " 1.8" " 1.7" " 1"
295- testCompare " 1.8" " 1.7+" " 0"
296- testCompare " 1.8" " 1.7*" " 1"
297- testCompare " 1.8" " 1.7.0_71" " 2"
298- testCompare " 1.8" " 1.8" " 0"
299- testCompare " 1.8" " 1.8+" " 0"
300- testCompare " 1.8" " 1.8*" " 0"
301- testCompare " 1.8" " 1.8.0_121" " 2"
302- testCompare " 1.8" " 9" " 1"
303- testCompare " 1.8" " 9+" " 1"
304- testCompare " 1.8" " 9*" " 1"
305- testCompare " 1.8" " 9.1.2" " 1"
290+ testSatisfies " 1.8" " 1.6" " 1"
291+ testSatisfies " 1.8" " 1.6+" " 0"
292+ testSatisfies " 1.8" " 1.6*" " 1"
293+ testSatisfies " 1.8" " 1.6.0_45" " 2"
294+ testSatisfies " 1.8" " 1.7" " 1"
295+ testSatisfies " 1.8" " 1.7+" " 0"
296+ testSatisfies " 1.8" " 1.7*" " 1"
297+ testSatisfies " 1.8" " 1.7.0_71" " 2"
298+ testSatisfies " 1.8" " 1.8" " 0"
299+ testSatisfies " 1.8" " 1.8+" " 0"
300+ testSatisfies " 1.8" " 1.8*" " 0"
301+ testSatisfies " 1.8" " 1.8.0_121" " 2"
302+ testSatisfies " 1.8" " 9" " 1"
303+ testSatisfies " 1.8" " 9+" " 1"
304+ testSatisfies " 1.8" " 9*" " 1"
305+ testSatisfies " 1.8" " 9.1.2" " 1"
306306echo " "
307307echo " Tests with Java 9:"
308- testCompare " 9" " 1.6" " 1"
309- testCompare " 9" " 1.6+" " 0"
310- testCompare " 9" " 1.6*" " 1"
311- testCompare " 9" " 1.6.0_45" " 2"
312- testCompare " 9" " 1.7" " 1"
313- testCompare " 9" " 1.7+" " 0"
314- testCompare " 9" " 1.7*" " 1"
315- testCompare " 9" " 1.7.0_71" " 2"
316- testCompare " 9" " 1.8" " 1"
317- testCompare " 9" " 1.8+" " 0"
318- testCompare " 9" " 1.8*" " 1"
319- testCompare " 9" " 1.8.0_121" " 2"
320- testCompare " 9" " 9" " 0"
321- testCompare " 9" " 9+" " 0"
322- testCompare " 9" " 9*" " 0"
323- testCompare " 9" " 9.1.2" " 1"
308+ testSatisfies " 9" " 1.6" " 1"
309+ testSatisfies " 9" " 1.6+" " 0"
310+ testSatisfies " 9" " 1.6*" " 1"
311+ testSatisfies " 9" " 1.6.0_45" " 2"
312+ testSatisfies " 9" " 1.7" " 1"
313+ testSatisfies " 9" " 1.7+" " 0"
314+ testSatisfies " 9" " 1.7*" " 1"
315+ testSatisfies " 9" " 1.7.0_71" " 2"
316+ testSatisfies " 9" " 1.8" " 1"
317+ testSatisfies " 9" " 1.8+" " 0"
318+ testSatisfies " 9" " 1.8*" " 1"
319+ testSatisfies " 9" " 1.8.0_121" " 2"
320+ testSatisfies " 9" " 9" " 0"
321+ testSatisfies " 9" " 9+" " 0"
322+ testSatisfies " 9" " 9*" " 0"
323+ testSatisfies " 9" " 9.1.2" " 1"
324324echo " "
325325echo " Tests with Java 10:"
326- testCompare " 10" " 1.6" " 1"
327- testCompare " 10" " 1.6+" " 0"
328- testCompare " 10" " 1.6*" " 1"
329- testCompare " 10" " 1.6.0_45" " 2"
330- testCompare " 10" " 1.7" " 1"
331- testCompare " 10" " 1.7+" " 0"
332- testCompare " 10" " 1.7*" " 1"
333- testCompare " 10" " 1.7.0_71" " 2"
334- testCompare " 10" " 1.8" " 1"
335- testCompare " 10" " 1.8+" " 0"
336- testCompare " 10" " 1.8*" " 1"
337- testCompare " 10" " 1.8.0_121" " 2"
338- testCompare " 10" " 9" " 1"
339- testCompare " 10" " 9+" " 0"
340- testCompare " 10" " 9*" " 1"
341- testCompare " 10" " 9.1.2" " 1"
342- testCompare " 10" " 10" " 0"
343- testCompare " 10" " 10+" " 0"
344- testCompare " 10" " 10*" " 0"
345- testCompare " 10" " 10.0.13" " 1"
326+ testSatisfies " 10" " 1.6" " 1"
327+ testSatisfies " 10" " 1.6+" " 0"
328+ testSatisfies " 10" " 1.6*" " 1"
329+ testSatisfies " 10" " 1.6.0_45" " 2"
330+ testSatisfies " 10" " 1.7" " 1"
331+ testSatisfies " 10" " 1.7+" " 0"
332+ testSatisfies " 10" " 1.7*" " 1"
333+ testSatisfies " 10" " 1.7.0_71" " 2"
334+ testSatisfies " 10" " 1.8" " 1"
335+ testSatisfies " 10" " 1.8+" " 0"
336+ testSatisfies " 10" " 1.8*" " 1"
337+ testSatisfies " 10" " 1.8.0_121" " 2"
338+ testSatisfies " 10" " 9" " 1"
339+ testSatisfies " 10" " 9+" " 0"
340+ testSatisfies " 10" " 9*" " 1"
341+ testSatisfies " 10" " 9.1.2" " 1"
342+ testSatisfies " 10" " 10" " 0"
343+ testSatisfies " 10" " 10+" " 0"
344+ testSatisfies " 10" " 10*" " 0"
345+ testSatisfies " 10" " 10.0.13" " 1"
0 commit comments