Make vm url tests pass on all OS

pharo-project · Sep 28, 2018 · 39aef95 · 39aef95
1 parent d020aee
commit 39aef95
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 17 deletions.
diff --git a/src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/properties.json b/src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/properties.json
@@ -1,11 +1,13 @@
 {
+	"classtraitcomposition" : "TPhLVirtualMachineTestUtil classTrait",
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "PhLVirtualMachineManagerTest",
 	"commentStamp" : "",
 	"super" : "TestCase",
-	"category" : "PharoLauncher-Tests-Download",
+	"traitcomposition" : "TPhLVirtualMachineTestUtil",
+	"type" : "normal",
 	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
-	"name" : "PhLVirtualMachineManagerTest",
-	"type" : "normal"
+	"category" : "PharoLauncher-Tests-Download"
 }
diff --git a/...PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/README.md b/...PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/README.md
diff --git a/...rTest.class/instance/replaceOSByMacIn..st → ...tUtil.trait/instance/replaceOSByMacIn..st b/...rTest.class/instance/replaceOSByMacIn..st → ...tUtil.trait/instance/replaceOSByMacIn..st
diff --git a/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/properties.json b/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/properties.json
@@ -0,0 +1,7 @@
+{
+	"commentStamp" : "",
+	"classinstvars" : [ ],
+	"category" : "PharoLauncher-Tests-Download",
+	"instvars" : [ ],
+	"name" : "TPhLVirtualMachineTestUtil"
+}
diff --git a/...s-Functional.package/PhLPrivateVirtualMachineTest.class/instance/testCanGetDownloadUrl.st b/...s-Functional.package/PhLPrivateVirtualMachineTest.class/instance/testCanGetDownloadUrl.st
@@ -5,5 +5,5 @@ testCanGetDownloadUrl
 		basicInitializeOn: FileSystem memory / '6521';
 		yourself.
 	self 
-		assert: vm downloadUrl 
+		assert: (self replaceOSByMacIn: vm downloadUrl)
 		equals: 'https://files.pharo.org/get-files/70/pharo-mac-stable.zip'
diff --git a/...PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/properties.json b/...PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/properties.json
@@ -1,11 +1,13 @@
 {
+	"classtraitcomposition" : "TPhLVirtualMachineTestUtil classTrait",
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "PhLPrivateVirtualMachineTest",
 	"commentStamp" : "",
 	"super" : "TestCase",
-	"category" : "PharoLauncher-Tests-Functional",
+	"traitcomposition" : "TPhLVirtualMachineTestUtil",
+	"type" : "normal",
 	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
-	"name" : "PhLPrivateVirtualMachineTest",
-	"type" : "normal"
+	"category" : "PharoLauncher-Tests-Functional"
 }
diff --git a/...er-Tests-Functional.package/PhLVirtualMachineTest.class/instance/testCanGetDownloadUrl.st b/...er-Tests-Functional.package/PhLVirtualMachineTest.class/instance/testCanGetDownloadUrl.st
@@ -5,5 +5,5 @@ testCanGetDownloadUrl
 		basicInitializeOn: FileSystem memory / '70-x64';
 		yourself.
 	self 
-		assert: vm downloadUrl 
+		assert: (self replaceOSByMacIn: vm downloadUrl) 
 		equals: 'https://files.pharo.org/get-files/70/pharo64-mac-stable.zip'
diff --git a/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/properties.json b/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/properties.json
@@ -1,11 +1,13 @@
 {
+	"classtraitcomposition" : "TPhLVirtualMachineTestUtil classTrait",
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "PhLVirtualMachineTest",
 	"commentStamp" : "",
 	"super" : "TestCase",
-	"category" : "PharoLauncher-Tests-Functional",
+	"traitcomposition" : "TPhLVirtualMachineTestUtil",
+	"type" : "normal",
 	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
-	"name" : "PhLVirtualMachineTest",
-	"type" : "normal"
+	"category" : "PharoLauncher-Tests-Functional"
 }