- clean up formatting

- add test for non-GA version (1.7.0_65-b19)
This commit is contained in:
Richard Alam 2014-07-18 07:52:21 -07:00
parent 70f4aba334
commit e854928b7a
2 changed files with 21 additions and 16 deletions

View File

@ -32,11 +32,11 @@ public class VersionCheckUtil {
return true;
else{
// Checking Java version
if(Integer.parseInt(clientVersioning[1]) > Integer.parseInt(requestedVersioning[1]))
if (Integer.parseInt(clientVersioning[1]) > Integer.parseInt(requestedVersioning[1]))
return true;
// Checking update
else if(Integer.parseInt(clientVersioning[1]) == Integer.parseInt(requestedVersioning[1])){
else if (Integer.parseInt(clientVersioning[1]) == Integer.parseInt(requestedVersioning[1])){
// non-GA or non-FCS release won't be supported
if(clientVersioning[2].indexOf("-") != -1)
return false;
@ -45,35 +45,34 @@ public class VersionCheckUtil {
int rUpdatePart2 = 0;
int underbar = requestedVersioning[2].indexOf("_");
if( underbar == -1){
if ( underbar == -1){
rUpdatePart1 = Integer.parseInt(requestedVersioning[2]);
}else{
rUpdatePart1 = Integer.parseInt(requestedVersioning[2].substring(0,underbar));
rUpdatePart2 = Integer.parseInt(requestedVersioning[2].substring(underbar+1,requestedVersioning[2].length()));
} else {
rUpdatePart1 = Integer.parseInt(requestedVersioning[2].substring(0, underbar));
rUpdatePart2 = Integer.parseInt(requestedVersioning[2].substring(underbar + 1, requestedVersioning[2].length()));
}
int cUpdatePart1 = 0;
int cUpdatePart2 = 0;
underbar = clientVersioning[2].indexOf("_");
if( underbar == -1){
if ( underbar == -1) {
cUpdatePart1 = Integer.parseInt(clientVersioning[2]);
}else{
cUpdatePart1 = Integer.parseInt(clientVersioning[2].substring(0,underbar));
cUpdatePart2 = Integer.parseInt(clientVersioning[2].substring(underbar+1,clientVersioning[2].length()));
} else {
cUpdatePart1 = Integer.parseInt(clientVersioning[2].substring(0, underbar));
cUpdatePart2 = Integer.parseInt(clientVersioning[2].substring(underbar + 1, clientVersioning[2].length()));
}
if(cUpdatePart1 > rUpdatePart1)
if (cUpdatePart1 > rUpdatePart1)
return true;
else if(cUpdatePart1 == rUpdatePart1)
{
if(cUpdatePart2 > rUpdatePart2 || cUpdatePart2 == rUpdatePart2)
else if (cUpdatePart1 == rUpdatePart1) {
if (cUpdatePart2 > rUpdatePart2 || cUpdatePart2 == rUpdatePart2)
return true;
else
return false;
}else
} else
return false;
}else
} else
return false;
}
}

View File

@ -22,4 +22,10 @@ public class VersionCheckUtilTest {
boolean passed = VersionCheckUtil.validateMinJREVersion("1.7.0_65", "1.7.0_51");
Assert.assertTrue(passed, "The version check should pass.");
}
@Test
public void testJava7u65BetaVersion() {
boolean fail = VersionCheckUtil.validateMinJREVersion("1.7.0_65-b19", "1.7.0_51");
Assert.assertFalse(fail, "Non GS release is unsupported.");
}
}