--- a/JavaReleaseTests.st Fri Mar 13 13:33:16 2015 +0000
+++ b/JavaReleaseTests.st Fri Mar 13 16:09:02 2015 +0000
@@ -613,6 +613,62 @@
"Modified: / 11-03-2015 / 11:03:41 / jv"
!
+test_windows_OracleJDK_1_7_0_75_jre
+
+ | java_home |
+
+ java_home := #(
+ 'C:\Program Files\Java\jdk1.7.0_76'
+ ) detect:[:each | each asFilename exists ] ifNone:[ nil ].
+
+ java_home notNil ifTrue:[ java_home := java_home asFilename ].
+ self
+ skipIf: (java_home isNil or:[ java_home exists not ])
+ description: ('Directory does not exist (%1)' bindWith:(java_home notNil
+ ifTrue:[ java_home pathName ]
+ ifFalse:[ 'nil' ])).
+
+ self assert: (JavaRelease openJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK8 validateJavaHome: java_home) not.
+
+ self assert: (JavaRelease oracleJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK7 validateJavaHome: java_home).
+ self assert: (JavaRelease oracleJDK8 validateJavaHome: java_home) not.
+
+ self assert: ((JavaRelease inDirectory: java_home) isKindOf: (JavaRelease::OracleJDK7))
+
+ "Created: / 13-03-2015 / 16:02:03 / jv"
+!
+
+test_windows_OracleJDK_1_7_0_76_jdk
+
+ | java_home |
+
+ java_home := #(
+ 'C:\Program Files\Java\jdk1.7.0_76'
+ ) detect:[:each | each asFilename exists ] ifNone:[ nil ].
+
+ java_home notNil ifTrue:[ java_home := java_home asFilename ].
+ self
+ skipIf: (java_home isNil or:[ java_home exists not ])
+ description: ('Directory does not exist (%1)' bindWith:(java_home notNil
+ ifTrue:[ java_home pathName ]
+ ifFalse:[ 'nil' ])).
+
+ self assert: (JavaRelease openJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK8 validateJavaHome: java_home) not.
+
+ self assert: (JavaRelease oracleJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK7 validateJavaHome: java_home).
+ self assert: (JavaRelease oracleJDK8 validateJavaHome: java_home) not.
+
+ self assert: ((JavaRelease inDirectory: java_home) isKindOf: (JavaRelease::OracleJDK7))
+
+ "Created: / 13-03-2015 / 16:02:22 / jv"
+!
+
test_windows_OracleJDK_1_8_0_05_jdk
| java_home |
@@ -679,6 +735,62 @@
"Modified: / 11-03-2015 / 11:03:26 / jv"
!
+test_windows_OracleJDK_1_8_0_40_jdk
+
+ | java_home |
+
+ java_home := #(
+ 'C:\Program Files\Java\jdk1.8.0_40'
+ ) detect:[:each | each asFilename exists ] ifNone:[ nil ].
+
+ java_home notNil ifTrue:[ java_home := java_home asFilename ].
+ self
+ skipIf: (java_home isNil or:[ java_home exists not ])
+ description: ('Directory does not exist (%1)' bindWith:(java_home notNil
+ ifTrue:[ java_home pathName ]
+ ifFalse:[ 'nil' ])).
+
+ self assert: (JavaRelease openJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK8 validateJavaHome: java_home) not.
+
+ self assert: (JavaRelease oracleJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK8 validateJavaHome: java_home).
+
+ self assert: ((JavaRelease inDirectory: java_home) isKindOf: (JavaRelease::OracleJDK8))
+
+ "Created: / 13-03-2015 / 16:03:00 / jv"
+!
+
+test_windows_OracleJDK_1_8_0_40_jre
+
+ | java_home |
+
+ java_home := #(
+ 'C:\Program Files\Java\jdk1.8.0_40\jre'
+ ) detect:[:each | each asFilename exists ] ifNone:[ nil ].
+
+ java_home notNil ifTrue:[ java_home := java_home asFilename ].
+ self
+ skipIf: (java_home isNil or:[ java_home exists not ])
+ description: ('Directory does not exist (%1)' bindWith:(java_home notNil
+ ifTrue:[ java_home pathName ]
+ ifFalse:[ 'nil' ])).
+
+ self assert: (JavaRelease openJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease openJDK8 validateJavaHome: java_home) not.
+
+ self assert: (JavaRelease oracleJDK6 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK7 validateJavaHome: java_home) not.
+ self assert: (JavaRelease oracleJDK8 validateJavaHome: java_home).
+
+ self assert: ((JavaRelease inDirectory: java_home) isKindOf: (JavaRelease::OracleJDK8))
+
+ "Created: / 13-03-2015 / 16:03:19 / jv"
+!
+
test_windows_OracleJDK_1_8_0_jdk
| java_home |