From 39aef9548970faf60d17e9c9c467864a7d2e0068 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Fri, 28 Sep 2018 09:38:09 +0200 Subject: [PATCH] Make vm url tests pass on all OS --- .../properties.json | 12 +++++++----- .../TPhLVirtualMachineTestUtil.trait/README.md | 0 .../instance/replaceOSByMacIn..st | 0 .../TPhLVirtualMachineTestUtil.trait/properties.json | 7 +++++++ .../instance/testCanGetDownloadUrl.st | 2 +- .../properties.json | 12 +++++++----- .../instance/testCanGetDownloadUrl.st | 2 +- .../PhLVirtualMachineTest.class/properties.json | 12 +++++++----- 8 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/README.md rename src/PharoLauncher-Tests-Download.package/{PhLVirtualMachineManagerTest.class => TPhLVirtualMachineTestUtil.trait}/instance/replaceOSByMacIn..st (100%) create mode 100644 src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/properties.json diff --git a/src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/properties.json b/src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/properties.json index 6fbeaaae..8d31d1b9 100644 --- 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" } \ No newline at end of file diff --git a/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/README.md b/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/README.md new file mode 100644 index 00000000..e69de29b diff --git a/src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/instance/replaceOSByMacIn..st b/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/instance/replaceOSByMacIn..st similarity index 100% rename from src/PharoLauncher-Tests-Download.package/PhLVirtualMachineManagerTest.class/instance/replaceOSByMacIn..st rename to src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.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 new file mode 100644 index 00000000..28c1467b --- /dev/null +++ b/src/PharoLauncher-Tests-Download.package/TPhLVirtualMachineTestUtil.trait/properties.json @@ -0,0 +1,7 @@ +{ + "commentStamp" : "", + "classinstvars" : [ ], + "category" : "PharoLauncher-Tests-Download", + "instvars" : [ ], + "name" : "TPhLVirtualMachineTestUtil" +} \ No newline at end of file diff --git a/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/instance/testCanGetDownloadUrl.st b/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/instance/testCanGetDownloadUrl.st index 239e7645..c4a869c2 100644 --- a/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/instance/testCanGetDownloadUrl.st +++ b/src/PharoLauncher-Tests-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' \ No newline at end of file diff --git a/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/properties.json b/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/properties.json index 178798a3..6b22cfcd 100644 --- a/src/PharoLauncher-Tests-Functional.package/PhLPrivateVirtualMachineTest.class/properties.json +++ b/src/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" } \ No newline at end of file diff --git a/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/instance/testCanGetDownloadUrl.st b/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/instance/testCanGetDownloadUrl.st index 0390a2b3..624bd010 100644 --- a/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/instance/testCanGetDownloadUrl.st +++ b/src/PharoLauncher-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' \ No newline at end of file diff --git a/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/properties.json b/src/PharoLauncher-Tests-Functional.package/PhLVirtualMachineTest.class/properties.json index d90f0b9b..fd55a157 100644 --- 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" } \ No newline at end of file