diff --git a/build-packages.sh b/build-packages.sh old mode 100644 new mode 100755 diff --git a/build-test.sh b/build-test.sh old mode 100644 new mode 100755 diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/clean.sh b/clean.sh old mode 100644 new mode 100755 diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_ExampleWorkload.txt b/src/VirtualClient/TestResources/Results_ExampleWorkload.txt similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_ExampleWorkload.txt rename to src/VirtualClient/TestResources/Results_ExampleWorkload.txt diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/TEST-PROFILE.json b/src/VirtualClient/TestResources/TEST-PROFILE.json similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/TEST-PROFILE.json rename to src/VirtualClient/TestResources/TEST-PROFILE.json diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_DiskSpd_Text.txt b/src/VirtualClient/TestResources/diskspd/Results_DiskSpd_Text.txt similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_DiskSpd_Text.txt rename to src/VirtualClient/TestResources/diskspd/Results_DiskSpd_Text.txt diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_DiskSpd_Xml.xml b/src/VirtualClient/TestResources/diskspd/Results_DiskSpd_Xml.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_DiskSpd_Xml.xml rename to src/VirtualClient/TestResources/diskspd/Results_DiskSpd_Xml.xml diff --git a/src/VirtualClient/TestResources/Results_FIO.json b/src/VirtualClient/TestResources/fio/Results_FIO.json similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO.json rename to src/VirtualClient/TestResources/fio/Results_FIO.json diff --git a/src/VirtualClient/TestResources/Results_FIO_Error_1.txt b/src/VirtualClient/TestResources/fio/Results_FIO_Error_1.txt similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_Error_1.txt rename to src/VirtualClient/TestResources/fio/Results_FIO_Error_1.txt diff --git a/src/VirtualClient/TestResources/Results_FIO_Error_2.txt b/src/VirtualClient/TestResources/fio/Results_FIO_Error_2.txt similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_Error_2.txt rename to src/VirtualClient/TestResources/fio/Results_FIO_Error_2.txt diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_JSON.txt b/src/VirtualClient/TestResources/fio/Results_FIO_JSON.txt similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_JSON.txt rename to src/VirtualClient/TestResources/fio/Results_FIO_JSON.txt diff --git a/src/VirtualClient/TestResources/Results_FIO_ReadWrite.json b/src/VirtualClient/TestResources/fio/Results_FIO_ReadWrite.json similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_ReadWrite.json rename to src/VirtualClient/TestResources/fio/Results_FIO_ReadWrite.json diff --git a/src/VirtualClient/TestResources/Results_FIO_Verification_Error_1.txt b/src/VirtualClient/TestResources/fio/Results_FIO_Verification_Error_1.txt similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_Verification_Error_1.txt rename to src/VirtualClient/TestResources/fio/Results_FIO_Verification_Error_1.txt diff --git a/src/VirtualClient/TestResources/Results_FIO_Verification_Error_2.txt b/src/VirtualClient/TestResources/fio/Results_FIO_Verification_Error_2.txt similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_Verification_Error_2.txt rename to src/VirtualClient/TestResources/fio/Results_FIO_Verification_Error_2.txt diff --git a/src/VirtualClient/TestResources/Results_FIO_Write.json b/src/VirtualClient/TestResources/fio/Results_FIO_Write.json similarity index 100% rename from src/VirtualClient/TestResources/Results_FIO_Write.json rename to src/VirtualClient/TestResources/fio/Results_FIO_Write.json diff --git a/src/VirtualClient/TestResources/expectedoltp-c.fio1.jobfile b/src/VirtualClient/TestResources/fio/expectedoltp-c.fio1.jobfile similarity index 100% rename from src/VirtualClient/TestResources/expectedoltp-c.fio1.jobfile rename to src/VirtualClient/TestResources/fio/expectedoltp-c.fio1.jobfile diff --git a/src/VirtualClient/TestResources/expectedoltp-c.fio2.jobfile b/src/VirtualClient/TestResources/fio/expectedoltp-c.fio2.jobfile similarity index 100% rename from src/VirtualClient/TestResources/expectedoltp-c.fio2.jobfile rename to src/VirtualClient/TestResources/fio/expectedoltp-c.fio2.jobfile diff --git a/src/VirtualClient/TestResources/expectedoltp-c.fio3.jobfile b/src/VirtualClient/TestResources/fio/expectedoltp-c.fio3.jobfile similarity index 100% rename from src/VirtualClient/TestResources/expectedoltp-c.fio3.jobfile rename to src/VirtualClient/TestResources/fio/expectedoltp-c.fio3.jobfile diff --git a/src/VirtualClient/TestResources/oltp-c.fio.jobfile b/src/VirtualClient/TestResources/fio/oltp-c.fio.jobfile similarity index 100% rename from src/VirtualClient/TestResources/oltp-c.fio.jobfile rename to src/VirtualClient/TestResources/fio/oltp-c.fio.jobfile diff --git a/src/VirtualClient/TestResources/MemoryLatencyChecker/memory_latency_checker_results_1.txt b/src/VirtualClient/TestResources/memorylatencychecker/memory_latency_checker_results_1.txt similarity index 100% rename from src/VirtualClient/TestResources/MemoryLatencyChecker/memory_latency_checker_results_1.txt rename to src/VirtualClient/TestResources/memorylatencychecker/memory_latency_checker_results_1.txt diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results-OpenSSL-speed.txt b/src/VirtualClient/TestResources/openssl/Results_OpenSSL_speed.txt similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results-OpenSSL-speed.txt rename to src/VirtualClient/TestResources/openssl/Results_OpenSSL_speed.txt diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results-OpenSSL-stime.txt b/src/VirtualClient/TestResources/openssl/Results_OpenSSL_stime.txt similarity index 100% rename from src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results-OpenSSL-stime.txt rename to src/VirtualClient/TestResources/openssl/Results_OpenSSL_stime.txt diff --git a/src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_physical.txt b/src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_physical.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_physical.txt rename to src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_physical.txt diff --git a/src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_physical_2.txt b/src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_physical_2.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_physical_2.txt rename to src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_physical_2.txt diff --git a/src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_vm.txt b/src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_vm.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/dmidecode/dmidecode_memory_ubuntu_vm.txt rename to src/VirtualClient/TestResources/unix/dmidecode/dmidecode_memory_ubuntu_vm.txt diff --git a/src/VirtualClient/TestResources/Unix/example_metrics_telemetry.json b/src/VirtualClient/TestResources/unix/example_metrics_telemetry.json similarity index 100% rename from src/VirtualClient/TestResources/Unix/example_metrics_telemetry.json rename to src/VirtualClient/TestResources/unix/example_metrics_telemetry.json diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2 b/src/VirtualClient/TestResources/unix/hostnamectl/amazon_2 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2 rename to src/VirtualClient/TestResources/unix/hostnamectl/amazon_2 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2018 b/src/VirtualClient/TestResources/unix/hostnamectl/amazon_2018 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2018 rename to src/VirtualClient/TestResources/unix/hostnamectl/amazon_2018 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2023 b/src/VirtualClient/TestResources/unix/hostnamectl/amazon_2023 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/amazon_2023 rename to src/VirtualClient/TestResources/unix/hostnamectl/amazon_2023 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/azurelinux_3 b/src/VirtualClient/TestResources/unix/hostnamectl/azurelinux_3 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/azurelinux_3 rename to src/VirtualClient/TestResources/unix/hostnamectl/azurelinux_3 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/azurelinux_4 b/src/VirtualClient/TestResources/unix/hostnamectl/azurelinux_4 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/azurelinux_4 rename to src/VirtualClient/TestResources/unix/hostnamectl/azurelinux_4 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/centos_7 b/src/VirtualClient/TestResources/unix/hostnamectl/centos_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/centos_7 rename to src/VirtualClient/TestResources/unix/hostnamectl/centos_7 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/centos_8 b/src/VirtualClient/TestResources/unix/hostnamectl/centos_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/centos_8 rename to src/VirtualClient/TestResources/unix/hostnamectl/centos_8 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/centos_stream_8 b/src/VirtualClient/TestResources/unix/hostnamectl/centos_stream_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/centos_stream_8 rename to src/VirtualClient/TestResources/unix/hostnamectl/centos_stream_8 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/centos_stream_9 b/src/VirtualClient/TestResources/unix/hostnamectl/centos_stream_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/centos_stream_9 rename to src/VirtualClient/TestResources/unix/hostnamectl/centos_stream_9 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_10 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_10 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_10 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_10 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_11 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_11 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_11 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_11 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_12 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_12 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_12 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_12 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_13 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_13 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_13 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_13 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_7 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_7 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_7 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_8 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_8 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_8 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/debian_9 b/src/VirtualClient/TestResources/unix/hostnamectl/debian_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/debian_9 rename to src/VirtualClient/TestResources/unix/hostnamectl/debian_9 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_28 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_28 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_28 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_28 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_29 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_29 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_29 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_29 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_30 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_30 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_30 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_30 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_31 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_31 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_31 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_31 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_32 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_32 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_32 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_32 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_33 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_33 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_33 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_33 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_34 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_34 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_34 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_34 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_35 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_35 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_35 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_35 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_36 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_36 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_36 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_36 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_37 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_37 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_37 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_37 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_38 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_38 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_38 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_38 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_39 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_39 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_39 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_39 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_40 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_40 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_40 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_40 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_41 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_41 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_41 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_41 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_42 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_42 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_42 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_42 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_43 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_43 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_43 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_43 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/fedora_44 b/src/VirtualClient/TestResources/unix/hostnamectl/fedora_44 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/fedora_44 rename to src/VirtualClient/TestResources/unix/hostnamectl/fedora_44 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/flatcar b/src/VirtualClient/TestResources/unix/hostnamectl/flatcar similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/flatcar rename to src/VirtualClient/TestResources/unix/hostnamectl/flatcar diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/gentoo_214 b/src/VirtualClient/TestResources/unix/hostnamectl/gentoo_214 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/gentoo_214 rename to src/VirtualClient/TestResources/unix/hostnamectl/gentoo_214 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/gentoo_218 b/src/VirtualClient/TestResources/unix/hostnamectl/gentoo_218 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/gentoo_218 rename to src/VirtualClient/TestResources/unix/hostnamectl/gentoo_218 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/opensuse_13 b/src/VirtualClient/TestResources/unix/hostnamectl/opensuse_13 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/opensuse_13 rename to src/VirtualClient/TestResources/unix/hostnamectl/opensuse_13 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_15 b/src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_15 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_15 rename to src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_15 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_16 b/src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_16 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_16 rename to src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_16 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_42_3 b/src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_42_3 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/opensuseleap_42_3 rename to src/VirtualClient/TestResources/unix/hostnamectl/opensuseleap_42_3 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/redhat_10 b/src/VirtualClient/TestResources/unix/hostnamectl/redhat_10 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/redhat_10 rename to src/VirtualClient/TestResources/unix/hostnamectl/redhat_10 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/redhat_7 b/src/VirtualClient/TestResources/unix/hostnamectl/redhat_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/redhat_7 rename to src/VirtualClient/TestResources/unix/hostnamectl/redhat_7 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/redhat_8 b/src/VirtualClient/TestResources/unix/hostnamectl/redhat_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/redhat_8 rename to src/VirtualClient/TestResources/unix/hostnamectl/redhat_8 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/redhat_9 b/src/VirtualClient/TestResources/unix/hostnamectl/redhat_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/redhat_9 rename to src/VirtualClient/TestResources/unix/hostnamectl/redhat_9 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1404 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1404 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1404 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1404 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1604 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1604 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1604 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1604 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1804 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1804 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_1804 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_1804 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2004 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2004 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2004 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2004 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2204 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2204 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2204 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2204 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2404 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2404 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2404 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2404 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2504 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2504 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2504 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2504 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2510 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2510 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2510 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2510 diff --git a/src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2604 b/src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2604 similarity index 100% rename from src/VirtualClient/TestResources/Unix/hostnamectl/ubuntu_2604 rename to src/VirtualClient/TestResources/unix/hostnamectl/ubuntu_2604 diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_ampere_1.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_ampere_1.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_ampere_1.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_ampere_1.txt diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_ampere_2.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_ampere_2.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_ampere_2.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_ampere_2.txt diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_1.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_1.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_1.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_1.txt diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_2.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_2.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_2.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_2.txt diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_3.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_3.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_3.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_3.txt diff --git a/src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_4.txt b/src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_4.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lscpu/lscpu_results_intel_4.txt rename to src/VirtualClient/TestResources/unix/lscpu/lscpu_results_intel_4.txt diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw.xml b/src/VirtualClient/TestResources/unix/lshw/lshw.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_2_after_mount.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_2_after_mount.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_2_after_mount.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_2_after_mount.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_2_before_mount.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_2_before_mount.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_2_before_mount.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_2_before_mount.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_before_partitioning.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_before_partitioning.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_before_partitioning.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_before_partitioning.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_2.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_2.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_2.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_2.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_disk_storage_results_anomaly.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_anomaly.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_disk_storage_results_anomaly.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_anomaly.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_before_partitioning.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_before_partitioning.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_before_partitioning.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_before_partitioning.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_cdrom.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_cdrom.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_cdrom.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_cdrom.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_duplicate_index_and_logicalunit.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_duplicate_index_and_logicalunit.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_duplicate_index_and_logicalunit.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_duplicate_index_and_logicalunit.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_nvme.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_nvme.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_nvme.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_nvme.xml diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_volume_without_logicalname.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_volume_without_logicalname.xml similarity index 100% rename from src/VirtualClient/VirtualClient.Core.UnitTests/Resources/lshw_disk_storage_results_with_volume_without_logicalname.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_disk_storage_results_with_volume_without_logicalname.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_nvme_osdisk.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_nvme_osdisk.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_nvme_osdisk.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_nvme_osdisk.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_with_cdrom.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_with_cdrom.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_with_cdrom.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_with_cdrom.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_with_duplicate_index_and_logicalunit.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_with_duplicate_index_and_logicalunit.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_with_duplicate_index_and_logicalunit.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_with_duplicate_index_and_logicalunit.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_with_nvme_1.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_with_nvme_1.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_with_nvme_1.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_with_nvme_1.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_with_nvme_2.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_with_nvme_2.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_with_nvme_2.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_with_nvme_2.xml diff --git a/src/VirtualClient/TestResources/Unix/lshw/lshw_with_volume_without_logicalname.xml b/src/VirtualClient/TestResources/unix/lshw/lshw_with_volume_without_logicalname.xml similarity index 100% rename from src/VirtualClient/TestResources/Unix/lshw/lshw_with_volume_without_logicalname.xml rename to src/VirtualClient/TestResources/unix/lshw/lshw_with_volume_without_logicalname.xml diff --git a/src/VirtualClient/TestResources/Unix/lspci/lspci_physical_system_1.txt b/src/VirtualClient/TestResources/unix/lspci/lspci_physical_system_1.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lspci/lspci_physical_system_1.txt rename to src/VirtualClient/TestResources/unix/lspci/lspci_physical_system_1.txt diff --git a/src/VirtualClient/TestResources/Unix/lspci/lspci_physical_system_mellanox.txt b/src/VirtualClient/TestResources/unix/lspci/lspci_physical_system_mellanox.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lspci/lspci_physical_system_mellanox.txt rename to src/VirtualClient/TestResources/unix/lspci/lspci_physical_system_mellanox.txt diff --git a/src/VirtualClient/TestResources/Unix/lspci/lspci_vm_mellanox.txt b/src/VirtualClient/TestResources/unix/lspci/lspci_vm_mellanox.txt similarity index 100% rename from src/VirtualClient/TestResources/Unix/lspci/lspci_vm_mellanox.txt rename to src/VirtualClient/TestResources/unix/lspci/lspci_vm_mellanox.txt diff --git a/src/VirtualClient/TestResources/Unix/os-release/amazon_2018 b/src/VirtualClient/TestResources/unix/os-release/amazon_2018 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/amazon_2018 rename to src/VirtualClient/TestResources/unix/os-release/amazon_2018 diff --git a/src/VirtualClient/TestResources/Unix/os-release/amazon_2023 b/src/VirtualClient/TestResources/unix/os-release/amazon_2023 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/amazon_2023 rename to src/VirtualClient/TestResources/unix/os-release/amazon_2023 diff --git a/src/VirtualClient/TestResources/Unix/os-release/azurelinux_3 b/src/VirtualClient/TestResources/unix/os-release/azurelinux_3 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/azurelinux_3 rename to src/VirtualClient/TestResources/unix/os-release/azurelinux_3 diff --git a/src/VirtualClient/TestResources/Unix/os-release/azurelinux_4 b/src/VirtualClient/TestResources/unix/os-release/azurelinux_4 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/azurelinux_4 rename to src/VirtualClient/TestResources/unix/os-release/azurelinux_4 diff --git a/src/VirtualClient/TestResources/Unix/os-release/centos_7 b/src/VirtualClient/TestResources/unix/os-release/centos_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/centos_7 rename to src/VirtualClient/TestResources/unix/os-release/centos_7 diff --git a/src/VirtualClient/TestResources/Unix/os-release/centos_8 b/src/VirtualClient/TestResources/unix/os-release/centos_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/centos_8 rename to src/VirtualClient/TestResources/unix/os-release/centos_8 diff --git a/src/VirtualClient/TestResources/Unix/os-release/centos_stream_8 b/src/VirtualClient/TestResources/unix/os-release/centos_stream_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/centos_stream_8 rename to src/VirtualClient/TestResources/unix/os-release/centos_stream_8 diff --git a/src/VirtualClient/TestResources/Unix/os-release/centos_stream_9 b/src/VirtualClient/TestResources/unix/os-release/centos_stream_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/centos_stream_9 rename to src/VirtualClient/TestResources/unix/os-release/centos_stream_9 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_10 b/src/VirtualClient/TestResources/unix/os-release/debian_10 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_10 rename to src/VirtualClient/TestResources/unix/os-release/debian_10 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_11 b/src/VirtualClient/TestResources/unix/os-release/debian_11 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_11 rename to src/VirtualClient/TestResources/unix/os-release/debian_11 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_12 b/src/VirtualClient/TestResources/unix/os-release/debian_12 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_12 rename to src/VirtualClient/TestResources/unix/os-release/debian_12 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_13 b/src/VirtualClient/TestResources/unix/os-release/debian_13 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_13 rename to src/VirtualClient/TestResources/unix/os-release/debian_13 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_7 b/src/VirtualClient/TestResources/unix/os-release/debian_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_7 rename to src/VirtualClient/TestResources/unix/os-release/debian_7 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_8 b/src/VirtualClient/TestResources/unix/os-release/debian_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_8 rename to src/VirtualClient/TestResources/unix/os-release/debian_8 diff --git a/src/VirtualClient/TestResources/Unix/os-release/debian_9 b/src/VirtualClient/TestResources/unix/os-release/debian_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/debian_9 rename to src/VirtualClient/TestResources/unix/os-release/debian_9 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_28 b/src/VirtualClient/TestResources/unix/os-release/fedora_28 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_28 rename to src/VirtualClient/TestResources/unix/os-release/fedora_28 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_29 b/src/VirtualClient/TestResources/unix/os-release/fedora_29 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_29 rename to src/VirtualClient/TestResources/unix/os-release/fedora_29 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_30 b/src/VirtualClient/TestResources/unix/os-release/fedora_30 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_30 rename to src/VirtualClient/TestResources/unix/os-release/fedora_30 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_31 b/src/VirtualClient/TestResources/unix/os-release/fedora_31 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_31 rename to src/VirtualClient/TestResources/unix/os-release/fedora_31 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_32 b/src/VirtualClient/TestResources/unix/os-release/fedora_32 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_32 rename to src/VirtualClient/TestResources/unix/os-release/fedora_32 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_33 b/src/VirtualClient/TestResources/unix/os-release/fedora_33 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_33 rename to src/VirtualClient/TestResources/unix/os-release/fedora_33 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_34 b/src/VirtualClient/TestResources/unix/os-release/fedora_34 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_34 rename to src/VirtualClient/TestResources/unix/os-release/fedora_34 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_35 b/src/VirtualClient/TestResources/unix/os-release/fedora_35 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_35 rename to src/VirtualClient/TestResources/unix/os-release/fedora_35 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_36 b/src/VirtualClient/TestResources/unix/os-release/fedora_36 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_36 rename to src/VirtualClient/TestResources/unix/os-release/fedora_36 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_37 b/src/VirtualClient/TestResources/unix/os-release/fedora_37 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_37 rename to src/VirtualClient/TestResources/unix/os-release/fedora_37 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_38 b/src/VirtualClient/TestResources/unix/os-release/fedora_38 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_38 rename to src/VirtualClient/TestResources/unix/os-release/fedora_38 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_39 b/src/VirtualClient/TestResources/unix/os-release/fedora_39 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_39 rename to src/VirtualClient/TestResources/unix/os-release/fedora_39 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_40 b/src/VirtualClient/TestResources/unix/os-release/fedora_40 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_40 rename to src/VirtualClient/TestResources/unix/os-release/fedora_40 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_41 b/src/VirtualClient/TestResources/unix/os-release/fedora_41 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_41 rename to src/VirtualClient/TestResources/unix/os-release/fedora_41 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_42 b/src/VirtualClient/TestResources/unix/os-release/fedora_42 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_42 rename to src/VirtualClient/TestResources/unix/os-release/fedora_42 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_43 b/src/VirtualClient/TestResources/unix/os-release/fedora_43 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_43 rename to src/VirtualClient/TestResources/unix/os-release/fedora_43 diff --git a/src/VirtualClient/TestResources/Unix/os-release/fedora_44 b/src/VirtualClient/TestResources/unix/os-release/fedora_44 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/fedora_44 rename to src/VirtualClient/TestResources/unix/os-release/fedora_44 diff --git a/src/VirtualClient/TestResources/Unix/os-release/flatcar b/src/VirtualClient/TestResources/unix/os-release/flatcar similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/flatcar rename to src/VirtualClient/TestResources/unix/os-release/flatcar diff --git a/src/VirtualClient/TestResources/Unix/os-release/gentoo_214 b/src/VirtualClient/TestResources/unix/os-release/gentoo_214 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/gentoo_214 rename to src/VirtualClient/TestResources/unix/os-release/gentoo_214 diff --git a/src/VirtualClient/TestResources/Unix/os-release/gentoo_218 b/src/VirtualClient/TestResources/unix/os-release/gentoo_218 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/gentoo_218 rename to src/VirtualClient/TestResources/unix/os-release/gentoo_218 diff --git a/src/VirtualClient/TestResources/Unix/os-release/opensuse_13 b/src/VirtualClient/TestResources/unix/os-release/opensuse_13 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/opensuse_13 rename to src/VirtualClient/TestResources/unix/os-release/opensuse_13 diff --git a/src/VirtualClient/TestResources/Unix/os-release/opensuseleap_15 b/src/VirtualClient/TestResources/unix/os-release/opensuseleap_15 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/opensuseleap_15 rename to src/VirtualClient/TestResources/unix/os-release/opensuseleap_15 diff --git a/src/VirtualClient/TestResources/Unix/os-release/opensuseleap_16 b/src/VirtualClient/TestResources/unix/os-release/opensuseleap_16 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/opensuseleap_16 rename to src/VirtualClient/TestResources/unix/os-release/opensuseleap_16 diff --git a/src/VirtualClient/TestResources/Unix/os-release/opensuseleap_42_3 b/src/VirtualClient/TestResources/unix/os-release/opensuseleap_42_3 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/opensuseleap_42_3 rename to src/VirtualClient/TestResources/unix/os-release/opensuseleap_42_3 diff --git a/src/VirtualClient/TestResources/Unix/os-release/redhat_10 b/src/VirtualClient/TestResources/unix/os-release/redhat_10 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/redhat_10 rename to src/VirtualClient/TestResources/unix/os-release/redhat_10 diff --git a/src/VirtualClient/TestResources/Unix/os-release/redhat_7 b/src/VirtualClient/TestResources/unix/os-release/redhat_7 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/redhat_7 rename to src/VirtualClient/TestResources/unix/os-release/redhat_7 diff --git a/src/VirtualClient/TestResources/Unix/os-release/redhat_8 b/src/VirtualClient/TestResources/unix/os-release/redhat_8 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/redhat_8 rename to src/VirtualClient/TestResources/unix/os-release/redhat_8 diff --git a/src/VirtualClient/TestResources/Unix/os-release/redhat_9 b/src/VirtualClient/TestResources/unix/os-release/redhat_9 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/redhat_9 rename to src/VirtualClient/TestResources/unix/os-release/redhat_9 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_1404 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_1404 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_1404 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_1404 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_1604 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_1604 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_1604 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_1604 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_1804 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_1804 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_1804 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_1804 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2004 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2004 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2004 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2004 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2204 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2204 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2204 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2204 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2404 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2404 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2404 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2404 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2504 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2504 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2504 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2504 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2510 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2510 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2510 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2510 diff --git a/src/VirtualClient/TestResources/Unix/os-release/ubuntu_2604 b/src/VirtualClient/TestResources/unix/os-release/ubuntu_2604 similarity index 100% rename from src/VirtualClient/TestResources/Unix/os-release/ubuntu_2604 rename to src/VirtualClient/TestResources/unix/os-release/ubuntu_2604 diff --git a/src/VirtualClient/TestResources/Windows/CIM/CIM_PhysicalMemory_Properties_Ampere_VM.txt b/src/VirtualClient/TestResources/windows/cim/CIM_PhysicalMemory_Properties_Ampere_VM.txt similarity index 100% rename from src/VirtualClient/TestResources/Windows/CIM/CIM_PhysicalMemory_Properties_Ampere_VM.txt rename to src/VirtualClient/TestResources/windows/cim/CIM_PhysicalMemory_Properties_Ampere_VM.txt diff --git a/src/VirtualClient/TestResources/Windows/CIM/CIM_PhysicalMemory_Properties_Physical_System.txt b/src/VirtualClient/TestResources/windows/cim/CIM_PhysicalMemory_Properties_Physical_System.txt similarity index 100% rename from src/VirtualClient/TestResources/Windows/CIM/CIM_PhysicalMemory_Properties_Physical_System.txt rename to src/VirtualClient/TestResources/windows/cim/CIM_PhysicalMemory_Properties_Physical_System.txt diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs index 0f8e02c489..35e22bc5bf 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs @@ -23,7 +23,7 @@ public class CompressionProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -34,7 +34,7 @@ public void SetupFixture() public void CompressionWorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platformID, Architecture architecture) { this.mockFixture.Setup(platformID, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -63,21 +63,21 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl if (arguments.Contains("7z", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Compressor7zipResults.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Compressor7zipResults.txt")); } else if (arguments.Contains("gzip", StringComparison.OrdinalIgnoreCase)) { - process.StandardError.Append(TestDependencies.GetResourceFileContents("GzipResults.txt")); + process.StandardError.Append(MockFixture.ReadTestResourcesFile("GzipResults.txt")); } else if (arguments.Contains("pbzip2", StringComparison.OrdinalIgnoreCase)) { - process.StandardError.Append(TestDependencies.GetResourceFileContents("Pbzip2Results.txt")); + process.StandardError.Append(MockFixture.ReadTestResourcesFile("Pbzip2Results.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -92,7 +92,7 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl public void CompressionWorkloadProfileParametersAreInlinedCorrectly_LZbench(string profile, PlatformID platformID, Architecture architecture) { this.mockFixture.Setup(platformID, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -117,13 +117,13 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl if (arguments.Contains("lzbenchexecutor.sh", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("LzbenchResults.csv")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("LzbenchResults.csv")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs index 36a6230127..7479404729 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class CoreMarkProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -31,7 +32,7 @@ public void SetupFixture() public void CoreMarkWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -42,7 +43,7 @@ public void CoreMarkWorkloadProfileParametersAreInlinedCorrectly(string profile) public void CoreMarkProWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -73,13 +74,13 @@ public async Task CoreMarkWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("XCFLAGS", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Coremark.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Coremark.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -108,13 +109,13 @@ public async Task CoreMarkWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPl IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("XCFLAGS", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Coremark.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Coremark.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -147,13 +148,13 @@ public async Task CoreMarkProWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("certify-all", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_CoremarkPro.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_CoremarkPro.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -187,13 +188,13 @@ public async Task CoreMarkProWorkloadProfileExecutesTheExpectedWorkloadsOnWindow IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("certify-all", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_CoremarkPro.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_CoremarkPro.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs index 3378049cdc..0d254210ba 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs @@ -13,6 +13,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -29,7 +30,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.Setup(PlatformID.Unix, Architecture.X64, this.clientAgentId).SetupLayout( new ClientInstance(this.clientAgentId, "1.2.3.4", "Client"), @@ -48,7 +49,7 @@ public async Task DeathStarBenchWorkloadProfileInstallsTheExpectedDependenciesOf { this.mockFixture.SystemManagement.SetupGet(sm => sm.AgentId).Returns(this.serverAgentId); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteActions = false; @@ -94,7 +95,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl }; this.mockFixture.SetupPackage("deathstarbench", expectedFiles: expectedFiles); - this.mockFixture.SetupFile("deathstarbench/linux-x64/socialnetwork/wrk2", "results.txt", TestDependencies.GetResourceFileContents("Results_DeathStarBench.txt")); + this.mockFixture.SetupFile("deathstarbench/linux-x64/socialnetwork/wrk2", "results.txt", MockFixture.ReadTestResourcesFile("Results_DeathStarBench.txt")); this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose"); this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) => @@ -108,7 +109,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl if (arguments.Contains("./wrk -D exp -t 20 -c 1000 -d 300s -L -s", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_DeathStarBench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_DeathStarBench.txt")); } if (arguments == "bash -c \"docker ps | wc -l\"") @@ -119,7 +120,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); @@ -133,7 +134,7 @@ await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheClientWorkloadPackageDoesNotExist(string profile) { this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchProfileTests.cs index 8b89786458..101e8a4a71 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchProfileTests.cs @@ -4,14 +4,12 @@ namespace VirtualClient.Actions { using System; - using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; - using System.Text; using System.Threading; - using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -30,14 +28,14 @@ public void SetupFixture() this.mockFixture.SetupDisks(withRemoteDisks: false); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] [TestCase("PERF-NETWORK-DEATHSTARBENCH.json")] public void DeathStarBenchWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -50,7 +48,7 @@ public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPa // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs index 6dfacca21b..3c212d918f 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -28,7 +29,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); DeathStarBenchExecutor.StateConfirmationPollingTimeout = TimeSpan.FromMilliseconds(1); DeathStarBenchExecutor.ServerWarmUpTime = TimeSpan.FromMilliseconds(1); @@ -46,7 +47,7 @@ public async Task DeathStarBenchWorkloadProfileInstallsTheExpectedDependenciesOf this.mockFixture.SetupPackage("libssl"); this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose"); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteActions = false; @@ -103,7 +104,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfSe return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.mockFixture, expectedCommands.ToArray()); @@ -122,7 +123,7 @@ public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheClientWork this.mockFixture.SetupPackage("libssl"); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); Assert.AreEqual(ErrorReason.WorkloadDependencyMissing, error.Reason); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DiskSpdProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DiskSpdProfileTests.cs index 8ed6b43992..b0f17b8367 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DiskSpdProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/DiskSpdProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class DiskSpdProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +31,7 @@ public void SetupFixture() public void DiskSpdWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Win32NT); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -45,7 +46,7 @@ public async Task DiskSpdWorkloadProfileInstallsTheExpectedDependenciesOnWindows this.mockFixture.Setup(PlatformID.Win32NT); this.mockFixture.SetupDisks(withUnformatted: true); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -81,13 +82,13 @@ public async Task DiskSpdWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPla IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("diskspd", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_DiskSpd.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_DiskSpd.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -107,7 +108,7 @@ public void DiskSpdWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackageDo // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ExampleWorkloadWithAffinityProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ExampleWorkloadWithAffinityProfileTests.cs index 9a7e37a814..fa4b17f522 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ExampleWorkloadWithAffinityProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ExampleWorkloadWithAffinityProfileTests.cs @@ -4,14 +4,13 @@ namespace VirtualClient.Actions { using System; - using System.Collections.Generic; - using System.Linq; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +22,7 @@ public class ExampleWorkloadWithAffinityProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +31,7 @@ public void SetupFixture() public void ExampleWorkloadProfileParametersAreInlinedCorrectly_Linux(string profile, PlatformID platform, Architecture architecture) { this.mockFixture.Setup(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -45,7 +44,7 @@ public void ExampleWorkloadProfileParametersAreInlinedCorrectly_Linux(string pro public void ExampleWorkloadProfileParametersAreInlinedCorrectly_Windows(string profile, PlatformID platform, Architecture architecture) { this.mockFixture.Setup(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -57,7 +56,7 @@ public async Task ExampleWorkloadProfileInstallsTheExpectedDependenciesOnLinuxPl { this.mockFixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -73,7 +72,7 @@ public async Task ExampleWorkloadProfileInstallsTheExpectedDependenciesOnWindows { this.mockFixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -101,7 +100,7 @@ public async Task ExampleWorkloadProfileExecutesTheExpectedWorkloadWithAffinityO return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -148,7 +147,7 @@ public async Task ExampleWorkloadProfileExecutesTheExpectedWorkloadWithAffinityO return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -166,7 +165,7 @@ public void ExampleWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackageDo // Ensure the workload package does not exist this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs index 80ee101854..345f06068c 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs @@ -22,7 +22,7 @@ public class FioProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +30,7 @@ public void SetupFixture() public void FioWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Win32NT); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -45,7 +45,7 @@ public async Task FioWorkloadProfileInstallsTheExpectedDependenciesOnWindowsPlat this.mockFixture.Setup(PlatformID.Win32NT); this.mockFixture.SetupDisks(withUnformatted: true); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -68,7 +68,7 @@ public async Task FioWorkloadProfileInstallsTheExpectedDependenciesOnUnixPlatfor this.mockFixture.Setup(PlatformID.Unix); this.mockFixture.SetupDisks(withUnformatted: true); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -103,13 +103,13 @@ public async Task FioWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPlatfor IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("--name=fio", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_FIO.json")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("fio", "Results_FIO.json")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -137,13 +137,13 @@ public async Task FioWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatform(s IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("--name=fio", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_FIO.json")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("fio", "Results_FIO.json")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/GetAccessTokenProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/GetAccessTokenProfileTests.cs index bb34d4c483..7f5a0ed095 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/GetAccessTokenProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/GetAccessTokenProfileTests.cs @@ -6,12 +6,9 @@ namespace VirtualClient.Actions using System; using System.Collections.Generic; using System.Linq; - using System.Threading; - using System.Threading.Tasks; - using Moq; using NUnit.Framework; - using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +20,7 @@ public class GetAccessTokenProfileTests public void SetupFixture() { this.dependencyFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +29,7 @@ public void SetupFixture() public void GetAccessTokenProfileParametersAreInlinedCorrectly(string profile, PlatformID platform) { this.dependencyFixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.dependencyFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.dependencyFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -46,7 +43,7 @@ public void GetAccessTokenProfileParametersAreAvailable(string profile, Platform this.dependencyFixture.Setup(platform); var mandatoryParameters = new List { "TenantId" }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.dependencyFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.dependencyFixture.Dependencies)) { Assert.IsEmpty(executor.Profile.Actions); Assert.AreEqual(1, executor.Profile.Dependencies.Count); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Graph500ProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Graph500ProfileTests.cs index 8c4894e298..5d62fb5351 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Graph500ProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Graph500ProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class Graph500ProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +31,7 @@ public void SetupFixture() public void Graph500WorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -42,7 +43,7 @@ public async Task Graph500WorkloadProfileInstallsTheExpectedDependenciesOnUnixPl { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -69,13 +70,13 @@ public async Task Graph500WorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (command.Contains("graph500_reference_bfs_sssp", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Graph500.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Graph500.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HPLinpackProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HPLinpackProfileTests.cs index c0ae2ec46b..f51512758a 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HPLinpackProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HPLinpackProfileTests.cs @@ -15,6 +15,7 @@ namespace VirtualClient.Actions using VirtualClient.Common; using VirtualClient.Common.Telemetry; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -26,7 +27,7 @@ public class HPLinpackProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -34,7 +35,7 @@ public void SetupFixture() public void HPLinpackWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -54,7 +55,7 @@ public async Task HPLinpackWorkloadProfileInstallsTheExpectedDependenciesOnUnixP return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -94,7 +95,7 @@ public async Task HPLinpackWorkloadProfileWithOutPerformanceLibrariesExecutesExp IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("mpirun", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HPL.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HPL.txt")); } if (arguments == "--version") @@ -117,7 +118,7 @@ public async Task HPLinpackWorkloadProfileWithOutPerformanceLibrariesExecutesExp return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -161,7 +162,7 @@ public async Task HPLinpackWorkloadProfileExecutesThxeExpectedWorkloadsOnUnixArm IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("mpirun", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HPL.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HPL.txt")); } if (arguments == "--version") @@ -184,7 +185,7 @@ public async Task HPLinpackWorkloadProfileExecutesThxeExpectedWorkloadsOnUnixArm return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs index 8cc4719335..e8aebf6559 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs @@ -16,6 +16,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -34,7 +35,7 @@ public void HammerDBWorkloadProfileParametersAreInlinedCorrectly(string profile, { this.SetupMockFixture(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -47,7 +48,7 @@ public void HammerDBWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackageD this.SetupMockFixture(platform, architecture); this.fixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -81,13 +82,13 @@ public async Task HammerDBWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HammerDB.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HammerDB.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -120,13 +121,13 @@ public async Task HammerDBWorkloadProfileExecutesTheExpectedWorkloadsOnSingleVMU IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HammerDB.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HammerDB.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -162,13 +163,13 @@ public async Task HammerDBWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPl IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HammerDB.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HammerDB.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -201,13 +202,13 @@ public async Task HammerDBWorkloadProfileExecutesTheExpectedWorkloadsOnSingleVMW IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_HammerDB.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_HammerDB.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -301,7 +302,7 @@ private void SetupMockFixture(PlatformID platform, Architecture architecture) this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } private void SetupApiClient(string serverName, string serverIPAddress) diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HpcgProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HpcgProfileTests.cs index 0884f304fd..b33f0e3cf4 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HpcgProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/HpcgProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class HpcgProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -31,7 +32,7 @@ public void SetupFixture() public void HpcgWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -53,13 +54,13 @@ public async Task HpcgWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatform( IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("runhpcg.sh", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Hpcg.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Hpcg.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; executor.ExecutionMinimumInterval = TimeSpan.Zero; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/LAPACKProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/LAPACKProfileTests.cs index 6aee5572bb..1258acb6ff 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/LAPACKProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/LAPACKProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class LAPACKProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +31,7 @@ public void SetupFixture() public void LAPACKWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -44,7 +45,7 @@ public async Task LAPACKWorkloadProfileInstallsTheExpectedDependenciesOnWindowsP string cygwinPath = this.mockFixture.PlatformSpecifics.Combine("C:", "tools", "cygwin"); this.mockFixture.SetupFile(cygwinPath); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -69,7 +70,7 @@ public async Task LAPACKWorkloadProfileInstallsTheExpectedDependenciesOnUnixPlat return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -104,14 +105,14 @@ public async Task LAPACKWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPlat IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("LapackTestScript.sh", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_LAPACK.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_LAPACK.txt")); this.mockFixture.SetupPackage("lapack", expectedFiles: @"win-x64\TESTING\testing_results.txt"); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -142,7 +143,7 @@ public async Task LAPACKWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfor IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("LapackTestScript.sh", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_LAPACK.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_LAPACK.txt")); this.mockFixture.SetupPackage("lapack", expectedFiles: @"linux-x64/TESTING/testing_results.txt"); } else if (arguments.Contains("--version", StringComparison.OrdinalIgnoreCase)) @@ -154,7 +155,7 @@ public async Task LAPACKWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfor return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedClientProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedClientProfileTests.cs index 19378129c2..99a53ab39e 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedClientProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedClientProfileTests.cs @@ -14,6 +14,7 @@ namespace VirtualClient.Actions using VirtualClient.Actions.Memtier; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -30,7 +31,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.Setup(PlatformID.Unix, Architecture.X64, this.clientAgentId).SetupLayout( new ClientInstance(this.clientAgentId, "1.2.3.4", "Client"), @@ -46,7 +47,7 @@ public void MemcachedMemtierWorkloadProfileActionsWillNotBeExecutedIfTheClientWo // We ensure the Client workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -87,13 +88,13 @@ public async Task MemcachedMemtierWorkloadProfileExecutesTheWorkloadAsExpectedOf if (arguments?.Contains("memtier_benchmark", StringComparison.OrdinalIgnoreCase) == true) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_MemcachedMemtier.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_MemcachedMemtier.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedProfileTests.cs index 5e1433ecc2..d61eb265d3 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedProfileTests.cs @@ -4,14 +4,12 @@ namespace VirtualClient.Actions { using System; - using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; - using System.Text; using System.Threading; - using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -28,14 +26,14 @@ public void SetupFixture() new ClientInstance("ClientAgent", "1.2.3.4", "Client"), new ClientInstance("ServerAgent", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] [TestCase("PERF-MEMCACHED.json")] public void MemcachedMemtierWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -48,7 +46,7 @@ public void MemcachedMemtierWorkloadProfileActionsWillNotBeExecutedIfTheDependen // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedServerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedServerProfileTests.cs index 24f17b5202..86d13fcda0 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedServerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Memcached/MemcachedServerProfileTests.cs @@ -10,12 +10,11 @@ namespace VirtualClient.Actions using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; - using Moq; using NUnit.Framework; using VirtualClient.Actions.Memtier; using VirtualClient.Common; using VirtualClient.Contracts; - using static VirtualClient.Actions.MemcachedExecutor; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -33,7 +32,7 @@ public void SetupFixture() new ClientInstance("Client01", "1.2.3.4", "Client"), new ClientInstance("Server01", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.SetupPackage("wget", expectedFiles: "linux-x64/wget2"); this.mockFixture.SetupFile("memcached", "memcached-1.6.17/memcached", new byte[0]); @@ -43,7 +42,7 @@ public void SetupFixture() [TestCase("PERF-MEMCACHED.json")] public async Task MemcachedMemtierWorkloadProfileInstallsTheExpectedDependenciesOfServerOnUnixPlatform(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) => { @@ -95,7 +94,7 @@ public async Task MemcachedMemtierWorkloadProfileExecutesTheWorkloadAsExpectedOf return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.mockFixture, expectedCommands.ToArray()); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/MemoryLatencyCheckerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/MemoryLatencyCheckerProfileTests.cs index 07cb346966..8a7e70e8d7 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/MemoryLatencyCheckerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/MemoryLatencyCheckerProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using global::VirtualClient.Common; using global::VirtualClient.Contracts; using NUnit.Framework; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class MemoryLatencyCheckerProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +33,7 @@ public void SetupFixture() public void MemoryLatencyCheckerWorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platform) { this.mockFixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -55,12 +56,12 @@ public async Task MemoryLatencyCheckerWorkloadProfileExecutesTheExpectedWorkload this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) => { IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("MemoryLatencyChecker", "memory_latency_checker_results_1.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("MemoryLatencyChecker", "memory_latency_checker_results_1.txt")); return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NASParallelBenchProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NASParallelBenchProfileTests.cs index 695f1a7f03..8fa36a96ff 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NASParallelBenchProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NASParallelBenchProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class NASParallelBenchProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -33,7 +34,7 @@ public void NASParallelWorkloadProfileParametersAreInlinedCorrectly(string profi { this.SetupDefaultMockBehavior(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -46,7 +47,7 @@ public async Task NASParallelWorkloadProfileInstallsTheExpectedDependenciesOnUni { this.SetupDefaultMockBehavior(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.WorkloadPackageInstalled(this.mockFixture, "nasparallelbench"); @@ -69,7 +70,7 @@ public async Task NASParallelWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -95,7 +96,7 @@ public void NASParallelWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPacka this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadClientProfileTests2.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadClientProfileTests2.cs index 6ee932740f..c8d878ef0b 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadClientProfileTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadClientProfileTests2.cs @@ -17,6 +17,7 @@ namespace VirtualClient.Actions using VirtualClient.Common; using VirtualClient.Common.Contracts; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; using static VirtualClient.Actions.CPSExecutor2; using static VirtualClient.Actions.LatteExecutor2; using static VirtualClient.Actions.NTttcpExecutor2; @@ -39,7 +40,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -106,7 +107,7 @@ public async Task NetworkingWorkloadProfileExecutesTheExpectedWorkloadsOnClient( } }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -121,22 +122,22 @@ private void SetupCreateProcess() IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (command.Contains("NTttcp.exe", StringComparison.OrdinalIgnoreCase) || command.Contains("NTttcp", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("ntttcp-results.xml")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("ntttcp-results.xml")); } if (command.Contains("cps.exe", StringComparison.OrdinalIgnoreCase) || command.Contains("cps", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("cps-results.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("cps-results.txt")); } if (command.Contains("latte.exe", StringComparison.OrdinalIgnoreCase) || command.Contains("latte", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("latte-results.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("latte-results.txt")); } if (command.Contains("sockperf.exe", StringComparison.OrdinalIgnoreCase) || command.Contains("sockperf", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("sockperf-results.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("sockperf-results.txt")); } return process; @@ -166,10 +167,10 @@ private void SetupFixtureBasedOnPlatformAndArchitecture(PlatformID platformID, A private void SetupResultsFiles(string platformArch) { string packagePath = this.mockFixture.PlatformSpecifics.Combine(this.mockFixture.PackagesDirectory, "networking"); - byte[] ntttcpContent = Encoding.ASCII.GetBytes(TestDependencies.GetResourceFileContents("ntttcp-results.xml")); - byte[] cpsContent = Encoding.ASCII.GetBytes(TestDependencies.GetResourceFileContents("cps-results.txt")); - byte[] latteContent = Encoding.ASCII.GetBytes(TestDependencies.GetResourceFileContents("latte-results.txt")); - byte[] sockPerfContent = Encoding.ASCII.GetBytes(TestDependencies.GetResourceFileContents("sockperf-results.txt")); + byte[] ntttcpContent = Encoding.ASCII.GetBytes(MockFixture.ReadTestResourcesFile("ntttcp-results.xml")); + byte[] cpsContent = Encoding.ASCII.GetBytes(MockFixture.ReadTestResourcesFile("cps-results.txt")); + byte[] latteContent = Encoding.ASCII.GetBytes(MockFixture.ReadTestResourcesFile("latte-results.txt")); + byte[] sockPerfContent = Encoding.ASCII.GetBytes(MockFixture.ReadTestResourcesFile("sockperf-results.txt")); this.mockFixture.SetupFile(this.mockFixture.PlatformSpecifics.Combine(packagePath, $"{platformArch}/NTttcp_TCP_4K_Buffer_T1/ntttcp-results.xml"), ntttcpContent); this.mockFixture.SetupFile(this.mockFixture.PlatformSpecifics.Combine(packagePath, $"{platformArch}/NTttcp_TCP_64K_Buffer_T1/ntttcp-results.xml"), ntttcpContent); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadProfileTests2.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadProfileTests2.cs index b9cef7b187..c3d7d8f94d 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadProfileTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Network2/NetworkingWorkloadProfileTests2.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Ignore("There are some intermittent issue preventing the FunctionTests to return on GitHub Actions.")] @@ -33,7 +34,7 @@ public void SetupFixtureBasedOnPlatformAndArchitecture(PlatformID platformID, Ar this.mockFixture.SetupDisks(withRemoteDisks: false); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.SetupPackage("visualstudiocruntime"); @@ -53,7 +54,7 @@ public void NetworkingWorkloadProfileParametersAreInlinedCorrectly(string profil { this.SetupFixtureBasedOnPlatformAndArchitecture(platformID, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -70,7 +71,7 @@ public void NetworkingWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackag this.SetupFixtureBasedOnPlatformAndArchitecture(platformID, architecture); this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -91,7 +92,7 @@ public async Task NetworkingWorkloadProfileInstallsTheExpectedDependencies(strin this.SetupFixtureBasedOnPlatformAndArchitecture(platformID, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NginxWrkProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NginxWrkProfileTests.cs index e5ba4b5076..5f57256480 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NginxWrkProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/NginxWrkProfileTests.cs @@ -5,13 +5,9 @@ namespace VirtualClient.Actions { using System; using System.Collections.Generic; - using System.Linq; - using System.Net; - using System.Threading; - using System.Threading.Tasks; using NUnit.Framework; - using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -27,7 +23,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [SetUp] @@ -45,7 +41,7 @@ public void NginxWrkProfileParametersAreInlinedCorrectly(string profile) new ClientInstance(this.clientAgentId, "1.2.3.5", ClientRole.Client), new ClientInstance(this.serverAgentId, "1.2.3.4", ClientRole.Server)); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -66,7 +62,7 @@ public void NginxWrkProfileParametersAreAvailable(string profile) var clientPrams = new List { "PackageName", "Role", "Timeout", "TestDuration", "FileSizeInKB", "Connection", "ThreadCount", "CommandArguments", "MetricScenario", "Scenario" }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { foreach (var actionBlock in executor.Profile.Actions) { diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenFOAMProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenFOAMProfileTests.cs index 47f64d3edd..4d87419e56 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenFOAMProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenFOAMProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class OpenFOAMProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +33,7 @@ public void SetupFixture() public void OpenFOAMWorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platform, Architecture architecture) { this.SetupDefaultMockBehavior(platform, architecture); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -54,13 +55,13 @@ public async Task OpenFOAMWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.EndsWith("Allrun\"", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("OpenFoamResults.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("OpenFoamResults.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -77,7 +78,7 @@ public void OpenFOAMWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackageD // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -147,7 +148,7 @@ private void SetupDefaultMockBehavior(PlatformID platform = PlatformID.Unix, Arc this.mockFixture.SetupPackage("openfoam", expectedFiles: expectedFiles.ToArray()); - string resultsFileContent = TestDependencies.GetResourceFileContents("OpenFoamResults.txt"); + string resultsFileContent = MockFixture.ReadTestResourcesFile("OpenFoamResults.txt"); this.mockFixture.SetupFile("openfoam", $"{platformArch}/airFoil2D/log.simpleFoam", resultsFileContent); this.mockFixture.SetupFile("openfoam", $"{platformArch}/elbow/log.icoFoam", resultsFileContent); this.mockFixture.SetupFile("openfoam", $"{platformArch}/lockExchange/log.twoLiquidMixingFoam", resultsFileContent); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslClientProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslClientProfileTests.cs index e9b0ec518d..da1f095e70 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslClientProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslClientProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -29,7 +30,7 @@ public void SetupFixture() new ClientInstance("Client01", "1.2.3.4", "Client"), new ClientInstance("Server01", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -60,7 +61,7 @@ public async Task TlsOpenSslClientCreatesExpectedStateAndExecutesWorkload(string return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None); WorkloadAssert.WorkloadPackageInstalled(this.mockFixture, "openssl"); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslServerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslServerProfileTests.cs index 32d1e70455..bf4560ab34 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslServerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSSL/TlsOpenSslServerProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -28,7 +29,7 @@ public void SetupFixture() new ClientInstance("Client01", "1.2.3.4", "Client"), new ClientInstance("Server01", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -44,7 +45,7 @@ public async Task TlsOpenSslServerWorkloadProfileInstallsTheExpectedDependencies await apiClient.CreateStateAsync(nameof(State), state, CancellationToken.None); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -61,7 +62,7 @@ public void TlsOpenSslServerWorkloadProfileActionsWillNotBeExecutedIfTheWorkload // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSslProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSslProfileTests.cs index 6007745cfc..502226e227 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSslProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/OpenSslProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class OpenSslProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +31,7 @@ public void SetupFixture() public void OpenSslWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Win32NT); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -43,7 +44,7 @@ public async Task OpenSslWorkloadProfileInstallsTheExpectedDependenciesOnWindows this.mockFixture.Setup(PlatformID.Win32NT); this.mockFixture.SetupDisks(withRemoteDisks: false); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -60,7 +61,7 @@ public async Task OpenSslWorkloadProfileInstallsTheExpectedDependenciesOnUnixPla this.mockFixture.Setup(PlatformID.Unix); this.mockFixture.SetupDisks(withRemoteDisks: false); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -89,13 +90,13 @@ public async Task OpenSslWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPla IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("openssl", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results-OpenSSL-Speed.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results-OpenSSL-Speed.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -122,13 +123,13 @@ public async Task OpenSslWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfo IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("openssl", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results-OpenSSL-Speed.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results-OpenSSL-Speed.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -148,7 +149,7 @@ public void OpenSslWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPackageDo // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Prime95ProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Prime95ProfileTests.cs index bce2b07514..7c3cf53672 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Prime95ProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Prime95ProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class Prime95ProfileTests public void SetupFixture() { this.fixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -31,7 +32,7 @@ public void SetupFixture() public void Prime95WorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platform) { this.fixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -53,12 +54,12 @@ public async Task Prime95WorkloadProfileExecutesTheExpectedWorkloads(string prof this.fixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) => { IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Prime95.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Prime95.txt")); return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); @@ -97,12 +98,12 @@ private void SetupDefaultMockBehaviors(PlatformID platform) if (platform == PlatformID.Win32NT) { this.fixture.SetupPackage("prime95", expectedFiles: @"win-x64/prime95.exe"); - this.fixture.SetupFile("prime95", @"win-x64\results.txt", TestDependencies.GetResourceFileContents("Results_Prime95.txt")); + this.fixture.SetupFile("prime95", @"win-x64\results.txt", MockFixture.ReadTestResourcesFile("Results_Prime95.txt")); } else { this.fixture.SetupPackage("prime95", expectedFiles: @"linux-x64/mprime"); - this.fixture.SetupFile("prime95", @"linux-x64/results.txt", TestDependencies.GetResourceFileContents("Results_Prime95.txt")); + this.fixture.SetupFile("prime95", @"linux-x64/results.txt", MockFixture.ReadTestResourcesFile("Results_Prime95.txt")); } } } diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ProfileTests.cs index 5bbc8c1c19..ceef931fbb 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/ProfileTests.cs @@ -9,6 +9,7 @@ namespace VirtualClient.Actions using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -20,7 +21,7 @@ public class ProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -29,7 +30,7 @@ public async Task ParametersAndMetadataArePassedToTheVirtualClientComponentOnExe { this.SetupDefaultMockBehaviors(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { bool parametersSet = false; bool metadataSet = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisClientProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisClientProfileTests.cs index cf19903e31..dea119ed5a 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisClientProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisClientProfileTests.cs @@ -15,6 +15,7 @@ namespace VirtualClient.Actions using VirtualClient.Actions.Memtier; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -31,7 +32,7 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.Setup(PlatformID.Unix, Architecture.X64, this.clientAgentId).SetupLayout( new ClientInstance(this.clientAgentId, "1.2.3.4", "Client"), @@ -47,7 +48,7 @@ public void SetupFixture() public void RedisMemtierWorkloadProfileActionsWillNotBeExecutedIfTheClientWorkloadPackageDoesNotExist(string profile) { this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); @@ -63,11 +64,11 @@ public async Task RedisMemtierWorkloadProfileExecutesTheWorkloadAsExpectedOfClie .TrackProcesses() .SetupProcessOutput( "memtier_benchmark.*--server", - TestDependencies.GetResourceFileContents("Results_RedisMemtier.txt")); + MockFixture.ReadTestResourcesFile("Results_RedisMemtier.txt")); this.SetupApiClient(this.serverAgentId, serverIPAddress: "1.2.3.5"); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisProfileTests.cs index f7d034a418..f0068afd0a 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisProfileTests.cs @@ -4,14 +4,12 @@ namespace VirtualClient.Actions { using System; - using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; - using System.Text; using System.Threading; - using System.Threading.Tasks; using NUnit.Framework; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -28,14 +26,14 @@ public void SetupFixture() new ClientInstance("ClientAgent", "1.2.3.4", "Client"), new ClientInstance("ServerAgent", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] [TestCase("PERF-REDIS.json")] public void RedisMemtierWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -48,7 +46,7 @@ public void RedisMemtierWorkloadProfileActionsWillNotBeExecutedIfTheDependencyPa // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; DependencyException error = Assert.ThrowsAsync(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisServerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisServerProfileTests.cs index e535dd6ebe..83c73fea3f 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisServerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/Redis/RedisServerProfileTests.cs @@ -5,17 +5,15 @@ namespace VirtualClient.Actions { using System; using System.Collections.Generic; - using System.Linq; using System.Net; using System.Runtime.InteropServices; - using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using Moq; using NUnit.Framework; using VirtualClient.Actions.Memtier; - using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -33,7 +31,7 @@ public void SetupFixture() new ClientInstance("Client01", "1.2.3.4", "Client"), new ClientInstance("Server01", "1.2.3.5", "Server")); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); this.mockFixture.SetupPackage("wget", null, "linux-x64/wget2"); this.mockFixture.SetupFile("redis", "redis-6.2.1/src/redis-server", new byte[0]); @@ -51,7 +49,7 @@ public async Task RedisMemtierWorkloadProfileInstallsTheExpectedDependenciesOfSe "redis-server.*--version", "Redis server v=7.0.15 sha=00000000 malloc=jemalloc-5.1.0 bits=64 build=abc123"); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); @@ -91,7 +89,7 @@ public async Task RedisMemtierWorkloadProfileExecutesTheWorkloadAsExpectedOfServ await apiClient.CreateStateAsync(nameof(ServerState), state, CancellationToken.None); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecCpuProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecCpuProfileTests.cs index 35069a938b..2392aac56e 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecCpuProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecCpuProfileTests.cs @@ -10,6 +10,7 @@ namespace VirtualClient.Actions using global::VirtualClient; using global::VirtualClient.Contracts; using NUnit.Framework; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -21,7 +22,7 @@ public class SpecCpuProfileTests public void SetupTests() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +33,7 @@ public void SetupTests() public void SpecCpuWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -53,7 +54,7 @@ public async Task SpecCpuWorkloadProfileInstallsTheExpectedDependenciesOnLinuxPl { "cc", "10" } }); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJbbProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJbbProfileTests.cs index 847df15d18..fe8b71dc56 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJbbProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJbbProfileTests.cs @@ -14,6 +14,7 @@ namespace VirtualClient.Actions using Microsoft.Extensions.DependencyInjection.Extensions; using Moq; using NUnit.Framework; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -25,7 +26,7 @@ public class SpecJbbProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -33,7 +34,7 @@ public void SetupFixture() public void SpecJbbWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -50,7 +51,7 @@ public async Task SpecJbbWorkloadProfileInstallsTheExpectedDependenciesOnLinuxPl string expectedJavaExecutablePath = this.mockFixture.GetPackagePath("microsoft-jdk-17.0.3/linux-x64/bin/java"); this.mockFixture.SetupFile(expectedJavaExecutablePath); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -76,7 +77,7 @@ public async Task SpecJbbWorkloadProfileInstallsTheExpectedDependenciesOnWindows string expectedJavaExecutablePath = this.mockFixture.GetPackagePath(@"microsoft-jdk-17.0.3\win-x64\bin\java.exe"); this.mockFixture.SetupFile(expectedJavaExecutablePath); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -107,13 +108,13 @@ public async Task SpecJbbWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPla IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("-jar", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_SPECJbb.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_SPECJbb.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -138,13 +139,13 @@ public async Task SpecJbbWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfo IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("-jar", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_SPECJbb.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_SPECJbb.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJvmProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJvmProfileTests.cs index a9e9f9ee92..365baf5e98 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJvmProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJvmProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class SpecJvmProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -31,7 +32,7 @@ public void SetupFixture() public void SpecJvmWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -47,7 +48,7 @@ public async Task SpecJvmWorkloadProfileInstallsTheExpectedDependenciesOnLinuxPl string expectedJavaExecutablePath = this.mockFixture.GetPackagePath("microsoft-jdk-17.0.9/linux-x64/bin/java"); this.mockFixture.SetupFile(expectedJavaExecutablePath); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -71,7 +72,7 @@ public async Task SpecJvmWorkloadProfileInstallsTheExpectedDependenciesOnWindows string expectedJavaExecutablePath = this.mockFixture.GetPackagePath(@"microsoft-jdk-17.0.9\win-x64\bin\java.exe"); this.mockFixture.SetupFile(expectedJavaExecutablePath); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -114,13 +115,13 @@ public async Task SpecJvmWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPla IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("-jar", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_SPECjvm.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_SPECjvm.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecutionMinimumInterval = TimeSpan.Zero; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -158,13 +159,13 @@ public async Task SpecJvmWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfo IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("-jar", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_SPECjvm.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_SPECjvm.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecutionMinimumInterval = TimeSpan.Zero; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecPowerProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecPowerProfileTests.cs index c067f9b3cb..c94787a497 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecPowerProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecPowerProfileTests.cs @@ -7,6 +7,7 @@ namespace VirtualClient.Actions using global::VirtualClient; using global::VirtualClient.Contracts; using NUnit.Framework; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -18,7 +19,7 @@ public class SpecPowerProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -29,7 +30,7 @@ public void SetupFixture() public void SpecPowerWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StreamProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StreamProfileTests.cs index ccb8d91e46..ecbae1afd7 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StreamProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StreamProfileTests.cs @@ -14,6 +14,7 @@ namespace VirtualClient.Actions using VirtualClient; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -25,7 +26,7 @@ public class StreamProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -33,7 +34,7 @@ public void SetupFixture() public void StreamTriadWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -59,7 +60,7 @@ public async Task StreamTriadWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("Stream", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Stream.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Stream.txt")); } else if (arguments.Contains("lscpu | grep 'Flags'")) { @@ -69,7 +70,7 @@ public async Task StreamTriadWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -87,7 +88,7 @@ public async Task StreamTriadWorkloadProfileInstallsTheExpectedDependenciesOnUni // The setup in a typical Azure VM scenario this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -109,7 +110,7 @@ public void StreamTriadProfileActionsWillNotBeExecutedIfTheWorkloadPackageDoesNo // We ensure the workload package does not exist. this.mockFixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -123,7 +124,7 @@ public void StreamTriadProfileActionsWillNotBeExecutedIfTheWorkloadPackageDoesNo public void StreamMsftWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -149,7 +150,7 @@ public async Task StreamMsftWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPla IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("perfrunner", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_StreamMsft.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_StreamMsft.txt")); } else if (arguments.Contains("make", StringComparison.OrdinalIgnoreCase)) { @@ -159,7 +160,7 @@ public async Task StreamMsftWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPla return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -173,7 +174,7 @@ public async Task StreamMsftWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPla public void StreamWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -198,7 +199,7 @@ public async Task StreamWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfor IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("streamworkload", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Stream.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Stream.txt")); } else if (arguments.Contains("gcc", StringComparison.OrdinalIgnoreCase)) { @@ -208,7 +209,7 @@ public async Task StreamWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatfor return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -238,7 +239,7 @@ public void StreamProfileActionsWillNotBeExecutedIfTheWorkloadPackageDoesNotExis return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecuteDependencies = false; diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressAppTestProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressAppTestProfileTests.cs index 9ce7b1b729..dafac523a4 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressAppTestProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressAppTestProfileTests.cs @@ -11,6 +11,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -22,7 +23,7 @@ public class StressAppTestProfileTests public void SetupFixture() { this.fixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -30,7 +31,7 @@ public void SetupFixture() public void StressAppTestWorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platform) { this.fixture.Setup(platform); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -54,7 +55,7 @@ public async Task StressAppTestWorkloadProfileExecutesTheExpectedWorkloads(strin return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None) .ConfigureAwait(false); @@ -84,7 +85,7 @@ private void SetupDefaultMockBehaviors(PlatformID platform) if (platform == PlatformID.Unix) { this.fixture.SetupPackage("stressapptest", expectedFiles: @"linux-x64/stressapptest"); - this.fixture.SetupFile("stressapptest", @"linux-x64/stressapptestLogs_1.txt", TestDependencies.GetResourceFileContents("Results_StressAppTest.txt")); + this.fixture.SetupFile("stressapptest", @"linux-x64/stressapptestLogs_1.txt", MockFixture.ReadTestResourcesFile("Results_StressAppTest.txt")); } } } diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressNgProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressNgProfileTests.cs index fcf88e73ec..0174f95e84 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressNgProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/StressNgProfileTests.cs @@ -12,6 +12,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -23,7 +24,7 @@ public class StressNgProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -31,7 +32,7 @@ public void SetupFixture() public void StressNgWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -53,13 +54,13 @@ public async Task StressNgWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.StartsWith("stress-ng", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_StressNg.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_StressNg.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { executor.ExecutionMinimumInterval = TimeSpan.Zero; await executor.ExecuteAsync(ProfileTiming.Iterations(2), CancellationToken.None).ConfigureAwait(false); @@ -84,7 +85,7 @@ private void SetupDefaultMockBehaviors(PlatformID platform) this.mockFixture.SetupDisks(withRemoteDisks: false); this.mockFixture.SetupFile( $"{this.mockFixture.GetPackagePath("stressNg")}/vcStressNg.yaml", - System.Text.Encoding.UTF8.GetBytes(TestDependencies.GetResourceFileContents("Results_StressNg.txt"))); + System.Text.Encoding.UTF8.GetBytes(MockFixture.ReadTestResourcesFile("Results_StressNg.txt"))); ////this.mockFixture.SystemManagement.Setup(mgr => mgr.FileSystem.Directory.Exists(It.IsAny())).Returns(true); ////this.mockFixture.SystemManagement.Setup(mgr => mgr.FileSystem.File.Exists(It.Is(file => file.EndsWith("yaml")))).Returns(true); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SuperBenchmarkProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SuperBenchmarkProfileTests.cs index 1570da7441..66bfeddb89 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SuperBenchmarkProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SuperBenchmarkProfileTests.cs @@ -13,6 +13,7 @@ namespace VirtualClient.Actions using VirtualClient.Common; using VirtualClient.Contracts; using VirtualClient.Dependencies; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -24,7 +25,7 @@ public class SuperBenchmarkProfileTests public void SetupFixture() { this.mockFixture = new DependencyFixture(); - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] @@ -32,7 +33,7 @@ public void SetupFixture() public void SuperBenchmarkWorkloadProfileParametersAreInlinedCorrectly(string profile) { this.mockFixture.Setup(PlatformID.Unix); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -63,7 +64,7 @@ public async Task SuperBenchmarkWorkloadProfileExecutesTheExpectedDependenciesAn return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -96,13 +97,13 @@ await this.mockFixture.StateManager.SaveStateAsync(expectedStateId, JObject.Pars IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("sb", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_SuperBenchmark.jsonl")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_SuperBenchmark.jsonl")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SysbenchProfileTests.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SysbenchProfileTests.cs index 0ac0337224..9df69584ec 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SysbenchProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/SysbenchProfileTests.cs @@ -13,6 +13,7 @@ namespace VirtualClient.Actions using NUnit.Framework; using VirtualClient.Common; using VirtualClient.Contracts; + using VirtualClient.TestExtensions; [TestFixture] [Category("Functional")] @@ -32,14 +33,14 @@ public void SetupFixture() this.clientAgentId = $"{Environment.MachineName}-Client"; this.serverAgentId = $"{Environment.MachineName}-Server"; - ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory); + ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory); } [Test] [TestCase("PERF-MYSQL-SYSBENCH-OLTP.json")] public void MySQLSysbenchOLTPWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -52,7 +53,7 @@ public void MySQLSysbenchOLTPWorkloadProfileActionsWillNotBeExecutedIfTheWorkloa this.fixture.Setup(platform); this.fixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -83,13 +84,13 @@ public async Task MySQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorkloadsOn IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -124,13 +125,13 @@ public async Task MySQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorkloadsOn IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -147,7 +148,7 @@ public async Task MySQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorkloadsOn [TestCase("PERF-MYSQL-SYSBENCH-TPCC.json")] public void MySQLSysbenchTPCCWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -160,7 +161,7 @@ public void MySQLSysbenchTPCCWorkloadProfileActionsWillNotBeExecutedIfTheWorkloa this.fixture.Setup(platform); this.fixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -190,13 +191,13 @@ public async Task MySQLSysbenchTPCCWorkloadProfileExecutesTheExpectedWorkloadsOn IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -231,13 +232,13 @@ public async Task MySQLSysbenchTPCCWorkloadProfileExecutesTheExpectedWorkloadsOn IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -254,7 +255,7 @@ public async Task MySQLSysbenchTPCCWorkloadProfileExecutesTheExpectedWorkloadsOn [TestCase("PERF-POSTGRESQL-SYSBENCH-OLTP.json")] public void PostgreSQLSysbenchOLTPWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -267,7 +268,7 @@ public void PostgreSQLSysbenchOLTPWorkloadProfileActionsWillNotBeExecutedIfTheWo this.fixture.Setup(platform); this.fixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -298,13 +299,13 @@ public async Task PostgreSQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorklo IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -339,13 +340,13 @@ public async Task PostgreSQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorklo IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); @@ -362,7 +363,7 @@ public async Task PostgreSQLSysbenchOLTPWorkloadProfileExecutesTheExpectedWorklo [TestCase("PERF-POSTGRESQL-SYSBENCH-TPCC.json")] public void PostgreSQLSysbenchTPCCWorkloadProfileParametersAreInlinedCorrectly(string profile) { - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { WorkloadAssert.ParameterReferencesInlined(executor.Profile); } @@ -375,7 +376,7 @@ public void PostgreSQLSysbenchTPCCWorkloadProfileActionsWillNotBeExecutedIfTheWo this.fixture.Setup(platform); this.fixture.PackageManager.Clear(); - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { executor.ExecuteDependencies = false; @@ -405,13 +406,13 @@ public async Task PostgreSQLSysbenchTPCCWorkloadProfileExecutesTheExpectedWorklo IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); WorkloadAssert.CommandsExecuted(this.fixture, expectedCommands.ToArray()); @@ -446,13 +447,13 @@ public async Task PostgreSQLSysbenchTPCCWorkloadProfileExecutesTheExpectedWorklo IProcessProxy process = this.fixture.CreateProcess(command, arguments, workingDir); if (arguments.Contains("run", StringComparison.OrdinalIgnoreCase)) { - process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Sysbench.txt")); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Sysbench.txt")); } return process; }; - using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.fixture.Dependencies)) + using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.fixture.Dependencies)) { await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false); diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestDependencies.cs b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestProfileResources.cs similarity index 68% rename from src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestDependencies.cs rename to src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestProfileResources.cs index 9f17ecc467..319f7557f2 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestDependencies.cs +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/TestProfileResources.cs @@ -6,37 +6,14 @@ namespace VirtualClient.Actions using System; using System.Collections.Generic; using System.IO; - using System.Reflection; using Microsoft.Extensions.DependencyInjection; using VirtualClient.Contracts; /// /// Provides dependencies used in the various functional tests in this project. /// - public static class TestDependencies + public static class TestProfileResources { - static TestDependencies() - { - TestDependencies.TestDirectory = Path.GetDirectoryName(Assembly.GetAssembly(typeof(TestDependencies)).Location); - TestDependencies.ProfileDirectory = Path.Combine(TestDependencies.TestDirectory, "profiles"); - TestDependencies.ResourcesDirectory = Path.Combine(TestDependencies.TestDirectory, "resources"); - } - - /// - /// The directory where the workload profiles exist. - /// - public static string ProfileDirectory { get; } - - /// - /// The directory where the workload resources exist. - /// - public static string ResourcesDirectory { get; } - - /// - /// The directory where the test binaries exist (e.g. the build output directory). - /// - public static string TestDirectory { get; } - /// /// Creates a for the workload profile provided (e.g. PERF-IO-FIO-STRESS.json). /// @@ -54,7 +31,7 @@ public static ProfileExecutor CreateProfileExecutor( bool dependenciesOnly = false, IDictionary parameterOverrides = null) { - ExecutionProfile workloadProfile = ExecutionProfile.ReadProfileAsync(Path.Combine(TestDependencies.ProfileDirectory, profile)) + ExecutionProfile workloadProfile = ExecutionProfile.ReadProfileAsync(Path.Combine(MockFixture.TestResourcesDirectory, "profiles", profile)) .GetAwaiter().GetResult(); workloadProfile.Inline(); @@ -92,14 +69,5 @@ public static ProfileExecutor CreateProfileExecutor( return profileExecutor; } - - public static string GetResourceFileContents(params string[] filePath) - { - List fileSegments = new List(); - fileSegments.Add(TestDependencies.ResourcesDirectory); - fileSegments.AddRange(filePath); - - return File.ReadAllText(Path.Combine(fileSegments.ToArray())); - } } } diff --git a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/VirtualClient.Actions.FunctionalTests.csproj b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/VirtualClient.Actions.FunctionalTests.csproj index 1652f8c6ba..522aed62fe 100644 --- a/src/VirtualClient/VirtualClient.Actions.FunctionalTests/VirtualClient.Actions.FunctionalTests.csproj +++ b/src/VirtualClient/VirtualClient.Actions.FunctionalTests/VirtualClient.Actions.FunctionalTests.csproj @@ -24,26 +24,32 @@ + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + + + + - + - - - - - - - - - - + diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/3DMark/ThreeDMarkMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/3DMark/ThreeDMarkMetricsParserTests.cs index c1df1a2e73..664274e983 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/3DMark/ThreeDMarkMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/3DMark/ThreeDMarkMetricsParserTests.cs @@ -22,7 +22,7 @@ public class ThreeDMarkMetricsParserTests public void ThreeDMarkMetricsParserTestsCorrectly_ScenarioTSGT1() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "3DMark", "result_tsgt1.xml"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "3DMark", "result_tsgt1.xml"); string rawText = File.ReadAllText(outputPath); ThreeDMarkMetricsParser testParser = new ThreeDMarkMetricsParser(rawText, "custom_TSGT1.3dmdef"); @@ -36,7 +36,7 @@ public void ThreeDMarkMetricsParserTestsCorrectly_ScenarioTSGT1() public void ThreeDMarkMetricsParserTestsCorrectly_ScenarioTSGT2() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "3DMark", "result_tsgt2.xml"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "3DMark", "result_tsgt2.xml"); string rawText = File.ReadAllText(outputPath); ThreeDMarkMetricsParser testParser = new ThreeDMarkMetricsParser(rawText, "custom_TSGT2.3dmdef"); @@ -50,7 +50,7 @@ public void ThreeDMarkMetricsParserTestsCorrectly_ScenarioTSGT2() public void ThreeDMarkMetricsParserTestsCorrectly_ScenarioTSCT() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "3DMark", "result_tsct.xml"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "3DMark", "result_tsct.xml"); string rawText = File.ReadAllText(outputPath); ThreeDMarkMetricsParser testParser = new ThreeDMarkMetricsParser(rawText, "custom_TSCT.3dmdef"); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/AspNetServerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/AspNetServerExecutorTests.cs index df252093c8..7ca71a12f8 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/AspNetServerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/AspNetServerExecutorTests.cs @@ -65,7 +65,7 @@ public async Task AspNetServerExecutorRunsTheExpectedWorkloadCommandInLinux() ".*", File.ReadAllText(Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "Bombardier", "BombardierExample.txt"))); + "test_examples", "Bombardier", "BombardierExample.txt"))); using (var executor = new TestAspNetServerExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters)) { @@ -94,7 +94,7 @@ public async Task AspNetServerExecutorRunsTheExpectedWorkloadCommandInWindows() ".*", File.ReadAllText(Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "Bombardier", "BombardierExample.txt"))); + "test_examples", "Bombardier", "BombardierExample.txt"))); using (var executor = new TestAspNetServerExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters)) { @@ -172,7 +172,7 @@ public async Task AspNetServerExecutorExecutesWithCoreAffinityOnLinux() ".*", File.ReadAllText(Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "Bombardier", "BombardierExample.txt"))); + "test_examples", "Bombardier", "BombardierExample.txt"))); using (var executor = new TestAspNetServerExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters)) { diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/BombardierMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/BombardierMetricsParserTests.cs index 4a27f88c64..5ee50b823d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/BombardierMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/AspNetBench/BombardierMetricsParserTests.cs @@ -23,7 +23,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "Bombardier"); + return Path.Combine(workingDirectory, "test_examples", "Bombardier"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkExecutorTests.cs index 9b6fff3a70..fb6e82906b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkExecutorTests.cs @@ -60,7 +60,7 @@ private void SetupTest(PlatformID platform = PlatformID.Win32NT, Architecture ar this.expectedExecutableDir = this.ToPlatformSpecificPath(this.mockPackage, this.Platform, this.CpuArchitecture).Path; this.expectedExecutablePath = this.PlatformSpecifics.Combine(expectedExecutableDir, "benchmark-launcher-cli.exe"); - this.results = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "BlenderBenchmark", "MonsterCPU.json"); + this.results = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "BlenderBenchmark", "MonsterCPU.json"); this.Process.StandardOutput = new Common.ConcurrentBuffer(new StringBuilder(this.results)); // Set up the process's standard output to be the mock blender metrics result as the parser reads the results from the std out. diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkMetricsParserTests.cs index 621fea136b..ae78c96b7a 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/BlenderBenchmark/BlenderBenchmarkMetricsParserTests.cs @@ -19,7 +19,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "BlenderBenchmark"); + return Path.Combine(workingDirectory, "test_examples", "BlenderBenchmark"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipExecutorTests.cs index 78cc3b4427..8e0f3c7918 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipExecutorTests.cs @@ -49,7 +49,7 @@ public void SetupTest() { nameof(Compression7zipExecutor.Scenario), "mockScenario"} }; - string exampleResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "Compressor7zip", "Compressor7zipResultsExample.txt"); + string exampleResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "Compressor7zip", "Compressor7zipResultsExample.txt"); this.defaultOutput.Clear(); this.defaultOutput.Append(exampleResults); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipMetricsParserTests.cs index 88ccecad1d..43deb3ebd8 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Compressor7zip/Compressor7zipMetricsParserTests.cs @@ -26,7 +26,7 @@ class Compressor7zipMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Compressor7zip", "Compressor7zipResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Compressor7zip", "Compressor7zipResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new Compression7zipMetricsParser(this.rawText); } @@ -51,7 +51,7 @@ public void Compressor7zipResultsParserCreatesTheExpectedMetricsFromResults() public void Compressor7zipResultsParserThrowsWhenInvalidResultsAreProvided() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string incorrectCompressor7zipoutputPath = Path.Combine(workingDirectory, "Examples", "Compressor7zip", "Compressor7zipResultsInvalidExample.txt"); + string incorrectCompressor7zipoutputPath = Path.Combine(workingDirectory, "test_examples", "Compressor7zip", "Compressor7zipResultsInvalidExample.txt"); this.rawText = File.ReadAllText(incorrectCompressor7zipoutputPath); this.testParser = new Compression7zipMetricsParser(this.rawText); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkExecutorTests.cs index 051d274dc6..841bcae20b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkExecutorTests.cs @@ -32,7 +32,7 @@ public void SetupTest(PlatformID platform) if (file.EndsWith("run1.log") || file.EndsWith("run2.log")) { results = MockFixture.ReadFile( - MockFixture.ExamplesDirectory, + MockFixture.TestExamplesDirectory, "CoreMark", "CoreMarkExampleSingleThread.txt"); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkMetricsParserTests.cs index 3c88e6d10e..0a9c68470f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkMetricsParserTests.cs @@ -21,7 +21,7 @@ public class CoreMarkMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "CoreMark", "CoreMarkExampleSingleThread.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "CoreMark", "CoreMarkExampleSingleThread.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new CoreMarkMetricsParser(this.rawText); this.testParser.Parse(); @@ -31,7 +31,7 @@ public void Setup() public void CoreMarkParserVerifyMetricsSingleThread() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "CoreMark", "CoreMarkExampleSingleThread.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "CoreMark", "CoreMarkExampleSingleThread.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new CoreMarkMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -53,7 +53,7 @@ public void CoreMarkParserVerifyMetricsSingleThread() public void CoreMarkParserVerifyMetricsMultiThread() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "CoreMark", "CoreMarkExampleMultiThread.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "CoreMark", "CoreMarkExampleMultiThread.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new CoreMarkMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProExecutorTests.cs index 95cab28cf9..5354871b38 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProExecutorTests.cs @@ -22,7 +22,7 @@ public void SetupTest(PlatformID platform) this.Setup(platform); this.Parameters["PackageName"] = "coremarkpro"; - string results = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "CoreMark", "CoreMarkProExample1.txt"); + string results = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "CoreMark", "CoreMarkProExample1.txt"); this.coremarkProOutput.Clear(); this.coremarkProOutput.Append(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProMetricsParserTests.cs index f3bf9682c0..f2c03224fc 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CoreMark/CoreMarkProMetricsParserTests.cs @@ -23,7 +23,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "CoreMark"); + return Path.Combine(workingDirectory, "test_examples", "CoreMark"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficClientExecutorTests.cs index c6b9294621..b9d789b801 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficClientExecutorTests.cs @@ -51,7 +51,7 @@ public void SetupTest(PlatformID platform = PlatformID.Win32NT, Architecture arc this.Directory.Setup(f => f.Exists(It.IsAny())) .Returns(true); - this.mockResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, @"CtsTraffic", "CtsTrafficResultsExample.csv"); + this.mockResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, @"CtsTraffic", "CtsTrafficResultsExample.csv"); this.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(this.mockResults); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficMetricsParserTests.cs index 774bb5f8be..01f71677f4 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficMetricsParserTests.cs @@ -20,7 +20,7 @@ public class CtsTrafficMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "CtsTraffic", "CtsTrafficResultsExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "CtsTraffic", "CtsTrafficResultsExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new CtsTrafficMetricsParser(this.rawText); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficServerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficServerExecutorTests.cs index 0c688fb755..e5fba84488 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficServerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/CtsTraffic/CtsTrafficServerExecutorTests.cs @@ -59,7 +59,7 @@ public void SetupTest(PlatformID platform = PlatformID.Win32NT, Architecture arc this.File.Setup(f => f.Exists(It.IsAny())).Returns(true); this.Directory.Setup(d => d.Exists(It.IsAny())).Returns(true); - this.mockResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, @"CtsTraffic", "CtsTrafficResultsExample.csv"); + this.mockResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, @"CtsTraffic", "CtsTrafficResultsExample.csv"); this.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(this.mockResults); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DCGMI/DCGMIResultsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DCGMI/DCGMIResultsParserTests.cs index ac9ec80615..3ce9303119 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DCGMI/DCGMIResultsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DCGMI/DCGMIResultsParserTests.cs @@ -21,7 +21,7 @@ public class DCGMIResultsParserTests public void DCGMIResultsParseParsesDiagnosticsMetricsCorrectly_Scenario_r1() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIDiag_r1_results.json"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIDiag_r1_results.json"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Diagnostics"); @@ -43,7 +43,7 @@ public void DCGMIResultsParseParsesDiagnosticsMetricsCorrectly_Scenario_r1() public void DCGMIResultsParseParsesDaignosticsMetricsCorrectly_Scenario_r2() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIDiag_r2_results.json"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIDiag_r2_results.json"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Diagnostics"); @@ -70,7 +70,7 @@ public void DCGMIResultsParseParsesDaignosticsMetricsCorrectly_Scenario_r2() public void DCGMIResultsParseParsesDiagnosticsMetricsCorrectly_Scenario_r3() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIDiag_r3_results.json"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIDiag_r3_results.json"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Diagnostics"); @@ -100,7 +100,7 @@ public void DCGMIResultsParseParsesDiagnosticsMetricsCorrectly_Scenario_r3() public void DCGMIResultsParseThrowsExceptionForIncorrectDiagnosticsMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Diagnostics"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -112,7 +112,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectDiagnosticsMetrics() public void DCGMIResultsParserParsesDiscoveryMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIDiscoveryResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIDiscoveryResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Discovery"); @@ -127,7 +127,7 @@ public void DCGMIResultsParserParsesDiscoveryMetricsCorrectly() public void DCGMIREsultsParseThrowsExceptionForIncorrectDiscoveryMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Discovery"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -138,7 +138,7 @@ public void DCGMIREsultsParseThrowsExceptionForIncorrectDiscoveryMetrics() public void DCGMIResultsParserParsesFieldGroupMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIFieldGroupsResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIFieldGroupsResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "FieldGroup"); @@ -152,7 +152,7 @@ public void DCGMIResultsParserParsesFieldGroupMetricsCorrectly() public void DCGMIResultsParseThrowsExceptionForIncorrectFieldGroupMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText,"FieldGroup"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -163,7 +163,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectFieldGroupMetrics() public void DCGMIResultsParserParsesGroupMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIGroupResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIGroupResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Group"); @@ -177,7 +177,7 @@ public void DCGMIResultsParserParsesGroupMetricsCorrectly() public void DCGMIResultsParseThrowsExceptionForIncorrectGroupMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Group"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -188,7 +188,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectGroupMetrics() public void DCGMIResultsParserParsesHealthMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIHealthCheckResults.json"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIHealthCheckResults.json"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Health"); @@ -202,7 +202,7 @@ public void DCGMIResultsParserParsesHealthMetricsCorrectly() public void DCGMIResultsParseThrowsExceptionForIncorrectHealthMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Health"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -213,7 +213,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectHealthMetrics() public void DCGMIResultsParserParsesModulesMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIModulesResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIModulesResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Modules"); @@ -236,7 +236,7 @@ public void DCGMIResultsParserParsesModulesMetricsCorrectly() public void DCGMIResultsParseThrowsExceptionForIncorrectModuleMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "Modules"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -247,7 +247,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectModuleMetrics() public void DCGMIResultsParserParsesProftesterMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIProftesterResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIProftesterResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "CUDATestGenerator"); @@ -260,7 +260,7 @@ public void DCGMIResultsParserParsesProftesterMetricsCorrectly() public void DCGMIResultsParseThrowsExceptionForIncorrectProftesterMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "CUDATestGenerator"); SchemaException exception = Assert.Throws(() => testParser.Parse()); @@ -271,7 +271,7 @@ public void DCGMIResultsParseThrowsExceptionForIncorrectProftesterMetrics() public void DCGMIResultsParserParsesProftesterDmonMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIDmonResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIDmonResults.txt"); string rawText = File.ReadAllText(outputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "CUDATestGeneratorDmon"); @@ -284,7 +284,7 @@ public void DCGMIResultsParserParsesProftesterDmonMetricsCorrectly() public void DCGMIRsultsParseThrowsExceptionForIncorrectDmonMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectoutputPath = Path.Combine(workingDirectory, "Examples", "DCGMI", "DCGMIIncorrectresults.json"); + string IncorrectoutputPath = Path.Combine(workingDirectory, "test_examples", "DCGMI", "DCGMIIncorrectresults.json"); string rawText = File.ReadAllText(IncorrectoutputPath); DCGMIResultsParser testParser = new DCGMIResultsParser(rawText, "CUDATestGeneratorDmon"); SchemaException exception = Assert.Throws(() => testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DXMicrobenchmarks/DXFlopsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DXMicrobenchmarks/DXFlopsParserTests.cs index 364d66f0cf..e6bc9ede2c 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DXMicrobenchmarks/DXFlopsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DXMicrobenchmarks/DXFlopsParserTests.cs @@ -17,7 +17,7 @@ public class DXFlopsParserTests public void DXFlopsParserTestsCorrectly_ScenarioFLOPS() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DXMicrobenchmarks", "result.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DXMicrobenchmarks", "result.txt"); string rawText = File.ReadAllText(outputPath); DXFLOPSParser testParser = new DXFLOPSParser(rawText); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchClientExecutorTests.cs index 954f9fe177..4f5cb40a17 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchClientExecutorTests.cs @@ -27,7 +27,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class DeathStarBenchClientExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(DeathStarBenchClientExecutorTests), "Examples", "DeathStarBench"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(DeathStarBenchClientExecutorTests), "test_examples", "DeathStarBench"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchMetricsParserUnitTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchMetricsParserUnitTests.cs index 62a445da80..fda1106dbd 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchMetricsParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchMetricsParserUnitTests.cs @@ -25,7 +25,7 @@ class DeathStarBenchMetricsParserUnitTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "DeathStarBench", "DeathStarBenchOutputExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "DeathStarBench", "DeathStarBenchOutputExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new DeathStarBenchMetricsParser(this.rawText); } @@ -56,7 +56,7 @@ public void DeathStarBenchMetricsParserVerifyMetrics() public void DeathStarBenchMetricsParserThrowIfInvalidOutputFormat() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string incorrectDeathBenchoutputPath = Path.Combine(workingDirectory, "Examples", "DeathStarBench", "DeathStarBenchIncorrectOutputExample.txt"); + string incorrectDeathBenchoutputPath = Path.Combine(workingDirectory, "test_examples", "DeathStarBench", "DeathStarBenchIncorrectOutputExample.txt"); this.rawText = File.ReadAllText(incorrectDeathBenchoutputPath); this.testParser = new DeathStarBenchMetricsParser(this.rawText); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdExecutorTests.cs index 4477d03220..51e4b6114c 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdExecutorTests.cs @@ -48,7 +48,7 @@ public void SetupTest() { nameof(DiskSpdExecutor.MetricScenario), "diskspd_randwrite_4GB_direct" } }; - this.output = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "DiskSpd", "DiskSpdExample-ReadWrite.txt"); + this.output = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "DiskSpd", "DiskSpdExample-ReadWrite.txt"); this.ProcessManager.OnCreateProcess = (command, arguments, workingDir) => { diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs index 507b3a0c9c..5cd6441c2f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DiskSpd/DiskSpdMetricsParserTests.cs @@ -17,7 +17,7 @@ public class DiskSpdMetricsParserTests [Test] public void DiskSpdParserVerifyReadWrite() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-ReadWrite.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-ReadWrite.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b8K -r8K -t32 -o16 -w50 -d900 -Suw -W50 -D -L -Rtext D:\\diskspd-test.dat"); IList metrics = parser.Parse(); @@ -128,7 +128,7 @@ public void DiskSpdParserVerifyReadWrite() [Test] public void DiskSpdParserVerifyWriteOnly() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-WriteOnly.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-WriteOnly.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b8K -r8K -t32 -o16 -w100 -d900 -Suw -W30 -D -L -Rtext D:\\diskspd-test.dat"); IList metrics = parser.Parse(); @@ -204,7 +204,7 @@ public void DiskSpdParserVerifyWriteOnlyV220FormatWithSocketNodeCoreColumns() { // DiskSpd v2.2.0 changed the CPU table to include Socket | Node | Group | Core | CPU columns. // The parser must normalise this extended header without throwing a KeyNotFoundException. - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b4K -r4K -t160 -o3 -w100 -d900 -Suw -W15 -D -L -Rtext D:\\diskspd-test.dat"); IList metrics = parser.Parse(); @@ -245,7 +245,7 @@ public void DiskSpdParserVerifyWriteOnlyV220FormatOnSingleProcessorGroupSystem() // latency table "Total latency distribution:" (not the legacy "total:"). Prior to the // fix this threw "The given key 'CPU' was not present in the dictionary" (and, once // that was fixed, "The given key 'Latency' was not present in the dictionary"). - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-SingleGroup.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-SingleGroup.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -c1G -b4K -r4K -t4 -o16 -w100 -d10 -Suw -W5 -D -L -Rtext C:\\diskspd-test.dat"); IList metrics = parser.Parse(); @@ -291,7 +291,7 @@ public void DiskSpdParserVerifyWriteOnlyV220FormatOnSingleProcessorGroupSystem() [Test] public void DiskSpdParserVerifyForCoreCountGreaterThan64WhichAddsProcessorGrouping() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "Write8k.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "Write8k.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -b8K -r8K -t32 -o16 -w100 -d900 -Suw -W30 -D -L -Rtext D:\\diskspd-test.dat"); IList metrics = parser.Parse(); @@ -344,7 +344,7 @@ public void DiskSpdParserVerifyV220FormatOnMultiSocketSingleProcessorGroupSystem // fixes special-cased, so before NormalizeCpuTable it threw "The given key 'CPU' was not // present in the dictionary" (the title was inserted mid-line, keying the section // "Socket | Node | CPU"). - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-MultiSocketSingleGroup.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-MultiSocketSingleGroup.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -c64M -b4K -r4K -t4 -o4 -w100 -d5 -Suw -W2 -D -L -Rtext C:\\dskspd\\testfile.dat"); IList metrics = parser.Parse(); @@ -380,7 +380,7 @@ public void DiskSpdParserVerifyV220FormatOnMultiNumaMultiProcessorGroupSystem() // boundary (group 1's CPU 0 becomes id 64 = 64*group + cpu). Without retaining Group, the // group-relative CPU numbers (0,1,2,.. repeated per group) would collide. Before the // dynamic fix this header threw "The given key 'CPU' was not present in the dictionary". - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "Examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-MultiNumaMultiGroup.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(DiskSpdMetricsParserTests), "test_examples", "DiskSpd", "DiskSpdExample-WriteOnly-v2.2.0-MultiNumaMultiGroup.txt")); var parser = new DiskSpdMetricsParser(results, "diskspd.exe -c64M -b4K -r4K -t4 -o4 -w100 -d5 -Suw -W2 -D -L -Rtext C:\\dskspd\\testfile.dat"); IList metrics = parser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeExecutorTests.cs index 574683eaa7..1d0fb38220 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeExecutorTests.cs @@ -113,7 +113,7 @@ private void SetupDefaultMockBehavior() { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); this.currentDirectoryPath = new DependencyPath("DotNetRuntime", currentDirectory); - string resultsPath = this.fixture.PlatformSpecifics.Combine(this.currentDirectoryPath.Path, "Examples", "DotNetRuntimeResultsExample.txt"); + string resultsPath = this.fixture.PlatformSpecifics.Combine(this.currentDirectoryPath.Path, "test_examples", "DotNetRuntimeResultsExample.txt"); this.rawString = File.ReadAllText(resultsPath); this.fixture.FileSystem.Setup(fe => fe.File.Exists(It.IsAny())).Returns(true); this.fixture.FileSystem.Setup(fe => fe.File.Exists(null)).Returns(false); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeMetricsParserTests.cs index 3292e16837..fcf79c8c6c 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/DotNetRuntime/DotNetRuntimeMetricsParserTests.cs @@ -21,7 +21,7 @@ internal class DotNetRuntimeMetricsParserUnitTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, @"Examples", "DotNetRuntimeResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, @"test_examples", "DotNetRuntimeResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new DotNetRuntimeMetricsParser(this.rawText); } @@ -45,7 +45,7 @@ public void DotNetRuntimeParserVerifyMetrics() public void DotNetRuntimeParserThrowIfInvalidOutputFormat() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectDotNetoutputPath =Path.Combine(workingDirectory, @"Examples", "IncorrectDotNetRuntimeResultsExample.txt"); + string IncorrectDotNetoutputPath =Path.Combine(workingDirectory, @"test_examples", "IncorrectDotNetRuntimeResultsExample.txt"); this.rawText = File.ReadAllText(IncorrectDotNetoutputPath); this.testParser = new DotNetRuntimeMetricsParser(this.rawText); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyClientExecutorTests.cs index 2b0a91b0e5..e4dae4c7ca 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyClientExecutorTests.cs @@ -172,7 +172,7 @@ public void TestElasticsearchRallyClientExecutorWhenRallyMetricReaderFailure() { executor.ReportCsvExists = true; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "Examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); + executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "test_examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); Assert.ThrowsAsync(() => executor.ExecuteAsync(EventContext.None, CancellationToken.None)); @@ -202,7 +202,7 @@ public async Task TestElasticsearchRallyClientExecutorWhenRallyConfiguredAndRepo executor.ReportCsvExists = true; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "Examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); + executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "test_examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); await executor.ExecuteAsync(EventContext.None, CancellationToken.None); } @@ -260,7 +260,7 @@ public async Task RallyChallengeIsIncludedInRallyCommandWhenSpecified() executor.ReportCsvExists = true; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "Examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); + executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "test_examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); await executor.ExecuteAsync(EventContext.None, CancellationToken.None); } @@ -307,7 +307,7 @@ public async Task RallyIncludeTasksIsIncludedInRallyCommandWhenSpecified() executor.ReportCsvExists = true; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "Examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); + executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "test_examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); await executor.ExecuteAsync(EventContext.None, CancellationToken.None); } @@ -368,7 +368,7 @@ public async Task RallyCommandLineArgumentsOverridesDefaultCommandWhenSpecified( executor.ReportCsvExists = true; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "Examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); + executor.ReportLines = System.IO.File.ReadAllLines(Path.Combine(currentDirectory, "test_examples", "ElasticsearchRally", "ElasticsearchRallyExample.txt")); await executor.ExecuteAsync(EventContext.None, CancellationToken.None); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyMetricsParserTests.cs index 87dc85d8c1..83aeed81e5 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ElasticsearchRally/ElasticsearchRallyMetricsParserTests.cs @@ -22,7 +22,7 @@ public class ElasticsearchRallyMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - this.examplePath = Path.Combine(workingDirectory, "Examples", "ElasticsearchRally"); + this.examplePath = Path.Combine(workingDirectory, "test_examples", "ElasticsearchRally"); } [Test] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioExecutorTests.cs index 75de4bf259..f72d0754f9 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioExecutorTests.cs @@ -32,7 +32,7 @@ public class FioExecutorTests : MockFixture [OneTimeSetUp] public void SetupFixture() { - this.mockResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "FIO", "Results_FIO.json"); + this.mockResults = MockFixture.ReadTestResourcesFile("fio", "Results_FIO.json"); } [SetUp] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioMetricsParserTests.cs index 1070c3b1a3..ebca1d1757 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/FIO/FioMetricsParserTests.cs @@ -16,10 +16,10 @@ namespace VirtualClient.Actions [Category("Unit")] public class FioMetricsParserTests { - private static readonly string ExamplesPath = Path.Combine( + private static readonly string ResourcesPath = Path.Combine( Path.GetDirectoryName(Assembly.GetAssembly(typeof(FioMetricsParserTests)).Location), - "Examples", - "FIO"); + "test_resources", + "fio"); private static readonly IDictionary ExpectedReadMetrics = new Dictionary { @@ -160,7 +160,7 @@ public void FioResultsParserHandlesResultsThatHasMissingMeasurements_AllMeasurem [Test] public void FioResultsParserHandlesResultsThatHasMissingMeasurements_ReadMeasurementsMissing() { - JObject results = JObject.Parse(File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json"))); + JObject results = JObject.Parse(File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json"))); results.SelectToken($"jobs[0].read").First.Remove(); FioMetricsParser parser = new FioMetricsParser(results.ToString(), parseReadMetrics: true, parseWriteMetrics: false); @@ -175,7 +175,7 @@ public void FioResultsParserHandlesResultsThatHasMissingMeasurements_ReadMeasure [Test] public void FioResultsParserHandlesResultsThatHasMissingMeasurements_WriteMeasurementsMissing() { - JObject results = JObject.Parse(File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json"))); + JObject results = JObject.Parse(File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json"))); results.SelectToken($"jobs[0].write").First.Remove(); FioMetricsParser parser = new FioMetricsParser(results.ToString(), parseReadMetrics: false, parseWriteMetrics: true); @@ -190,7 +190,7 @@ public void FioResultsParserHandlesResultsThatHasMissingMeasurements_WriteMeasur [Test] public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_Read_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: true, parseWriteMetrics: false); IEnumerable metrics = parser.Parse(); @@ -205,7 +205,7 @@ public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_Read_Scen [Test] public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_Write_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: false, parseWriteMetrics: true); IEnumerable metrics = parser.Parse(); @@ -220,7 +220,7 @@ public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_Write_Sce [Test] public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_ReadWrite_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: true, parseWriteMetrics: true); IEnumerable metrics = parser.Parse(); @@ -237,7 +237,7 @@ public void FioResultsParserReadsTheExpectedMeasurementsFromTheResults_ReadWrite [Test] public void FioResultsParserReadsTheExpectedMeasurementValuesFromTheResults_Read_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: true, parseWriteMetrics: false, conversionUnits: MetricUnit.Nanoseconds); IEnumerable metrics = parser.Parse(); @@ -254,7 +254,7 @@ public void FioResultsParserReadsTheExpectedMeasurementValuesFromTheResults_Read [Test] public void FioResultsParserReadsTheExpectedMeasurementValuesFromTheResults_Write_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: false, parseWriteMetrics: true, conversionUnits: MetricUnit.Nanoseconds); IEnumerable metrics = parser.Parse(); @@ -271,7 +271,7 @@ public void FioResultsParserReadsTheExpectedMeasurementValuesFromTheResults_Writ [Test] public void FioResultsParserAppliesTheExpectedDefaultConversionFactorToMeasurementValues_Read_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); // The default conversion factor is from nanoseconds to milliseconds FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: true, parseWriteMetrics: false); @@ -295,7 +295,7 @@ public void FioResultsParserAppliesTheExpectedDefaultConversionFactorToMeasureme [Test] public void FioResultsParserAppliesTheExpectedDefaultConversionFactorToMeasurementValues_Write_Scenario() { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, "Results_FIO.json")); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, "Results_FIO.json")); // The default conversion factor is from nanoseconds to milliseconds FioMetricsParser parser = new FioMetricsParser(results, parseReadMetrics: false, parseWriteMetrics: true); @@ -321,7 +321,7 @@ public void FioResultsParserAppliesTheExpectedDefaultConversionFactorToMeasureme [TestCase("Results_FIO_Verification_Error_2.txt", 128)] public void FioResultsParserReadsDataIntegrityVerifcationErrorsFromTheResults(string exampleFileName, int expectedDataIntegrityErrors) { - string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ExamplesPath, exampleFileName)); + string results = File.ReadAllText(Path.Combine(FioMetricsParserTests.ResourcesPath, exampleFileName)); FioMetricsParser parser = new FioMetricsParser(results, parseDataIntegrityErrors: true); IEnumerable metrics = parser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/GeekBench/GeekBenchMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/GeekBench/GeekBenchMetricsParserTests.cs index 2ac249ae5d..4889f51cbb 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/GeekBench/GeekBenchMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/GeekBench/GeekBenchMetricsParserTests.cs @@ -35,7 +35,7 @@ public void GeekBenchParserVerifySingleCoreResult() [Test] public void GeekBench5ParserVerifyMetricsSingleCore_Test() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench5Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench5Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -87,7 +87,7 @@ public void GeekBench5ParserVerifyMetricsSingleCore_Test() [Test] public void GeekBench5ParserVerifyMetricsMultiCore() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench5Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench5Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -139,7 +139,7 @@ public void GeekBench5ParserVerifyMetricsMultiCore() [Test] public void GeekBench5ParserVerifyMetricsSummary() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench5Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench5Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -158,7 +158,7 @@ public void GeekBench5ParserVerifyMetricsSummary() [Test] public void GeekBench6ParserVerifyMetricsSingleCore() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench6Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench6Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -200,7 +200,7 @@ public void GeekBench6ParserVerifyMetricsSingleCore() [Test] public void GeekBench6ParserVerifyMetricsMultiCore() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench6Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench6Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -242,7 +242,7 @@ public void GeekBench6ParserVerifyMetricsMultiCore() [Test] public void GeekBench6ParserVerifyMetricsSummary() { - string outputPath = Path.Combine(workingDirectory, "Examples", "Geekbench", "GeekBench6Example.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Geekbench", "GeekBench6Example.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GeekBenchMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500ExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500ExecutorTests.cs index 966b241a81..ac6ae549c5 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500ExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500ExecutorTests.cs @@ -19,7 +19,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class Graph500ExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(Graph500ExecutorTests), "Examples", "Graph500"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(Graph500ExecutorTests), "test_examples", "Graph500"); private const string Scale = "10"; private const string EdgeFactor = "4"; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500MetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500MetricsParserTests.cs index 3ee6120c46..c7637bb78c 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500MetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Graph500/Graph500MetricsParserTests.cs @@ -25,7 +25,7 @@ public class Graph500MetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Graph500", "Graph500ResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Graph500", "Graph500ResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new Graph500MetricsParser(this.rawText); } @@ -104,7 +104,7 @@ public void Graph500ParserVerifyMetrics() public void Graph500ParserThrowIfInvalidOutputFormat() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string IncorrectGraph500outputPath = Path.Combine(workingDirectory, "Examples", "Graph500", "Graph500IncorrectResultsExample.txt"); + string IncorrectGraph500outputPath = Path.Combine(workingDirectory, "test_examples", "Graph500", "Graph500IncorrectResultsExample.txt"); this.rawText = File.ReadAllText(IncorrectGraph500outputPath); this.testParser = new Graph500MetricsParser(this.rawText); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipExecutorTests.cs index 5168ad4029..f0dc77ba47 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipExecutorTests.cs @@ -56,7 +56,7 @@ public void SetupDefaultBehavior() }; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "Gzip", "GzipResultsExample.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "Gzip", "GzipResultsExample.txt"); string results = File.ReadAllText(resultsPath); this.defaultOutput.Clear(); this.defaultOutput.Append(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipMetricsParserTests.cs index 4220074549..ed67a7943e 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Gzip/GzipMetricsParserTests.cs @@ -26,7 +26,7 @@ class GzipMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Gzip", "GzipResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Gzip", "GzipResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new GzipMetricsParser(this.rawText); } @@ -61,7 +61,7 @@ public void GzipResultsParserCreatesTheExpectedMetricsFromResults() public void GzipResultsParserThrowsWhenInvalidResultsAreProvided() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string incorrectGzipoutputPath = Path.Combine(workingDirectory, "Examples", "Gzip", "GzipResultsInvalidExample.txt"); + string incorrectGzipoutputPath = Path.Combine(workingDirectory, "test_examples", "Gzip", "GzipResultsInvalidExample.txt"); this.rawText = File.ReadAllText(incorrectGzipoutputPath); this.testParser = new GzipMetricsParser(this.rawText); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackExecutorTests.cs index 134390c41a..96b49ffd88 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackExecutorTests.cs @@ -19,7 +19,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class HPLinpackExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(HPLinpackExecutorTests), "Examples", "HPLinpack"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(HPLinpackExecutorTests), "test_examples", "HPLinpack"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackMetricsParserTests.cs index 9abe05924a..a9d71c0a16 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/HPLinpack/HPLinpackMetricsParserTests.cs @@ -24,7 +24,7 @@ class HPLinpackMetricsParserTests public void HPLParserVerifyArmResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string armoutputPath = Path.Combine(workingDirectory, "Examples", "HPLinpack", "HPLResultsArm.txt"); + string armoutputPath = Path.Combine(workingDirectory, "test_examples", "HPLinpack", "HPLResultsArm.txt"); this.rawText = File.ReadAllText(armoutputPath); this.testParser = new HPLinpackMetricsParser(this.rawText); @@ -48,7 +48,7 @@ public void HPLParserVerifyArmResults() public void HPLParserVerifyIntelResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string inteloutputPath = Path.Combine(workingDirectory, "Examples", "HPLinpack", "HPLResultsIntel.txt"); + string inteloutputPath = Path.Combine(workingDirectory, "test_examples", "HPLinpack", "HPLResultsIntel.txt"); this.rawText = File.ReadAllText(inteloutputPath); this.testParser = new HPLinpackMetricsParser(this.rawText); @@ -70,7 +70,7 @@ public void HPLParserVerifyIntelResults() public void HPLParserThrowIfInvalidOutput() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "HPLinpack", "HPLIncorrectResults.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "HPLinpack", "HPLIncorrectResults.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new HPLinpackMetricsParser(this.rawText); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); @@ -81,7 +81,7 @@ public void HPLParserThrowIfInvalidOutput() public void HPLParserExtractsVersionCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string armoutputPath = Path.Combine(workingDirectory, "Examples", "HPLinpack", "HPLResultsArm.txt"); + string armoutputPath = Path.Combine(workingDirectory, "test_examples", "HPLinpack", "HPLResultsArm.txt"); this.rawText = File.ReadAllText(armoutputPath); this.testParser = new HPLinpackMetricsParser(this.rawText); @@ -89,7 +89,7 @@ public void HPLParserExtractsVersionCorrectly() Assert.AreEqual("2.3", this.testParser.Version); // Test Intel output version extraction - string inteloutputPath = Path.Combine(workingDirectory, "Examples", "HPLinpack", "HPLResultsIntel.txt"); + string inteloutputPath = Path.Combine(workingDirectory, "test_examples", "HPLinpack", "HPLResultsIntel.txt"); this.rawText = File.ReadAllText(inteloutputPath); this.testParser = new HPLinpackMetricsParser(this.rawText); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/HammerDB/HammerDBMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/HammerDB/HammerDBMetricsParserTests.cs index d59653607f..2c48295683 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/HammerDB/HammerDBMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/HammerDB/HammerDBMetricsParserTests.cs @@ -12,7 +12,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class HammerDBMetricsParserTests { - private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "HammerDB"); + private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "HammerDB"); [Test] public void PostgreSQLParserThrowIfInvalidOutputFormat() diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Hpcg/HpcgMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Hpcg/HpcgMetricsParserTests.cs index e007e1c7fb..8688ef7a37 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Hpcg/HpcgMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Hpcg/HpcgMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "Hpcg"); + return Path.Combine(workingDirectory, "test_examples", "Hpcg"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKExecutorTests.cs index 2bbeb7a794..bccdbb9c35 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKExecutorTests.cs @@ -20,7 +20,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LAPACKExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LAPACKExecutorTests), "Examples", "LAPACK"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LAPACKExecutorTests), "test_examples", "LAPACK"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKMetricsParserTests.cs index 1b156210bd..8bfa87b96b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/LAPACK/LAPACKMetricsParserTests.cs @@ -25,7 +25,7 @@ class LAPACKMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "LAPACK", "LAPACKResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "LAPACK", "LAPACKResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new LAPACKMetricsParser(this.rawText); } @@ -62,14 +62,14 @@ public void LAPACKParserVerifyMetrics() public void LAPACKParserThrowIfInvalidOutput() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "LAPACK", "LAPACKIncorrectFormatExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "LAPACK", "LAPACKIncorrectFormatExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new LAPACKMetricsParser(this.rawText); WorkloadResultsException exception = Assert.Throws(() => this.testParser.Parse()); workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - outputPath = Path.Combine(workingDirectory, "Examples", "LAPACK", "LAPACKIncorrectResultsExample.txt"); + outputPath = Path.Combine(workingDirectory, "test_examples", "LAPACK", "LAPACKIncorrectResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new LAPACKMetricsParser(this.rawText); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchExecutorTests.cs index 27d0b2e36f..7c6de5e86d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchExecutorTests.cs @@ -17,7 +17,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LMbenchExecutorTests : MockFixture { - private static string Examples = MockFixture.GetDirectory(typeof(LMbenchExecutorTests), "Examples", "LMbench"); + private static string Examples = MockFixture.GetDirectory(typeof(LMbenchExecutorTests), "test_examples", "LMbench"); private DependencyPath mockPackage; [SetUp] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchMetricsParserTests.cs index 1184f4dbee..e1cd266b3a 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/LMbench/LMbenchMetricsParserTests.cs @@ -16,7 +16,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LMbenchMetricsParserTests { - private static string Examples = MockFixture.GetDirectory(typeof(LMbenchExecutorTests), "Examples", "LMbench"); + private static string Examples = MockFixture.GetDirectory(typeof(LMbenchExecutorTests), "test_examples", "LMbench"); private MockFixture mockFixture; [SetUp] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchExecutorTests.cs index 8fdf2e96f7..9bb4cb8e42 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchExecutorTests.cs @@ -39,7 +39,7 @@ public void SetupDefaultBehavior() this.mockFixture.File.Setup(f => f.Exists(It.IsAny())) .Returns(true); this.mockFixture.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())) - .ReturnsAsync(MockFixture.ReadFile(MockFixture.ExamplesDirectory, "Lzbench", "LzbenchResultsExample.csv")); + .ReturnsAsync(MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "Lzbench", "LzbenchResultsExample.csv")); this.mockFixture.Directory.Setup(f => f.Exists(It.IsAny())) .Returns(true); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchMetricsParserTests.cs index 7b9462d8af..2d30c4ba71 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Lzbench/LzbenchMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "Lzbench"); + return Path.Combine(workingDirectory, "test_examples", "Lzbench"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerExecutorTests.cs index 56b5167427..af3b974d35 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerExecutorTests.cs @@ -26,7 +26,7 @@ public class MemoryLatencyCheckerExecutorTests public void SetUpFixture() { this.fixture = new DependencyFixture(); - this.results = File.ReadAllText(Path.Combine("Examples", "MemoryLatencyChecker", "mlc-latency-matrix-single.txt")); + this.results = File.ReadAllText(Path.Combine("test_examples", "MemoryLatencyChecker", "mlc-latency-matrix-single.txt")); } [Test] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerMetricsParserTests.cs index cfc8e70be5..822d3c79c6 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/MemoryLatencyChecker/MemoryLatencyCheckerMetricsParserTests.cs @@ -26,7 +26,7 @@ public void Setup() [Test] public void MemoryLatencyCheckerParserVerifyMetricsForLatencyMatrixMultipleNumaNode() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-latency-matrix-multiple.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-latency-matrix-multiple.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.LatencyMatrix); IList metrics = this.testParser.Parse(); @@ -40,7 +40,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForLatencyMatrixMultipleNumaN [Test] public void MemoryLatencyCheckerParserVerifyMetricsForLatencyMatrixSingleNumaNode() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-latency-matrix-single.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-latency-matrix-single.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.LatencyMatrix); IList metrics = this.testParser.Parse(); @@ -52,7 +52,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForLatencyMatrixSingleNumaNod [Test] public void MemoryLatencyCheckerParserVerifyMetricsForLoadedLatency() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-loaded-latency.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-loaded-latency.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.LoadedLatency); IList metrics = this.testParser.Parse(); @@ -69,7 +69,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForLoadedLatency() [Test] public void MemoryLatencyCheckerParserVerifyMetricsForIdleLatency() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-idle-latency.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-idle-latency.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.IdleLatency); IList metrics = this.testParser.Parse(); @@ -82,7 +82,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForIdleLatency() [Test] public void MemoryLatencyCheckerParserVerifyMetricsForPeakInjectionMemoryBandwidth() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-peak-injection-bandwidth.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-peak-injection-bandwidth.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.PeakInjectionBandwidth); IList metrics = this.testParser.Parse(); @@ -98,7 +98,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForPeakInjectionMemoryBandwid [Test] public void MemoryLatencyCheckerParserVerifyMetricsForBandwidthMatrixSingleNumaNode() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-bandwidth-matrix-single.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-bandwidth-matrix-single.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.BandwidthMatrix); IList metrics = this.testParser.Parse(); @@ -110,7 +110,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForBandwidthMatrixSingleNumaN [Test] public void MemoryLatencyCheckerParserVerifyMetricsForBandwidthMatrixMultipleNumaNode() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-bandwidth-matrix-multiple.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-bandwidth-matrix-multiple.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.BandwidthMatrix); IList metrics = this.testParser.Parse(); @@ -124,7 +124,7 @@ public void MemoryLatencyCheckerParserVerifyMetricsForBandwidthMatrixMultipleNum [Test] public void MemoryLatencyCheckerParserThrowsIfInvalidResultsProvided() { - string InvalidOutputPath = Path.Combine(workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-invalid.txt"); + string InvalidOutputPath = Path.Combine(workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-invalid.txt"); string rawText = File.ReadAllText(InvalidOutputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, string.Empty); WorkloadResultsException exception = Assert.Throws(() => this.testParser.Parse()); @@ -134,7 +134,7 @@ public void MemoryLatencyCheckerParserThrowsIfInvalidResultsProvided() [Test] public void MemoryLatencyCheckerParserVerifyMetricsForC2CLatency() { - string outputPath = Path.Combine(this.workingDirectory, "Examples", "MemoryLatencyChecker", "mlc-c2c-latency.txt"); + string outputPath = Path.Combine(this.workingDirectory, "test_examples", "MemoryLatencyChecker", "mlc-c2c-latency.txt"); string rawText = File.ReadAllText(outputPath); this.testParser = new MemoryLatencyCheckerMetricsParser(rawText, MemoryLatencyCheckerMetricsParser.MemoryLatencyCheckerBenchmark.C2CLatency); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs index 9a6f4762aa..6d562310cb 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs @@ -81,7 +81,7 @@ public void SetupDefaults() .ReturnsAsync(this.mockPackage); this.mockFixture.FileSystem.Setup(fe => fe.File.Exists(It.IsAny())).Returns(true); - this.results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierBenchmarkClientExecutorTests), "Examples", "Memtier", "Memtier_Memcached_Results_1.txt")); + this.results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierBenchmarkClientExecutorTests), "test_examples", "Memtier", "Memtier_Memcached_Results_1.txt")); this.mockFixture.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(this.results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierMetricsParserTests.cs index 4c9c5a6e47..3ac07ab582 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierMetricsParserTests.cs @@ -13,12 +13,12 @@ namespace VirtualClient.Actions [Category("Unit")] public class MemtierMetricsParserTests { - private static string ExamplesDirectory = MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier"); + private static string ExamplesDirectory = MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier"); [Test] public void MemtierMetricsParserParsesTheExpectedMetricsFromResults_RawMetrics_1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_1.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_1.txt")); var parser = new MemtierMetricsParser(results); IList metrics = parser.Parse(); @@ -61,7 +61,7 @@ public void MemtierMetricsParserParsesTheExpectedMetricsFromResults_RawMetrics_1 [Test] public void MemtierMetricsParserParsesTheExpectedMetricsFromResults_RawMetrics_2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_2.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_2.txt")); var parser = new MemtierMetricsParser(results); IList metrics = parser.Parse(); @@ -104,11 +104,11 @@ public void MemtierMetricsParserParsesTheExpectedMetricsFromResults_RawMetrics_2 [Test] public void MemtierMetricsParserAggregatesMetricsIntoTheExpectedSetGivenASetOfIndividualResults() { - string results1 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_1.txt")); - string results2 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_2.txt")); - string results3 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_3.txt")); - string results4 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_4.txt")); - string results5 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_5.txt")); + string results1 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_1.txt")); + string results2 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_2.txt")); + string results3 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_3.txt")); + string results4 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_4.txt")); + string results5 = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_5.txt")); var parser1 = new MemtierMetricsParser(results1); var parser2 = new MemtierMetricsParser(results2); @@ -279,7 +279,7 @@ public void MemtierMetricsParserAggregatesMetricsIntoTheExpectedSetGivenASetOfIn [Test] public void MemtierMetricsParserAssociatesTheCorrectRelativityWithEachOfTheMetrics() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Memcached_Results_1.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Memcached_Results_1.txt")); var parser = new MemtierMetricsParser(results); IList metrics = parser.Parse(); @@ -296,7 +296,7 @@ public void MemtierMetricsParserAssociatesTheCorrectRelativityWithEachOfTheMetri [Test] public void MemtierMetricsParserThrowsIfInvalidResultsAreProvided() { - string invalidResults = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "Examples", "Memtier", "Memtier_Invalid_Results_1.txt")); + string invalidResults = File.ReadAllText(MockFixture.GetDirectory(typeof(MemtierMetricsParserTests), "test_examples", "Memtier", "Memtier_Invalid_Results_1.txt")); var parser = new MemtierMetricsParser(invalidResults); WorkloadResultsException exception = Assert.Throws(() => parser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/MongoDB/MongoDBMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/MongoDB/MongoDBMetricsParserTests.cs index 798e96262b..bb6399c364 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/MongoDB/MongoDBMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/MongoDB/MongoDBMetricsParserTests.cs @@ -19,7 +19,7 @@ public void OneTimeSetup() { // Build path relative to test assembly root; examples copied to output per csproj settings. string baseDir = TestContext.CurrentContext.TestDirectory; - exampleOutputPath = System.IO.Path.Combine(baseDir, "Examples", "MongoDB", "YCSBMongoDBOutputExample.txt"); + exampleOutputPath = System.IO.Path.Combine(baseDir, "test_examples", "MongoDB", "YCSBMongoDBOutputExample.txt"); } [Test] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/NASParallelBench/NASParallelBenchMetricsParserUnitTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/NASParallelBench/NASParallelBenchMetricsParserUnitTests.cs index 819c5b9d02..76195e72ed 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/NASParallelBench/NASParallelBenchMetricsParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/NASParallelBench/NASParallelBenchMetricsParserUnitTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "NASParallelBench"); + return Path.Combine(workingDirectory, "test_examples", "NASParallelBench"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSClientExecutorTests.cs index 5a2ae0bbdb..0b6f7bb7ae 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSClientExecutorTests.cs @@ -49,7 +49,7 @@ public void SetupTest() this.mockFixture.Parameters["ConfidenceLevel"] = "99"; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "CPS", "CPS_Example_Results_Server.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "CPS", "CPS_Example_Results_Server.txt"); string results = File.ReadAllText(resultsPath); this.mockFixture.Process.StandardOutput.Append(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSMetricsParserTests.cs index 2facf6a3c4..ff9f92a464 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSMetricsParserTests.cs @@ -106,7 +106,7 @@ public void CpsParserParsesExpectedMetricsFromValidClientSideResults() private static string GetFileContents(string fileName) { - string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "CPS", fileName); + string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "CPS", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSServerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSServerExecutorTests.cs index 8268328bb6..3d7e3681a7 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSServerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/CPS/CPSServerExecutorTests.cs @@ -24,7 +24,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class CPSServerExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "Examples", "CPS"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "test_examples", "CPS"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteClientExecutorTests.cs index dc7ddca586..f48068aa68 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteClientExecutorTests.cs @@ -44,7 +44,7 @@ public void SetupTest() this.mockFixture.Parameters["Protocol"] = "Tcp"; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "Latte", "Latte_Results_Example.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "Latte", "Latte_Results_Example.txt"); string results = File.ReadAllText(resultsPath); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteMetricsParserTests.cs index be11eac5e2..c83caa3f1f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteMetricsParserTests.cs @@ -90,7 +90,7 @@ public void LatteParserThrowsIfTheExpectedLatencyHistogramMeasurementsAreNotDefi private static string GetFileContents(string fileName) { - string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "Latte", fileName); + string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "Latte", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteServerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteServerExecutorTests.cs index 0da8240f74..a01ca710a9 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteServerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/Latte/LatteServerExecutorTests.cs @@ -23,7 +23,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LatteServerExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LatteExecutorTests2), "Examples", "Latte"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LatteExecutorTests2), "test_examples", "Latte"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSClientExecutorTests.cs index efa0566202..d9c725f31e 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSClientExecutorTests.cs @@ -49,7 +49,7 @@ public void SetupTest() this.mockFixture.Parameters["ConfidenceLevel"] = "99"; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "NCPS", "NCPS_Example_Results_Server.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "NCPS", "NCPS_Example_Results_Server.txt"); string results = File.ReadAllText(resultsPath); this.mockFixture.Process.StandardOutput.Append(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSMetricsParserTests.cs index 858b2d5171..c26277126d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSMetricsParserTests.cs @@ -183,7 +183,7 @@ public void NcpsParserHandlesDifferentConfidenceLevels() private static string GetFileContents(string fileName) { - string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "NCPS", fileName); + string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "NCPS", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSServerExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSServerExecutorTests.cs index c4b915e6a6..bc97b447fa 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSServerExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NCPS/NCPSServerExecutorTests.cs @@ -24,7 +24,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NCPSServerExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "Examples", "NCPS"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "test_examples", "NCPS"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpExecutorTests.cs index 41d581f030..adb6259a0c 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpExecutorTests.cs @@ -24,7 +24,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NTttcpExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests), "Examples", "NTttcp"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests), "test_examples", "NTttcp"); private MockFixture mockFixture; private DependencyPath mockPackage; @@ -114,7 +114,7 @@ public async Task NTttcpExecutorClientExecutesAsExpected(bool? noSyncEnabled) if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -224,7 +224,7 @@ public async Task NTttcpExecutorClientWillNotExitOnCancellationRequestUntilTheRe if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -250,7 +250,7 @@ public async Task NTttcpExecutorServerExecutesAsExpected() this.mockFixture.SystemManagement.SetupGet(obj => obj.AgentId).Returns(agentId); string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "NTttcp", "ServerOutput.xml"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "NTttcp", "ServerOutput.xml"); string results = File.ReadAllText(resultsPath); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) @@ -281,7 +281,7 @@ public async Task NTttcpExecutorServerExecutesAsExpected() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -323,7 +323,7 @@ public async Task NTttcpExecutorExecutesTheExpectedCommandToExecuteSysctl() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpFullDuplexTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpFullDuplexTests.cs index 8159d84c87..d8c046c695 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpFullDuplexTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpFullDuplexTests.cs @@ -25,7 +25,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NTttcpFullDuplexTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpFullDuplexTests), "Examples", "NTttcp"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpFullDuplexTests), "test_examples", "NTttcp"); private MockFixture mockFixture; private DependencyPath mockPackage; @@ -170,7 +170,7 @@ public async Task NTttcpFullDuplexClientExecutesBothSendAndReceiveProcessesOnLin if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -260,7 +260,7 @@ public async Task NTttcpFullDuplexClientUsesCorrectSendCommandLineOnLinux() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -344,7 +344,7 @@ public async Task NTttcpFullDuplexUsesSeparateResultsFilesForSendAndReceive() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -376,7 +376,7 @@ public async Task NTttcpFullDuplexServerExecutesBothSendAndReceiveProcesses() string resultsPath = Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "NTttcp", "ServerOutput.xml"); + "test_examples", "NTttcp", "ServerOutput.xml"); string results = File.ReadAllText(resultsPath); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) @@ -403,7 +403,7 @@ public async Task NTttcpFullDuplexServerExecutesBothSendAndReceiveProcesses() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } @@ -461,7 +461,7 @@ public async Task NTttcpHalfDuplexModeExecutesSingleProcessAsExpected() if (file.Contains("sysctl")) { string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "Examples", "NTttcp", "sysctlExampleOutput.txt")); + string standardOutput = File.ReadAllText(Path.Combine(currentDirectory, "test_examples", "NTttcp", "sysctlExampleOutput.txt")); process.StandardOutput.Append(standardOutput); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpMetricsParserTests.cs index 865761c3b3..47a4db0306 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/NTttcpMetricsParserTests.cs @@ -256,7 +256,7 @@ public void NTttcpMetricsParserParsesExpectedMetrics_Anomaly_1_Very_Large_Buffer private static string GetFileContents(string fileName) { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "NTttcp", fileName); + string outputPath = Path.Combine(workingDirectory, "test_examples", "NTttcp", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/SysctlParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/SysctlParserTests.cs index b487d2210d..9d317fe557 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/SysctlParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/NTttcp/SysctlParserTests.cs @@ -13,7 +13,7 @@ class SysctlParserTests { private static readonly string ExamplesDirectory = Path.Combine( Path.GetDirectoryName(Assembly.GetAssembly(typeof(SysctlParserTests)).Location), - "Examples", + "test_examples", "NTttcp"); [Test] diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfExecutorTests.cs index 7b93ccc32c..a3d2d35de2 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfExecutorTests.cs @@ -46,7 +46,7 @@ public void SetupTest() this.mockFixture.Parameters["ConfidenceLevel"] = "99"; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "SockPerf", "SockPerfClientExample1.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "SockPerf", "SockPerfClientExample1.txt"); string results = File.ReadAllText(resultsPath); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfMetricsParserTests.cs index e2a0a2afa4..7db6a8b91a 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network/SockPerf/SockPerfMetricsParserTests.cs @@ -29,7 +29,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SockPerf"); + return Path.Combine(workingDirectory, "test_examples", "SockPerf"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSClientExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSClientExecutorTests2.cs index 8f0bec8161..d845e48af4 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSClientExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSClientExecutorTests2.cs @@ -24,7 +24,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class CPSClientExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "Examples", "CPS"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "test_examples", "CPS"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSExecutorTests2.cs index 97f2b113b5..6a2e2d81f6 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSExecutorTests2.cs @@ -22,7 +22,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class CPSExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "Examples", "CPS"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "test_examples", "CPS"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSMetricsParserTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSMetricsParserTests2.cs index 157d793aa2..a8515ece14 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSMetricsParserTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSMetricsParserTests2.cs @@ -106,7 +106,7 @@ public void CpsParserParsesExpectedMetricsFromValidClientSideResults() private static string GetFileContents(string fileName) { - string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "CPS", fileName); + string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "CPS", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSServerExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSServerExecutorTests2.cs index 0a88a90399..e9fa669010 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSServerExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/CPS/CPSServerExecutorTests2.cs @@ -26,7 +26,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class CPSServerExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(CPSServerExecutorTests2), "Examples", "CPS"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(CPSServerExecutorTests2), "test_examples", "CPS"); private MockFixture mockFixture; private DependencyPath mockPath; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteClientExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteClientExecutorTests2.cs index 5dba1c3733..078ec04bcb 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteClientExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteClientExecutorTests2.cs @@ -25,7 +25,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LatteClientExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "Examples", "Latte"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "test_examples", "Latte"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteExecutorTests2.cs index 40352989b2..383da351b4 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteExecutorTests2.cs @@ -23,7 +23,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LatteExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LatteExecutorTests2), "Examples", "Latte"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LatteExecutorTests2), "test_examples", "Latte"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteMetricsParserTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteMetricsParserTests2.cs index 9ea366b97a..41a474f455 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteMetricsParserTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteMetricsParserTests2.cs @@ -90,7 +90,7 @@ public void LatteParserThrowsIfTheExpectedLatencyHistogramMeasurementsAreNotDefi private static string GetFileContents(string fileName) { - string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "Latte", fileName); + string outputPath = Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "Latte", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteServerExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteServerExecutorTests2.cs index dcd6f419f9..818c42ef4d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteServerExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/Latte/LatteServerExecutorTests2.cs @@ -19,7 +19,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class LatteServerExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "Examples", "Latte"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "test_examples", "Latte"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpClientExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpClientExecutorTests2.cs index 8e75e989ec..cf99daf7e0 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpClientExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpClientExecutorTests2.cs @@ -25,7 +25,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NTttcpClientExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "Examples", "NTttcp"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "test_examples", "NTttcp"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpExecutorTests2.cs index 31319f9836..a17abf2023 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpExecutorTests2.cs @@ -23,7 +23,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NTttcpExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "Examples", "NTttcp"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpExecutorTests2), "test_examples", "NTttcp"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpMetricsParserTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpMetricsParserTests2.cs index 0745cc7916..1febd1f01b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpMetricsParserTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpMetricsParserTests2.cs @@ -232,7 +232,7 @@ public void NTttcpMetricsParserParsesExpectedMetadataFromServerSideResults(strin private static string GetFileContents(string fileName) { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "NTttcp", fileName); + string outputPath = Path.Combine(workingDirectory, "test_examples", "NTttcp", fileName); return File.ReadAllText(outputPath); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpServerExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpServerExecutorTests2.cs index 70577f3dee..061a56f3a4 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpServerExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NTttcp/NTttcpServerExecutorTests2.cs @@ -26,7 +26,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class NTttcpServerExecutorTests2 { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpServerExecutorTests2), "Examples", "NTttcp"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(NTttcpServerExecutorTests2), "test_examples", "NTttcp"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NetworkingWorkloadProxyTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NetworkingWorkloadProxyTests.cs index dfa1295f6d..350831ac28 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NetworkingWorkloadProxyTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/NetworkingWorkloadProxyTests.cs @@ -54,7 +54,7 @@ public void SetupDefaultMockApiBehavior(PlatformID platformID) this.mockFixture.Parameters["PackageName"] = "Networking"; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "CPS", "CPS_Example_Results_Server.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "CPS", "CPS_Example_Results_Server.txt"); string results = File.ReadAllText(resultsPath); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfClientExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfClientExecutorTests2.cs index dd6e85facd..1b2d0cf147 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfClientExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfClientExecutorTests2.cs @@ -43,7 +43,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture) this.Parameters["MessagesPerSecond"] = "max"; this.Parameters["ConfidenceLevel"] = "99"; - string exampleResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); + string exampleResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); SockPerfWorkloadState executionStartedState = new SockPerfWorkloadState(ClientServerStatus.ExecutionStarted); Item expectedStateItem = new Item(nameof(SockPerfWorkloadState), executionStartedState); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfExecutorTests2.cs index 8bd42b6ce2..9d9355503f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfExecutorTests2.cs @@ -52,7 +52,7 @@ private void SetupTest(PlatformID platform = PlatformID.Unix, Architecture archi this.Parameters["PackageName"] = "sockperf"; this.Parameters["Protocol"] = "TCP"; - string exampleResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); + string exampleResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); this.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(exampleResults); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfMetricsParserTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfMetricsParserTests2.cs index 42bb84521f..46a1b4ec76 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfMetricsParserTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfMetricsParserTests2.cs @@ -29,7 +29,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SockPerf"); + return Path.Combine(workingDirectory, "test_examples", "SockPerf"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfServerExecutorTests2.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfServerExecutorTests2.cs index d009c3f342..b743e4c2a5 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfServerExecutorTests2.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Network2/SockPerf/SockPerfServerExecutorTests2.cs @@ -38,7 +38,7 @@ public void SetupTest(PlatformID platformID, Architecture architecture) this.Parameters["MessagesPerSecond"] = "max"; this.Parameters["ConfidenceLevel"] = "99"; - string exampleResults = MockFixture.ReadFile(MockFixture.ExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); + string exampleResults = MockFixture.ReadFile(MockFixture.TestExamplesDirectory, "SockPerf", "SockPerfClientExample1.txt"); this.FileSystem.Setup(rt => rt.File.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(exampleResults); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Nginx/NginxServerExecutorTest.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Nginx/NginxServerExecutorTest.cs index b8fb8ebd14..25f534971f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Nginx/NginxServerExecutorTest.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Nginx/NginxServerExecutorTest.cs @@ -387,7 +387,7 @@ public async Task NginxServerExecutorRunsAsExpected(PlatformID platform, Archite else if (arguments == "nginx -V") { nginxServiceCalls++; - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Nginx"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Nginx"); string outputPath = Path.Combine(examplesDirectory, @"NginxVersionExample.txt"); string rawText = File.ReadAllText(outputPath); this.memoryProcess.StandardError = new ConcurrentBuffer(new StringBuilder(rawText)); @@ -476,7 +476,7 @@ public void NginxServerExecutorWillResetServerIfFailure(PlatformID platform, Arc public async Task NginxExecutorParsesNginxVersion(PlatformID platform, Architecture architecture) { this.mockFixture.Setup(platform, architecture, nameof(State)); - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Nginx"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Nginx"); string outputPath = Path.Combine(examplesDirectory, @"NginxVersionExample.txt"); string rawText = File.ReadAllText(outputPath); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMExecutorTests.cs index 43a5d294d0..4f4a7253f2 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMExecutorTests.cs @@ -207,7 +207,7 @@ private void SetupDefaultMockBehavior(PlatformID platform = PlatformID.Unix, Arc string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); this.currentDirectoryPath = new DependencyPath("OpenFOAM", currentDirectory); - string resultsPath = this.fixture.PlatformSpecifics.Combine(this.currentDirectoryPath.Path, "Examples","OpenFOAM", "OpenFOAMResultsExample.txt"); + string resultsPath = this.fixture.PlatformSpecifics.Combine(this.currentDirectoryPath.Path, "test_examples","OpenFOAM", "OpenFOAMResultsExample.txt"); this.rawString = File.ReadAllText(resultsPath); this.fixture.FileSystem.Setup(fe => fe.File.Exists(null)).Returns(false); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMMetricsParserTests.cs index 01cc296d4b..87bbca789d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenFOAM/OpenFOAMMetricsParserTests.cs @@ -26,7 +26,7 @@ class OpenFOAMMetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "OpenFOAM", "OpenFOAMResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "OpenFOAM", "OpenFOAMResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new OpenFOAMMetricsParser(this.rawText); } @@ -50,7 +50,7 @@ public void OpenFOAMResultsParserCreatesTheExpectedMetricsFromResults() public void OpenFOAMResultsParserThrowsWhenInvalidResultsAreProvided() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string incorrectOpenFOAMoutputPath = Path.Combine(workingDirectory, "Examples", "OpenFOAM", "OpenFOAMResultsInvalidExample.txt"); + string incorrectOpenFOAMoutputPath = Path.Combine(workingDirectory, "test_examples", "OpenFOAM", "OpenFOAMResultsInvalidExample.txt"); this.rawText = File.ReadAllText(incorrectOpenFOAMoutputPath); this.testParser = new OpenFOAMMetricsParser(this.rawText); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslExecutorTests.cs index 710f2189a8..25712c6162 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslExecutorTests.cs @@ -10,12 +10,11 @@ namespace VirtualClient.Actions.CpuPerformance using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; - using VirtualClient.Common; using Moq; using NUnit.Framework; - using VirtualClient.Actions.Properties; - using VirtualClient.Contracts; + using VirtualClient.Common; using VirtualClient.Common.Telemetry; + using VirtualClient.Contracts; [TestFixture] [Category("Unit")] @@ -345,7 +344,7 @@ private void SetupDefaultBehaviors(PlatformID platform = PlatformID.Unix, Archit // result. if (process.IsMatch("openssl(.exe)* speed")) { - process.StandardOutput.Append(TestResources.Results_OpenSSL_speed); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("openssl", "Results_OpenSSL_speed.txt")); } }; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslMetricsParserTests.cs index 036ea8834e..b6107c40f8 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/OpenSslMetricsParserTests.cs @@ -26,7 +26,7 @@ public void SetupFixture() { OpenSslMetricsParserTests.examplesDir = Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "OpenSSL"); + "test_examples", "OpenSSL"); } catch (FileNotFoundException exc) { diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/TlsOpenSslClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/TlsOpenSslClientExecutorTests.cs index f7eb88be93..864b0539df 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/TlsOpenSslClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/OpenSSL/TlsOpenSslClientExecutorTests.cs @@ -7,14 +7,11 @@ namespace VirtualClient.Actions using System.Collections.Generic; using System.IO; using System.Linq; - using System.Net; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; - using VirtualClient.Common; using Moq; using NUnit.Framework; - using VirtualClient.Actions.Properties; using VirtualClient.Common.Telemetry; using VirtualClient.Contracts; @@ -73,7 +70,7 @@ public void CaptureMetrics_LogsMetricsOnSuccess() Assert.IsNotNull(executor); var process = this.fixture.CreateProcess("openssl", "s_time ...", "/tmp"); process.ExitCode = 0; - process.StandardOutput.Append(TestResources.Results_OpenSSL_stime); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("openssl", "Results_OpenSSL_stime.txt")); var method = typeof(TlsOpenSslClientExecutor).GetMethod("CaptureMetrics", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); @@ -122,7 +119,7 @@ private void SetupEnvironment(PlatformID platform = PlatformID.Unix, Architectur // result. if (process.IsMatch("openssl s_time")) { - process.StandardOutput.Append(TestResources.Results_OpenSSL_stime); + process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("openssl", "Results_OpenSSL_stime.txt")); } }; } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pbzip2MetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pbzip2MetricsParserTests.cs index ef4925dba3..3cf276e221 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pbzip2MetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pbzip2MetricsParserTests.cs @@ -26,7 +26,7 @@ class Pbzip2MetricsParserTests public void Setup() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Pbzip2", "Pbzip2ResultsExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Pbzip2", "Pbzip2ResultsExample.txt"); this.rawText = File.ReadAllText(outputPath); } @@ -66,7 +66,7 @@ public void Pbzip2ResultsParserCreatesTheExpectedMetricsFromResults(bool compres public void Pbzip2ResultsParserThrowsWhenInvalidResultsAreProvided(bool compression) { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string incorrectPbzip2outputPath = Path.Combine(workingDirectory, "Examples", "Pbzip2", "Pbzip2ResultsInvalidExample.txt"); + string incorrectPbzip2outputPath = Path.Combine(workingDirectory, "test_examples", "Pbzip2", "Pbzip2ResultsInvalidExample.txt"); this.rawText = File.ReadAllText(incorrectPbzip2outputPath); this.testParser = new Pbzip2MetricsParser(this.rawText, compression); SchemaException exception = Assert.Throws(() => this.testParser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pzip2ExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pzip2ExecutorTests.cs index e4990431a3..467eec5c28 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pzip2ExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Pbzip2/Pzip2ExecutorTests.cs @@ -55,7 +55,7 @@ public void SetupDefaultBehavior() }; string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory, "Examples", "Pbzip2", "Pbzip2ResultsExample.txt"); + string resultsPath = Path.Combine(currentDirectory, "test_examples", "Pbzip2", "Pbzip2ResultsExample.txt"); string results = File.ReadAllText(resultsPath); this.defaultOutput.Clear(); this.defaultOutput.Append(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95ExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95ExecutorTests.cs index 371d3a8313..e3ddb9c75a 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95ExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95ExecutorTests.cs @@ -18,7 +18,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class Prime95ExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(Prime95ExecutorTests), "Examples", "Prime95"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(Prime95ExecutorTests), "test_examples", "Prime95"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95MetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95MetricsParserTests.cs index d582f87672..cdfe5d7c1b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95MetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Prime95/Prime95MetricsParserTests.cs @@ -28,7 +28,7 @@ public void Setup() [Test] public void Prime95ParserVerifyMetricsForPassResults() { - string resultsPath = Path.Combine(this.workingDirectory, "Examples", "Prime95", "prime95_results_example_pass.txt"); + string resultsPath = Path.Combine(this.workingDirectory, "test_examples", "Prime95", "prime95_results_example_pass.txt"); string rawText = File.ReadAllText(resultsPath); this.testParser = new Prime95MetricsParser(rawText); IList metrics = this.testParser.Parse(); @@ -41,7 +41,7 @@ public void Prime95ParserVerifyMetricsForPassResults() [Test] public void Prime95ParserVerifyMetricsForFailedResults() { - string resultsPath = Path.Combine(this.workingDirectory, "Examples", "Prime95", "prime95_results_example_fail.txt"); + string resultsPath = Path.Combine(this.workingDirectory, "test_examples", "Prime95", "prime95_results_example_fail.txt"); string rawText = File.ReadAllText(resultsPath); this.testParser = new Prime95MetricsParser(rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.Designer.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.Designer.cs deleted file mode 100644 index 745e850aa5..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.Designer.cs +++ /dev/null @@ -1,224 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace VirtualClient.Actions.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class TestResources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal TestResources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VirtualClient.Actions.Properties.TestResources", typeof(TestResources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Input parameters: - /// - /// timespan: 1 - /// ------------- - /// duration: 30s - /// warm up time: 15s - /// cool down time: 0s - /// measuring latency - /// gathering IOPS at intervals of 1000ms - /// random seed: 0 - /// path: 'diskspd.dat' - /// think time: 0ms - /// burst size: 0 - /// software cache disabled - /// hardware write cache disabled, writethrough on - /// performing mix test (read/write ratio: 70/30) - /// [rest of string was truncated]";. - /// - internal static string Results_DiskSpd_Text { - get { - return ResourceManager.GetString("Results_DiskSpd_Text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <Results> - /// <System> - /// <ComputerName>QuickTest2</ComputerName> - /// <Tool> - /// <Version>2.0.21a</Version> - /// <VersionDate>2018/9/21</VersionDate> - /// </Tool> - /// <RunTime>2021/04/14 23:25:42 UTC</RunTime> - /// <ProcessorTopology> - /// <Group Group="0" MaximumProcessors="4" ActiveProcessors="4" ActiveProcessorMask="0xf"/> - /// <Node Node="0" Group="0" Processors="0xf"/> - /// <Socket> - /// <Group Group="0" Processors="0xf"/> - /// [rest of string was truncated]";. - /// - internal static string Results_DiskSpd_Xml { - get { - return ResourceManager.GetString("Results_DiskSpd_Xml", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to fio: pid=8281, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character. - /// - internal static string Results_FIO_Error_1 { - get { - return ResourceManager.GetString("Results_FIO_Error_1", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to fio: pid=4879, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 1 - ///fio: pid=4904, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 2 - ///fio: pid=4903, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 3 - ///fio: pid=4888, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 4 - ///. - /// - internal static string Results_FIO_Error_2 { - get { - return ResourceManager.GetString("Results_FIO_Error_2", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to { - /// "fio version" : "fio-3.26", - /// "timestamp" : 1618699271, - /// "timestamp_ms" : 1618699271417, - /// "time" : "Sat Apr 17 22:41:11 2021", - /// "jobs" : [ - /// { - /// "jobname" : "fio_randrw_1GB_4k_d1_th1_direct", - /// "groupid" : 0, - /// "error" : 0, - /// "eta" : 0, - /// "elapsed" : 122, - /// "job options" : { - /// "name" : "fio_randrw_1GB_4k_d1_th1_direct", - /// "ioengine" : "libaio", - /// "size" : "1GB", - /// "numjobs" : "1", - /// "rw" : "randwrite", - /// "bs" : "4k", - /// [rest of string was truncated]";. - /// - internal static string Results_FIO_JSON { - get { - return ResourceManager.GetString("Results_FIO_JSON", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to sha256: verify failed at file fio_randwrite_1GB_32k_d1_th1_direct.0.0 offset 668565504, length 32768 (requested block: offset=668565504, length=32768, flags=88) - /// Expected CRC: d8f4f08bfc814742430981c12ff93a1628a18e73657e44128000000000000000000000000000000000000000000000000000000000000000c0fc030000000000 - /// Received CRC: a900d077f2091480430981c12ff93a1628a18e73657e44128000000000000000000000000000000000000000000000000000000000000000c0fc030000000000 - ///. - /// - internal static string Results_FIO_Verification_Error_1 { - get { - return ResourceManager.GetString("Results_FIO_Verification_Error_1", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to fio_randrw_1GB_4k_d1_th1_direct: (g=0): rw=randrw, bs=(R) 64.0KiB-64.0KiB, (W) 64.0KiB-64.0KiB, (T) 64.0KiB-64.0KiB, ioengine=libaio, iodepth=16 - ///... - ///fio-3.26-19-ge7e53 - ///Starting 32 threads - ///fio_randrw_1GB_4k_d1_th1_direct: Laying out IO file (1 file / 250MiB) - ///verify: bad header numberio 3932, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 229900288, length 65536 (requested block: offset=229900288, length=65536) - ///verify: bad header numberio [rest of string was truncated]";. - /// - internal static string Results_FIO_Verification_Error_2 { - get { - return ResourceManager.GetString("Results_FIO_Verification_Error_2", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to version: 3.0.0-beta3-dev - ///built on: built on: Thu Aug 5 18:45:56 2021 UTC - ///options:bn(64,64) - ///compiler: gcc -fPIC -pthread -m64 -Wa,--noexecstack -Wall -O3 -DOPENSSL_USE_NODELETE -DL_ENDIAN -DOPENSSL_PIC -DOPENSSL_BUILDING_OPENSSL -DNDEBUG - ///CPUINFO: OPENSSL_ia32cap=0xfeda32235f8bffff:0x405f46f1bf2fb9 - ///The 'numbers' are in 1000s of bytes per second processed. - ///type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes 16384 bytes - ///AES-256-CBC 1109022.36k 1209391.13k 1232451.87k 12 [rest of string was truncated]";. - /// - internal static string Results_OpenSSL_speed { - get { - return ResourceManager.GetString("Results_OpenSSL_speed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Collecting connection statistics for 5 seconds - ///***************** - /// - ///17 connections in 1.54s; 11.04 connections/user sec, bytes read 9126806252 - ///17 connections in 6 real seconds, 536870956 bytes read per connection - /// - /// - ///Now timing with session id reuse. - ///starting - ///rrrrrrrrrrrrrrrrr - /// - ///17 connections in 1.54s; 11.04 connections/user sec, bytes read 9126806252 - ///17 connections in 6 real seconds, 536870956 bytes read per connection. - /// - internal static string Results_OpenSSL_stime { - get { - return ResourceManager.GetString("Results_OpenSSL_stime", resourceCulture); - } - } - } -} diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.resx b/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.resx deleted file mode 100644 index e3cf2ace97..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Properties/TestResources.resx +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\Results-OpenSSL-stime.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\Results_DiskSpd_Text.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_DiskSpd_Xml.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_FIO_Error_1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_FIO_Error_2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_FIO_JSON.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_FIO_Verification_Error_1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Results_FIO_Verification_Error_2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\Results-OpenSSL-speed.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkClientExecutorTests.cs index c95a0a2598..f56fd6cf69 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkClientExecutorTests.cs @@ -50,7 +50,7 @@ public void SetupDefaults() .ReturnsAsync(this.mockPackage); this.fixture.FileSystem.Setup(fe => fe.File.Exists(It.IsAny())).Returns(true); - this.results = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Examples", "Redis", "RedisBenchmarkResults.txt")); + this.results = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_examples", "Redis", "RedisBenchmarkResults.txt")); this.fixture.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())) .ReturnsAsync(this.results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkMetricsParserTests.cs index e77b498aa7..31eed0f537 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Redis/RedisBenchmarkMetricsParserTests.cs @@ -17,7 +17,7 @@ internal class RedisBenchmarkMetricsParserTests [Test] public void RedisBenchmarkMetricsParserParsesTheExpectedMetricsFromResultsCorrectly_1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "Examples", @"Redis\RedisBenchmarkResults.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "test_examples", @"Redis\RedisBenchmarkResults.txt")); var parser = new RedisBenchmarkMetricsParser(results); IList metrics = parser.Parse(); @@ -187,7 +187,7 @@ public void RedisBenchmarkMetricsParserParsesTheExpectedMetricsFromResultsCorrec [Test] public void RedisBenchmarkMetricsParserParsesTheExpectedMetricsFromResultsCorrectly_2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "Examples", @"Redis\RedisBenchmarkResults_2.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "test_examples", @"Redis\RedisBenchmarkResults_2.txt")); var parser = new RedisBenchmarkMetricsParser(results); IList metrics = parser.Parse(); @@ -213,7 +213,7 @@ public void RedisBenchmarkMetricsParserParsesTheExpectedMetricsFromResultsCorrec [Test] public void RedisBenchmarkMetricsParserAssociatesTheCorrectRelativityToTheMetrics() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "Examples", @"Redis\RedisBenchmarkResults.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "test_examples", @"Redis\RedisBenchmarkResults.txt")); var parser = new RedisBenchmarkMetricsParser(results); IList metrics = parser.Parse(); @@ -230,7 +230,7 @@ public void RedisBenchmarkMetricsParserAssociatesTheCorrectRelativityToTheMetric [Test] public void RedisBenchmarkMetricsParserThrowIfInvalidOutputFormat_1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "Examples", @"Redis\RedisBenchmarkResults.txt")).Substring(0, 100); // invalid results + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "test_examples", @"Redis\RedisBenchmarkResults.txt")).Substring(0, 100); // invalid results var parser = new RedisBenchmarkMetricsParser(results); WorkloadResultsException exception = Assert.Throws(() => parser.Parse()); @@ -240,7 +240,7 @@ public void RedisBenchmarkMetricsParserThrowIfInvalidOutputFormat_1() [Test] public void RedisBenchmarkMetricsParserThrowIfInvalidOutputFormat_2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "Examples", @"Redis\RedisBenchmarkResults.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(RedisBenchmarkMetricsParserTests), "test_examples", @"Redis\RedisBenchmarkResults.txt")); var parser = new RedisBenchmarkMetricsParser(string.Join(Environment.NewLine, results.Split(Environment.NewLine).Take(1))); // headers exist but no measurements within. WorkloadResultsException exception = Assert.Throws(() => parser.Parse()); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_1.txt b/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_1.txt deleted file mode 100644 index 89c4be8212..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_1.txt +++ /dev/null @@ -1 +0,0 @@ -fio: pid=8281, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_2.txt b/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_2.txt deleted file mode 100644 index fe51dc3566..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Error_2.txt +++ /dev/null @@ -1,4 +0,0 @@ -fio: pid=4879, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 1 -fio: pid=4904, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 2 -fio: pid=4903, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 3 -fio: pid=4888, err=84/file:io_u.c:2141, func=io_u_queued_complete, error=Invalid or incomplete multibyte or wide character 4 diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_1.txt b/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_1.txt deleted file mode 100644 index 2f63bdcdff..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_1.txt +++ /dev/null @@ -1,3 +0,0 @@ -sha256: verify failed at file fio_randwrite_1GB_32k_d1_th1_direct.0.0 offset 668565504, length 32768 (requested block: offset=668565504, length=32768, flags=88) - Expected CRC: d8f4f08bfc814742430981c12ff93a1628a18e73657e44128000000000000000000000000000000000000000000000000000000000000000c0fc030000000000 - Received CRC: a900d077f2091480430981c12ff93a1628a18e73657e44128000000000000000000000000000000000000000000000000000000000000000c0fc030000000000 diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_2.txt b/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_2.txt deleted file mode 100644 index 6be07c2034..0000000000 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Resources/Results_FIO_Verification_Error_2.txt +++ /dev/null @@ -1,133 +0,0 @@ -fio_randrw_1GB_4k_d1_th1_direct: (g=0): rw=randrw, bs=(R) 64.0KiB-64.0KiB, (W) 64.0KiB-64.0KiB, (T) 64.0KiB-64.0KiB, ioengine=libaio, iodepth=16 -... -fio-3.26-19-ge7e53 -Starting 32 threads -fio_randrw_1GB_4k_d1_th1_direct: Laying out IO file (1 file / 250MiB) -verify: bad header numberio 3932, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 229900288, length 65536 (requested block: offset=229900288, length=65536) -verify: bad header numberio 3835, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 160694272, length 65536 (requested block: offset=160694272, length=65536) -verify: bad header numberio 3914, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 12845056, length 65536 (requested block: offset=12845056, length=65536) -verify: bad header numberio 3886, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 186843136, length 65536 (requested block: offset=186843136, length=65536) -verify: bad header numberio 3813, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 161873920, length 65536 (requested block: offset=161873920, length=65536) -verify: bad header numberio 3870, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 109379584, length 65536 (requested block: offset=109379584, length=65536) -verify: bad header numberio 3910, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 216072192, length 65536 (requested block: offset=216072192, length=65536) -verify: bad header numberio 3504, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 125698048, length 65536 (requested block: offset=125698048, length=65536) -verify: bad header numberio 3927, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 169934848, length 65536 (requested block: offset=169934848, length=65536) -verify: bad header numberio 3784, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 245301248, length 65536 (requested block: offset=245301248, length=65536) -verify: bad header numberio 3845, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 175702016, length 65536 (requested block: offset=175702016, length=65536) -verify: bad header numberio 3787, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 184418304, length 65536 (requested block: offset=184418304, length=65536) -verify: bad header numberio 3812, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 142344192, length 65536 (requested block: offset=142344192, length=65536) -verify: bad header numberio 3922, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 222756864, length 65536 (requested block: offset=222756864, length=65536) -verify: bad header numberio 3887, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 5636096, length 65536 (requested block: offset=5636096, length=65536) -verify: bad header numberio 3641, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 130220032, length 65536 (requested block: offset=130220032, length=65536) -verify: bad header numberio 3574, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 46137344, length 65536 (requested block: offset=46137344, length=65536) -verify: bad header numberio 3909, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 201981952, length 65536 (requested block: offset=201981952, length=65536) -verify: bad header numberio 3949, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 135659520, length 65536 (requested block: offset=135659520, length=65536) -verify: bad header numberio 3840, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 239796224, length 65536 (requested block: offset=239796224, length=65536) -verify: bad header numberio 3940, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 251002880, length 65536 (requested block: offset=251002880, length=65536) -verify: bad header numberio 3762, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 111280128, length 65536 (requested block: offset=111280128, length=65536) -verify: bad header numberio 3983, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 159055872, length 65536 (requested block: offset=159055872, length=65536) -verify: bad header numberio 3739, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 142278656, length 65536 (requested block: offset=142278656, length=65536) -verify: bad header numberio 3968, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 37945344, length 65536 (requested block: offset=37945344, length=65536) -verify: bad header numberio 3527, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 257556480, length 65536 (requested block: offset=257556480, length=65536) -verify: bad header numberio 3957, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 22937600, length 65536 (requested block: offset=22937600, length=65536) -verify: bad header numberio 3936, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 196149248, length 65536 (requested block: offset=196149248, length=65536) -verify: bad header numberio 3942, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 221249536, length 65536 (requested block: offset=221249536, length=65536) -verify: bad header numberio 3903, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 137232384, length 65536 (requested block: offset=137232384, length=65536) -verify: bad header numberio 3884, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 19529728, length 65536 (requested block: offset=19529728, length=65536) -verify: bad header numberio 3845, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 25821184, length 65536 (requested block: offset=25821184, length=65536) -verify: bad header numberio 3773, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 36896768, length 65536 (requested block: offset=36896768, length=65536) -verify: bad header numberio 3946, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 231997440, length 65536 (requested block: offset=231997440, length=65536) -verify: bad header numberio 3963, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 146735104, length 65536 (requested block: offset=146735104, length=65536) -verify: bad header numberio 3641, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 60817408, length 65536 (requested block: offset=60817408, length=65536) -verify: bad header numberio 3554, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 150929408, length 65536 (requested block: offset=150929408, length=65536) -verify: bad header numberio 3985, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 232783872, length 65536 (requested block: offset=232783872, length=65536) -verify: bad header numberio 3855, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 22872064, length 65536 (requested block: offset=22872064, length=65536) -verify: bad header numberio 3845, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 121110528, length 65536 (requested block: offset=121110528, length=65536) -verify: bad header numberio 3831, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 194838528, length 65536 (requested block: offset=194838528, length=65536) -verify: bad header numberio 3638, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 64618496, length 65536 (requested block: offset=64618496, length=65536) -verify: bad header numberio 3898, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 249233408, length 65536 (requested block: offset=249233408, length=65536) -verify: bad header numberio 3759, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 217513984, length 65536 (requested block: offset=217513984, length=65536) -verify: bad header numberio 3543, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 30146560, length 65536 (requested block: offset=30146560, length=65536) -verify: bad header numberio 3941, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 254083072, length 65536 (requested block: offset=254083072, length=65536) -verify: bad header numberio 3848, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 157220864, length 65536 (requested block: offset=157220864, length=65536) -verify: bad header numberio 3706, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 207749120, length 65536 (requested block: offset=207749120, length=65536) -verify: bad header numberio 3849, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 121241600, length 65536 (requested block: offset=121241600, length=65536) -verify: bad header numberio 3813, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 41484288, length 65536 (requested block: offset=41484288, length=65536) -verify: bad header numberio 3782, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 174653440, length 65536 (requested block: offset=174653440, length=65536) -verify: bad header numberio 3674, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 180420608, length 65536 (requested block: offset=180420608, length=65536) -verify: bad header numberio 3748, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 230621184, length 65536 (requested block: offset=230621184, length=65536) -verify: bad header numberio 3458, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 221970432, length 65536 (requested block: offset=221970432, length=65536) -verify: bad header numberio 3904, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 17891328, length 65536 (requested block: offset=17891328, length=65536) -verify: bad header numberio 3911, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 136511488, length 65536 (requested block: offset=136511488, length=65536) -verify: bad header numberio 3941, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 52035584, length 65536 (requested block: offset=52035584, length=65536) -verify: bad header numberio 3966, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 105775104, length 65536 (requested block: offset=105775104, length=65536) -verify: bad header numberio 3789, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 45154304, length 65536 (requested block: offset=45154304, length=65536) -verify: bad header numberio 3991, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 154271744, length 65536 (requested block: offset=154271744, length=65536) -verify: bad header numberio 3308, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 105578496, length 65536 (requested block: offset=105578496, length=65536) -verify: bad header numberio 3768, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 89784320, length 65536 (requested block: offset=89784320, length=65536) -verify: bad header numberio 3867, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 102957056, length 65536 (requested block: offset=102957056, length=65536) -verify: bad header numberio 3930, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 207159296, length 65536 (requested block: offset=207159296, length=65536) -verify: bad header numberio 3901, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 119275520, length 65536 (requested block: offset=119275520, length=65536) -verify: bad header numberio 3637, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 6160384, length 65536 (requested block: offset=6160384, length=65536) -verify: bad header numberio 3949, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 117178368, length 65536 (requested block: offset=117178368, length=65536) -verify: bad header numberio 3663, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 199426048, length 65536 (requested block: offset=199426048, length=65536) -verify: bad header numberio 3998, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 80871424, length 65536 (requested block: offset=80871424, length=65536) -verify: bad header numberio 3834, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 110166016, length 65536 (requested block: offset=110166016, length=65536) -verify: bad header numberio 3958, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 137756672, length 65536 (requested block: offset=137756672, length=65536) -verify: bad header numberio 3735, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 123928576, length 65536 (requested block: offset=123928576, length=65536) -verify: bad header numberio 3837, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 77791232, length 65536 (requested block: offset=77791232, length=65536) -verify: bad header numberio 3895, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 166068224, length 65536 (requested block: offset=166068224, length=65536) -verify: bad header numberio 3814, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 208601088, length 65536 (requested block: offset=208601088, length=65536) -verify: bad header numberio 3738, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 101646336, length 65536 (requested block: offset=101646336, length=65536) -verify: bad header numberio 3856, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 247988224, length 65536 (requested block: offset=247988224, length=65536) -verify: bad header numberio 3957, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 19922944, length 65536 (requested block: offset=19922944, length=65536) -verify: bad header numberio 3911, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 12713984, length 65536 (requested block: offset=12713984, length=65536) -verify: bad header numberio 3909, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 69992448, length 65536 (requested block: offset=69992448, length=65536) -verify: bad header numberio 3786, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 88997888, length 65536 (requested block: offset=88997888, length=65536) -verify: bad header numberio 3807, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 207618048, length 65536 (requested block: offset=207618048, length=65536) -verify: bad header numberio 3852, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 72679424, length 65536 (requested block: offset=72679424, length=65536) -verify: bad header numberio 3802, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 93585408, length 65536 (requested block: offset=93585408, length=65536) -verify: bad header numberio 3958, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 104005632, length 65536 (requested block: offset=104005632, length=65536) -verify: bad header numberio 3850, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 188153856, length 65536 (requested block: offset=188153856, length=65536) -verify: bad header numberio 3632, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 174456832, length 65536 (requested block: offset=174456832, length=65536) -verify: bad header numberio 3838, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 33030144, length 65536 (requested block: offset=33030144, length=65536) -verify: bad header numberio 3975, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 156893184, length 65536 (requested block: offset=156893184, length=65536) -verify: bad header numberio 3792, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 29032448, length 65536 (requested block: offset=29032448, length=65536) -verify: bad header numberio 3985, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 149291008, length 65536 (requested block: offset=149291008, length=65536) -verify: bad header numberio 3980, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 145620992, length 65536 (requested block: offset=145620992, length=65536) -verify: bad header numberio 3998, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 165740544, length 65536 (requested block: offset=165740544, length=65536) -verify: bad header numberio 3954, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 152633344, length 65536 (requested block: offset=152633344, length=65536) -verify: bad header numberio 3953, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 145489920, length 65536 (requested block: offset=145489920, length=65536) -verify: bad header numberio 3928, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 85786624, length 65536 (requested block: offset=85786624, length=65536) -verify: bad header numberio 3882, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 160563200, length 65536 (requested block: offset=160563200, length=65536) -verify: bad header numberio 3808, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 236781568, length 65536 (requested block: offset=236781568, length=65536) -verify: bad header numberio 3967, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 70713344, length 65536 (requested block: offset=70713344, length=65536) -verify: bad header numberio 3725, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 114425856, length 65536 (requested block: offset=114425856, length=65536) -verify: bad header numberio 3937, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 168099840, length 65536 (requested block: offset=168099840, length=65536) -verify: bad header numberio 3904, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 54460416, length 65536 (requested block: offset=54460416, length=65536) -verify: bad header numberio 3897, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 126550016, length 65536 (requested block: offset=126550016, length=65536) -verify: bad header numberio 3680, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 164691968, length 65536 (requested block: offset=164691968, length=65536) -verify: bad header numberio 3940, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 10878976, length 65536 (requested block: offset=10878976, length=65536) -verify: bad header numberio 3945, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 78643200, length 65536 (requested block: offset=78643200, length=65536) -verify: bad header numberio 3765, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 221577216, length 65536 (requested block: offset=221577216, length=65536) -verify: bad header numberio 3967, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 195493888, length 65536 (requested block: offset=195493888, length=65536) -verify: bad header numberio 3903, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 251461632, length 65536 (requested block: offset=251461632, length=65536) -verify: bad header numberio 3849, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 122617856, length 65536 (requested block: offset=122617856, length=65536) -verify: bad header numberio 3974, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 52887552, length 65536 (requested block: offset=52887552, length=65536) -verify: bad header numberio 3735, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 244711424, length 65536 (requested block: offset=244711424, length=65536) -verify: bad header numberio 3699, wanted 4 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 125435904, length 65536 (requested block: offset=125435904, length=65536) -verify: bad header numberio 3831, wanted 13 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 90046464, length 65536 (requested block: offset=90046464, length=65536) -verify: bad header numberio 3955, wanted 5 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 145686528, length 65536 (requested block: offset=145686528, length=65536) -verify: bad header numberio 3948, wanted 6 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 28311552, length 65536 (requested block: offset=28311552, length=65536) -verify: bad header numberio 3754, wanted 8 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 253296640, length 65536 (requested block: offset=253296640, length=65536) -verify: bad header numberio 3792, wanted 11 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 236191744, length 65536 (requested block: offset=236191744, length=65536) -verify: bad header numberio 3823, wanted 9 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 129433600, length 65536 (requested block: offset=129433600, length=65536) -verify: bad header numberio 3776, wanted 15 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 137363456, length 65536 (requested block: offset=137363456, length=65536) -verify: bad header numberio 3910, wanted 14 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 218365952, length 65536 (requested block: offset=218365952, length=65536) -verify: bad header numberio 3684, wanted 10 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 245235712, length 65536 (requested block: offset=245235712, length=65536) -verify: bad header numberio 3687, wanted 0 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 98238464, length 65536 (requested block: offset=98238464, length=65536) -verify: bad header numberio 3978, wanted 2 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 158466048, length 65536 (requested block: offset=158466048, length=65536) -verify: bad header numberio 3953, wanted 3 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 128188416, length 65536 (requested block: offset=128188416, length=65536) -verify: bad header numberio 3962, wanted 1 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 73924608, length 65536 (requested block: offset=73924608, length=65536) -verify: bad header numberio 3917, wanted 12 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 34668544, length 65536 (requested block: offset=34668544, length=65536) -verify: bad header numberio 3688, wanted 7 at file /home/azureuser/VirtualClient.1.0.1673.1/content/linux-x64/remote_disk_1_1/xejahjpg.cjd offset 173342720, length 65536 (requested block: offset=173342720, length=65536) diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuMetricsParserTests.cs index 50cf1c9f83..8182946e4b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuMetricsParserTests.cs @@ -23,7 +23,7 @@ public class SpecCpuMetricsParserTests public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); @@ -64,7 +64,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); @@ -105,7 +105,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateCsvResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateBaseOnlyResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateBaseOnlyExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateBaseOnlyExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -131,7 +131,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateBaseOnlyResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateBaseOnlyCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateBaseExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateBaseExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); IList metrics = this.testParser.Parse(); @@ -157,7 +157,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpRateBaseOnlyCsvResult public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpRateResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); @@ -180,7 +180,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpRateResults public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpRateCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpRateExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpRateExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); @@ -203,7 +203,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpRateCsvResu public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateBaseOnlyResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntRateBaseOnlyExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntRateBaseOnlyExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -226,7 +226,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateBaseOnlyResults( public void SpecCpuMetricsParserParsesExpectedMetricsFromFpSpeedResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpSpeedExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpSpeedExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -260,7 +260,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpSpeedResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromFpSpeedCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpSpeedExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpSpeedExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); IList metrics = this.testParser.Parse(); @@ -294,7 +294,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromFpSpeedCsvResults() public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpSpeedResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpSpeedExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpSpeedExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); @@ -317,7 +317,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpSpeedResult public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpSpeedCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuFpSpeedExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuFpSpeedExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); @@ -340,7 +340,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromFpSpeedCsvRes public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntRateExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntRateExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -374,7 +374,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntRateExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntRateExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); IList metrics = this.testParser.Parse(); @@ -408,7 +408,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromIntRateCsvResults() public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntRateResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntRateExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntRateExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); @@ -431,7 +431,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntRateResult public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntRateCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntRateExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntRateExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); @@ -454,7 +454,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntRateCsvRes public void SpecCpuMetricsParserParsesExpectedMetricsFromIntSpeedResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntSpeedExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntSpeedExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); @@ -488,7 +488,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromIntSpeedResults() public void SpecCpuMetricsParserParsesExpectedMetricsFromIntSpeedCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntSpeedExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntSpeedExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); IList metrics = this.testParser.Parse(); @@ -522,7 +522,7 @@ public void SpecCpuMetricsParserParsesExpectedMetricsFromIntSpeedCsvResults() public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntSpeedResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntSpeedExample.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntSpeedExample.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); @@ -545,7 +545,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntSpeedResul public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntSpeedCsvResults() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "SpecCpuIntSpeedExample.csv"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "SpecCpuIntSpeedExample.csv"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText, csv: true); @@ -568,7 +568,7 @@ public void SpecCpuMetricsParserParsesExpectedBenchmarkMetadataFromIntSpeedCsvRe public void SpecCpuParserVerifyMetricsIntRateBaseWinArm64Incomplete() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SpecCpu", "intrate-base-win-arm64-1.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SpecCpu", "intrate-base-win-arm64-1.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecCpuMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJbbMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJbbMetricsParserTests.cs index 02fead80d3..f5d427ec85 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJbbMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJbbMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SPECjbb", "specjbb2015-C-20220301-00002", "report-00001", "logs"); + return Path.Combine(workingDirectory, "test_examples", "SPECjbb", "specjbb2015-C-20220301-00002", "report-00001", "logs"); } } @@ -46,7 +46,7 @@ public void SpecJbbParserVerifyMetrics() public void SpecJbbParserVerifyMissingMetrics() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "SPECjbb", "specjbbNanOutput1.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "SPECjbb", "specjbbNanOutput1.txt"); this.rawText = File.ReadAllText(outputPath); this.testParser = new SpecJbbMetricsParser(this.rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJvmMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJvmMetricsParserTests.cs index 1cd43eaa09..eda028ed92 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJvmMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecJvmMetricsParserTests.cs @@ -23,7 +23,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SPECjvm"); + return Path.Combine(workingDirectory, "test_examples", "SPECjvm"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewExecutorTests.cs index 9e8a2f8575..0ce8ec425b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewExecutorTests.cs @@ -180,7 +180,7 @@ private void SetupDefaultMockBehavior(PlatformID platform = PlatformID.Win32NT, this.mockSpecViewExePath = this.mockFixture.Combine(this.mockSpecViewExeDir, "RunViewperf.exe"); this.mockPstoolsExePath = this.mockFixture.Combine(this.mockPstoolsExeDir, "PsExec.exe"); - string mockResultPath = MockFixture.GetDirectory(typeof(SpecViewExecutorTests), "Examples", "SPECview", "3dsmaxResultCSV.csv"); + string mockResultPath = MockFixture.GetDirectory(typeof(SpecViewExecutorTests), "test_examples", "SPECview", "3dsmaxResultCSV.csv"); this.results = File.ReadAllText(mockResultPath); this.mockFixture.FileSystem.Setup(rt => rt.Directory.GetDirectories(this.mockSpecViewExeDir, "results_*", SearchOption.TopDirectoryOnly)).Returns(new string[] { mockResultPath }); this.mockFixture.FileSystem.Setup(rt => rt.File.ReadAllText(It.IsAny())).Returns(this.results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewMetricsParserTests.cs index 510acd5e5b..59ef554bc1 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecViewMetricsParserTests.cs @@ -19,7 +19,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SPECview"); + return Path.Combine(workingDirectory, "test_examples", "SPECview"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/JsonMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/JsonMetricsParserTests.cs index 9006dd0051..afe793d7a7 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/JsonMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/JsonMetricsParserTests.cs @@ -22,7 +22,7 @@ class JsonMetricsParserTests [Test] public void JsonMetricsParserVerifyMetricsForPassResults_Format1() { - string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "Examples", "ScriptExecutor", "validJsonExample.json"); + string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "test_examples", "ScriptExecutor", "validJsonExample.json"); string rawText = File.ReadAllText(resultsPath); this.testParser = new JsonMetricsParser(rawText, new InMemoryLogger(), EventContext.None); IList metrics = this.testParser.Parse(); @@ -36,7 +36,7 @@ public void JsonMetricsParserVerifyMetricsForPassResults_Format1() [Test] public void JsonMetricsParserVerifyMetricsForPassResults_ArrayFormat() { - string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "Examples", "ScriptExecutor", "validJsonExample_array.json"); + string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "test_examples", "ScriptExecutor", "validJsonExample_array.json"); string rawText = File.ReadAllText(resultsPath); this.testParser = new JsonMetricsParser(rawText, new InMemoryLogger(), EventContext.None); IList metrics = this.testParser.Parse(); @@ -71,7 +71,7 @@ public void JsonMetricsParserThrowsIfTheJsonArrayResultsHaveMisingMetricName() [Test] public void JsonMetricsParserThrowsIfTheJsonResultsHaveInvalidMetrics() { - string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "Examples", "ScriptExecutor", "invalidJsonExample.json"); + string resultsPath = MockFixture.GetDirectory(typeof(JsonMetricsParserTests), "test_examples", "ScriptExecutor", "invalidJsonExample.json"); string rawText = File.ReadAllText(resultsPath); this.testParser = new JsonMetricsParser(rawText, new InMemoryLogger(), EventContext.None); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PowershellExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PowershellExecutorTests.cs index dd8a81a171..6dda00052f 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PowershellExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PowershellExecutorTests.cs @@ -20,7 +20,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class PowerShellExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(PowerShellExecutorTests), "Examples", "ScriptExecutor"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(PowerShellExecutorTests), "test_examples", "ScriptExecutor"); private MockFixture fixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PythonExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PythonExecutorTests.cs index d10d6d8618..7393dbfdd4 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PythonExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/PythonExecutorTests.cs @@ -20,7 +20,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class PythonExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(PythonExecutorTests), "Examples", "ScriptExecutor"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(PythonExecutorTests), "test_examples", "ScriptExecutor"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/ScriptExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/ScriptExecutorTests.cs index 3b722bcac5..25fd0ec55b 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/ScriptExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/ScriptExecutor/ScriptExecutorTests.cs @@ -23,7 +23,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class ScriptExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "Examples", "ScriptExecutor"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "test_examples", "ScriptExecutor"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/MsftStreamMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/MsftStreamMetricsParserTests.cs index bf6baa1258..e82e1d5619 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/MsftStreamMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/MsftStreamMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "Stream"); + return Path.Combine(workingDirectory, "test_examples", "Stream"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamExecutorTests.cs index 43a5399f7c..087a268b21 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamExecutorTests.cs @@ -21,7 +21,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class StreamExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(StreamExecutorTests), "Examples", "Stream"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(StreamExecutorTests), "test_examples", "Stream"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamMetricsParserTests.cs index abeaafb20a..3dcf530228 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Stream/StreamMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "Stream"); + return Path.Combine(workingDirectory, "test_examples", "Stream"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestExecutorTests.cs index 68e410c440..a88c0deca0 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestExecutorTests.cs @@ -18,7 +18,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class StressAppTestExecutorTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "Examples", "StressAppTest"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(ScriptExecutorTests), "test_examples", "StressAppTest"); private MockFixture mockFixture; private DependencyPath mockPackage; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestMetricsParserTests.cs index 8280c7ea93..efd4096ac3 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressAppTest/StressAppTestMetricsParserTests.cs @@ -28,7 +28,7 @@ public void Setup() [Test] public void StressAppTestParserVerifyMetricsForPassResults() { - string resultsPath = Path.Combine(this.workingDirectory, "Examples", "StressAppTest", "stressAppTestLog_pass.txt"); + string resultsPath = Path.Combine(this.workingDirectory, "test_examples", "StressAppTest", "stressAppTestLog_pass.txt"); string rawText = File.ReadAllText(resultsPath); this.testParser = new StressAppTestMetricsParser(rawText); IList metrics = this.testParser.Parse(); @@ -40,7 +40,7 @@ public void StressAppTestParserVerifyMetricsForPassResults() [Test] public void StressAppTestParserVerifyMetricsForFailedResults() { - string resultsPath = Path.Combine(this.workingDirectory, "Examples", "StressAppTest", "StressAppTestLog_forcedErrors.txt"); + string resultsPath = Path.Combine(this.workingDirectory, "test_examples", "StressAppTest", "StressAppTestLog_forcedErrors.txt"); string rawText = File.ReadAllText(resultsPath); this.testParser = new StressAppTestMetricsParser(rawText); IList metrics = this.testParser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgExecutorTests.cs index 38db84ac0b..bc592f0536 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgExecutorTests.cs @@ -117,7 +117,7 @@ private void SetupDefaultMockBehaviors(PlatformID platform) this.mockFixture.FileSystem.SetupGet(fs => fs.File).Returns(this.mockFixture.File.Object); string currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string resultsPath = Path.Combine(currentDirectory,"Examples", "StressNg", "StressNgCpuExample.yaml"); + string resultsPath = Path.Combine(currentDirectory,"test_examples", "StressNg", "StressNgCpuExample.yaml"); string results = File.ReadAllText(resultsPath); this.mockFixture.File.Setup(f => f.ReadAllTextAsync(It.IsAny(), It.IsAny())).ReturnsAsync(results); diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgMetricsParserTests.cs index 4323ced2bb..3716654071 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/StressNg/StressNgMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "StressNg"); + return Path.Combine(workingDirectory, "test_examples", "StressNg"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SuperBenchmark/SuperBenchmarkMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SuperBenchmark/SuperBenchmarkMetricsParserTests.cs index 96f0f1240d..6f7e413fae 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SuperBenchmark/SuperBenchmarkMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SuperBenchmark/SuperBenchmarkMetricsParserTests.cs @@ -22,7 +22,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "Examples", "SuperBenchmark", "Example1"); + return Path.Combine(workingDirectory, "test_examples", "SuperBenchmark", "Example1"); } } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchClientExecutorTests.cs index c98ff54a37..ece671a88e 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchClientExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchClientExecutorTests.cs @@ -112,7 +112,7 @@ public async Task SysbenchClientExecutorRunsTheExpectedWorkloadCommand() OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -158,7 +158,7 @@ public async Task SysbenchClientExecutorUsesDefinedParametersWhenRunningTheWorkl OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -201,7 +201,7 @@ public async Task SysbenchClientExecutorRunsTheExpectedBalancedScenario() OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -244,7 +244,7 @@ public async Task SysbenchClientExecutorRunsInMemoryScenario() OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -288,7 +288,7 @@ public async Task SysbenchClientExecutorRunsTheExpectedTPCCWorkloadCommand() OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -333,7 +333,7 @@ public async Task SysbenchClientExecutorRunsTheExpectedPostgreSQLOLTPWorkloadCom OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; @@ -378,7 +378,7 @@ public async Task SysbenchClientExecutorRunsTheExpectedPostgreSQLTPCCWorkloadCom OnHasExited = () => true }; - string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench", "SysbenchExample.txt"); + string resultsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench", "SysbenchExample.txt"); process.StandardOutput.Append(File.ReadAllText(resultsPath)); return process; diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs index 2dbd5d8d66..b2f87a447e 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs @@ -18,7 +18,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class SysbenchMetricsParserTests { - private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Sysbench"); + private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Sysbench"); [Test] public void SysbenchParserParsesCorrectly() diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/VirtualClient.Actions.UnitTests.csproj b/src/VirtualClient/VirtualClient.Actions.UnitTests/VirtualClient.Actions.UnitTests.csproj index 4edb5fd60e..800a3cb0b0 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/VirtualClient.Actions.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/VirtualClient.Actions.UnitTests.csproj @@ -9,51 +9,6 @@ AsyncFixer02;SA1005;SA1120 - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - @@ -68,42 +23,40 @@ - - True - True - TestResources.resx - + - - - ResXFileCodeGenerator - TestResources.Designer.cs - - + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + - - - PreserveNewest - - - PreserveNewest - - - Always - - - Always - - - Always - - + + Always + + - - - - + + + + + + + + + + + + + + + + + diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/Wrk2ExecutorTest.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/Wrk2ExecutorTest.cs index ec53b6172d..d09694b984 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/Wrk2ExecutorTest.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/Wrk2ExecutorTest.cs @@ -293,7 +293,7 @@ public async Task Wrk2ExecutorExecutesAsyncAsExpected(PlatformID platform, Archi } else { - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } @@ -412,7 +412,7 @@ public async Task Wrk2ExecutorExecutesWithCoreAffinityOnLinux() ".*wrk.*-t 10 -c 100.*", File.ReadAllText(Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "Examples", "Wrk", "wrkStandardExample1.txt"))); + "test_examples", "Wrk", "wrkStandardExample1.txt"))); TestWrk2Executor executor = new TestWrk2Executor(this.mockFixture); await executor.InitializeAsync(); @@ -470,7 +470,7 @@ public async Task WrkClientExecutorReturnsCorrectArguments() else { Assert.AreEqual(arguments, $"bash {executor.Combine(directory, "runwrk.sh")} {results}"); - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } @@ -483,7 +483,7 @@ public async Task WrkClientExecutorReturnsCorrectArguments() public void SetUpWorkloadOutput() { - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample2.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkExecutorTest.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkExecutorTest.cs index 0deed0c6fa..14df69a084 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkExecutorTest.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkExecutorTest.cs @@ -165,7 +165,7 @@ public async Task WrkClientExecutorRunsWorkloadWithCorrectArguments() else { Assert.AreEqual(arguments, $"bash {executor.Combine(directory, "runwrk.sh")} {results}"); - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } @@ -222,7 +222,7 @@ public async Task WrkClientExecutorSetsServerWarmedUpFlagAfterWarmupExecution(Pl } else { - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } @@ -554,7 +554,7 @@ public async Task WrkClientExecutorExecutesAsyncAsExpected(PlatformID platform, else { Assert.IsTrue(arguments.StartsWith($"bash {dummyExecutor.PlatformSpecifics.Combine(wrkPackagePath, "runwrk.sh")}")); - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder(File.ReadAllText(outputPath))); } @@ -640,7 +640,7 @@ public async Task WrkClientExecutorRunsWorkloadWithAffinityUsingCorrectQuoting() .Setup(x => x.File.Exists(It.IsAny())) .Returns(true); - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string wrkOutput = File.ReadAllText(Path.Combine(examplesDirectory, @"wrkStandardExample1.txt")); this.mockFixture @@ -661,7 +661,7 @@ public async Task WrkClientExecutorRunsWorkloadWithAffinityUsingCorrectQuoting() public void SetUpWorkloadOutput() { - string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); string outputPath = Path.Combine(examplesDirectory, @"wrkStandardExample1.txt"); this.memoryProcess.StandardOutput = new ConcurrentBuffer(new StringBuilder("")); } diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkMetricsParserTest.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkMetricsParserTest.cs index 796f1494b9..d06c8daa2d 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkMetricsParserTest.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Wrk/WrkMetricsParserTest.cs @@ -13,7 +13,7 @@ namespace VirtualClient.Actions [Category("Unit")] public class WrkMetricsParserTest { - private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Examples", "Wrk"); + private static string examplesDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "test_examples", "Wrk"); [Test] [TestCase(true)] diff --git a/src/VirtualClient/VirtualClient.Actions/OpenFOAM/OpenFOAMExecutor.cs b/src/VirtualClient/VirtualClient.Actions/OpenFOAM/OpenFOAMExecutor.cs index dd992a424d..5bd32c4a66 100644 --- a/src/VirtualClient/VirtualClient.Actions/OpenFOAM/OpenFOAMExecutor.cs +++ b/src/VirtualClient/VirtualClient.Actions/OpenFOAM/OpenFOAMExecutor.cs @@ -202,7 +202,7 @@ private async Task InitializeExecutorPropertiesAsync(CancellationToken cancellat private void CopySimulationFilesFromDownloadedPackage() { // Move 0, constant and system folders from package to its respective simulation folder - string simulationBaseDirectory = this.PlatformSpecifics.Combine("/usr", "share", "doc", "openfoam-examples", "examples"); + string simulationBaseDirectory = this.PlatformSpecifics.Combine("/usr", "share", "doc", "openfoam-examples", "test_examples"); Dictionary simulationPaths = new Dictionary() { diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/ComponentFactoryTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/ComponentFactoryTests.cs index ec656c53de..b081d8588d 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/ComponentFactoryTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/ComponentFactoryTests.cs @@ -32,7 +32,7 @@ public void SetupFixture() [TestCase("TEST-PROFILE-2.json")] public void ComponentFactoryCreatesExpectedComponentsFromAnExecutionProfile(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -73,7 +73,7 @@ public void ComponentFactoryCreatesExpectedComponentsFromAnExecutionProfile(stri [TestCase("TEST-PROFILE-1.json")] public void ComponentFactorySetsComponentPropertiesToExpectedDefaults(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -92,7 +92,7 @@ public void ComponentFactorySetsComponentPropertiesToExpectedDefaults(string pro [TestCase("TEST-PROFILE-5.json")] public void ComponentFactoryDoesNotInadvertentlyOverwriteComponentLevelProperties(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); ComponentSettings settings = new ComponentSettings @@ -116,7 +116,7 @@ public void ComponentFactoryDoesNotInadvertentlyOverwriteComponentLevelPropertie [TestCase("TEST-PROFILE-3-PARALLEL.json")] public void ComponentFactoryCreatesExpectedParallelExecutionComponentsFromAnExecutionProfile(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); bool confirmed = false; @@ -150,7 +150,7 @@ public void ComponentFactoryCreatesExpectedParallelExecutionComponentsFromAnExec [TestCase("TEST-PROFILE-4.json")] public void ComponentFactoryAddsExpectedComponentLevelMetadata(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -175,7 +175,7 @@ public void ComponentFactoryAddsExpectedComponentLevelMetadata(string profileNam [TestCase("TEST-PROFILE-2-PARALLEL-LOOP.json")] public void ComponentFactoryAddsExpectedComponentLevelMetadataToSubComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); VirtualClientComponent component = ComponentFactory.CreateComponent(profile.Actions.First(), this.mockFixture.Dependencies); @@ -219,7 +219,7 @@ public void ComponentFactoryAddsExpectedComponentLevelMetadataToSubComponents(st [TestCase("TEST-PROFILE-1-PARALLEL-LOOP.json")] public void ComponentFactoryCreatesExpectedParallelLoopExecutionComponentsFromAnExecutionProfile(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); bool confirmed = false; @@ -253,7 +253,7 @@ public void ComponentFactoryCreatesExpectedParallelLoopExecutionComponentsFromAn [TestCase("TEST-PROFILE-1-SEQUENTIAL.json")] public void ComponentFactoryCreatesExpectedSequentialExecutionComponentsFromAnExecutionProfile(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); bool confirmed = false; @@ -407,7 +407,7 @@ public void ComponentFactoryAppliesMetadataWithPriorityAtHigherLevelsOverLowerLe [TestCase("TEST-PROFILE-4.json")] public void ComponentFactoryAddsExpectedComponentLevelExtensions(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -425,7 +425,7 @@ public void ComponentFactoryAddsExpectedComponentLevelExtensions(string profileN [TestCase("TEST-PROFILE-4-PARALLEL.json")] public void ComponentFactoryAddsExpectedComponentLevelExtensionsToSubComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -454,7 +454,7 @@ public void ComponentFactoryHandlesComponentLevelExtensionAnomalies_1(string pro // A partner team is trying to pass in extensions objects to components within side // of a parallel execution block. The information in the extensions objects for the first component // in the parallel execution block seems to be overriding the ones that come afterwards. - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); ExecutionProfileElement parallelLoop = profile.Actions.First(); @@ -619,7 +619,7 @@ public void ComponentFactoryAppliesExtensionsWithPriorityAtHigherLevelsOverLower [TestCase("TEST-PROFILE-4.json")] public void ComponentFactoryAppliesCommandLineInstructionsProvidedToComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) @@ -645,7 +645,7 @@ public void ComponentFactoryAppliesCommandLineInstructionsProvidedToComponents(s [TestCase("TEST-PROFILE-4-PARALLEL.json")] public void ComponentFactoryAppliesCommandLineInstructionsProvidedToSubComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); foreach (ExecutionProfileElement action in profile.Actions) diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/DiskFiltersTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/DiskFiltersTests.cs index 4c87202ab8..7b41b4bf0c 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/DiskFiltersTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/DiskFiltersTests.cs @@ -667,8 +667,8 @@ public void DiskFiltersHandlesAnomaliesEncounters_1() // identified properly. string rawText = File.ReadAllText(MockFixture.GetDirectory( typeof(DiskFiltersTests), - "TestResources", - "Unix", + "test_resources", + "unix", "lshw", "lshw_disk_storage_results_anomaly.xml")); LshwDiskParser parser = new LshwDiskParser(rawText); diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/ExecutionProfileTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/ExecutionProfileTests.cs index 916dd7939a..ef5a0e2edd 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/ExecutionProfileTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/ExecutionProfileTests.cs @@ -53,7 +53,7 @@ public void ExecutionProfileIsJsonSerializableByDefault() [TestCase("TEST-PROFILE-2.json")] public void ExecutionProfileCanDeserializeProfileFiles(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); } @@ -61,7 +61,7 @@ public void ExecutionProfileCanDeserializeProfileFiles(string profileName) [TestCase("TEST-PROFILE-3-PARALLEL.json")] public void ExecutionProfileCanDeserializeProfileFilesWithParallelExecutionComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); Assert.IsNotEmpty(profile.Actions); @@ -75,7 +75,7 @@ public void ExecutionProfileCanDeserializeProfileFilesWithParallelExecutionCompo [TestCase("TEST-PROFILE-1-PARALLEL-LOOP.json")] public void ExecutionProfileCanDeserializeProfileFilesWithParallelLoopExecutionComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); Assert.IsNotEmpty(profile.Actions); @@ -89,7 +89,7 @@ public void ExecutionProfileCanDeserializeProfileFilesWithParallelLoopExecutionC [TestCase("TEST-PROFILE-1-SEQUENTIAL.json")] public void ExecutionProfileCanDeserializeProfileFilesWithSequentialExecutionComponents(string profileName) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); Assert.IsNotEmpty(profile.Actions); @@ -128,7 +128,7 @@ public void ExecutionProfileGeneratesPredictableHashCodes(string profileName, st // The hash should not change regardless of the number of times the profile is deserialized. for (int check = 0; check < 10; check++) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); string actualHashCode = profile.GetPredictableHashCode().ToString(); @@ -149,7 +149,7 @@ public void ExecutionProfileGeneratesPredictableHashCodesWhenMetadataIsIncluded( // The hash should not change regardless of the number of times the profile is deserialized. for (int check = 0; check < 10; check++) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); string actualHashCode = profile.GetPredictableHashCode(includeMetadata: true).ToString(); @@ -163,7 +163,7 @@ public void ExecutionProfileGeneratesPredictableHashCodesWhenMetadataIsIncluded( [TestCase("TEST-PROFILE-4.json", "1326284617660594785167171193396646697439110051452")] public void ExecutionProfileGeneratesPredictableHashCodesWhenMetadataIsModifiedButExcludedFromHashingMechanics(string profileName, string expectedHashCode) { - ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources", profileName)) + ExecutionProfile profile = File.ReadAllText(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources", profileName)) .FromJson(); string actualHashCode = profile.GetPredictableHashCode(includeMetadata: false).ToString(); diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedEventDataEnumeratorTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedEventDataEnumeratorTests.cs index 3f24eca53e..59e6bd38a0 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedEventDataEnumeratorTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedEventDataEnumeratorTests.cs @@ -16,7 +16,7 @@ namespace VirtualClient.Contracts.Extensibility [Category("Unit")] public class DelimitedEventDataEnumeratorTests : MockFixture { - private static readonly string Examples = MockFixture.GetDirectory(typeof(DelimitedEventDataEnumeratorTests), "Examples", "Extensibility"); + private static readonly string examples = MockFixture.GetDirectory(typeof(DelimitedEventDataEnumeratorTests), "test_examples", "Extensibility"); public void SetupTest(PlatformID platform, Architecture architecture = Architecture.X64) { @@ -34,7 +34,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInCsvFormat // // Note that the results being verified below are defined in the example file below. // Any changes to this file can invalidate the test. - string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "csv.events")); + string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "csv.events")); using (var enumerator = new DelimitedEventDataEnumerator(csvContent, DataFormat.Csv)) { @@ -62,7 +62,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInQuotedCsv // "Timestamp","ExperimentID","ExecutionSystem","ProfileName","ClientID","SeverityLevel" // "2025-07-23T20:34:48.6439102Z","6c83d269-2dff-4fb5-9924-375d84602c5b","Metis","METIS-CPU-CRYPTOGRAPHIC","linux-demo01-client-01","1" - string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "csv_with_quotes.events")); + string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "csv_with_quotes.events")); using (var enumerator = new DelimitedEventDataEnumerator(csvContent, DataFormat.Csv)) { @@ -85,7 +85,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInQuotedCsv // This test is designed to evaluate parsing logic from an actual file produced by the // SDK (e.g. Export-EventCsv). - string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "csv_for_sdk.events")); + string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "csv_for_sdk.events")); List dataPoints = new List(); Assert.DoesNotThrow(() => @@ -113,7 +113,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInJsonForma // // Note that the results being verified below are defined in the example file below. // Any changes to this file can invalidate the test. - string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "json.events")); + string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "json.events")); using (var enumerator = new DelimitedEventDataEnumerator(jsonContent, DataFormat.Json)) { @@ -138,7 +138,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInYamlForma // // Note that the results being verified below are defined in the example file below. // Any changes to this file can invalidate the test. - string yamlContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "yaml.events")); + string yamlContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "yaml.events")); using (var enumerator = new DelimitedEventDataEnumerator(yamlContent, DataFormat.Yaml)) { @@ -156,7 +156,7 @@ public void DelimitedEventDataEnumeratorParsesExpectedEventsFromFilesInYamlForma public void DelimitedEventDataEnumeratorHandlesRepeatedCallsCorrectly() { this.SetupTest(PlatformID.Unix); - string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "json.events")); + string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "json.events")); using (var enumerator = new DelimitedEventDataEnumerator(jsonContent, DataFormat.Json)) { @@ -180,7 +180,7 @@ public void DelimitedEventDataEnumeratorHandlesRepeatedCallsCorrectly() public void DelimitedEventDataEnumeratorHandlesResetsCorrectly() { this.SetupTest(PlatformID.Unix); - string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "json.events")); + string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "json.events")); using (var enumerator = new DelimitedEventDataEnumerator(jsonContent, DataFormat.Json)) { @@ -221,7 +221,7 @@ public void DelimitedEventDataEnumeratorHandlesErrorsWhileAttemptingToParseIndiv // exception is handled during enumeration. this.SetupTest(PlatformID.Unix); - string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "csv_with_errors.events")); + string csvContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "csv_with_errors.events")); using (var enumerator = new DelimitedEventDataEnumerator(csvContent, DataFormat.Csv)) { @@ -263,7 +263,7 @@ public void DelimitedEventDataEnumeratorHandlesErrorsWhileAttemptingToParseIndiv // exception is handled during enumeration. this.SetupTest(PlatformID.Unix); - string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "json_with_errors.events")); + string jsonContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "json_with_errors.events")); using (var enumerator = new DelimitedEventDataEnumerator(jsonContent, DataFormat.Json)) { @@ -304,7 +304,7 @@ public void DelimitedEventDataEnumeratorHandlesErrorsWhileAttemptingToParseIndiv // exception is handled during enumeration. this.SetupTest(PlatformID.Unix); - string yamlContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.Examples, "yaml_with_errors.events")); + string yamlContent = System.IO.File.ReadAllText(this.Combine(DelimitedEventDataEnumeratorTests.examples, "yaml_with_errors.events")); using (var enumerator = new DelimitedEventDataEnumerator(yamlContent, DataFormat.Yaml)) { diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedMetricDataEnumeratorTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedMetricDataEnumeratorTests.cs index 42fb1a2c97..5aa07cde83 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedMetricDataEnumeratorTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Extensibility/DelimitedMetricDataEnumeratorTests.cs @@ -16,7 +16,7 @@ namespace VirtualClient.Contracts.Extensibility [Category("Unit")] public class DelimitedMetricDataEnumeratorTests : MockFixture { - private static readonly string Examples = MockFixture.GetDirectory(typeof(DelimitedMetricDataEnumeratorTests), "Examples", "Extensibility"); + private static readonly string Examples = MockFixture.GetDirectory(typeof(DelimitedMetricDataEnumeratorTests), "test_examples", "Extensibility"); public void SetupTest(PlatformID platform, Architecture architecture = Architecture.X64) { diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/LinuxDistributionInfoTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/LinuxDistributionInfoTests.cs index eb2dbfdd11..62aa0457e1 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/LinuxDistributionInfoTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/LinuxDistributionInfoTests.cs @@ -13,14 +13,14 @@ public class LinuxDistributionInfoTests // Great examples could be found at https://github.com/chef/os_release private static readonly string HostnamectlExamples = MockFixture.GetDirectory( typeof(LinuxDistributionInfoTests), - "TestResources", - "Unix", + "test_resources", + "unix", "hostnamectl"); private static readonly string OSReleaseExamples = MockFixture.GetDirectory( typeof(LinuxDistributionInfoTests), - "TestResources", - "Unix", + "test_resources", + "unix", "os-release"); [Test] diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/LshwDiskParserUnitTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/LshwDiskParserUnitTests.cs index f8cda6eb40..9235a20333 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/LshwDiskParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/LshwDiskParserUnitTests.cs @@ -20,7 +20,7 @@ private string ExamplePath get { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(workingDirectory, "TestResources", "Unix", "lshw"); + return Path.Combine(workingDirectory, "test_resources", "unix", "lshw"); } } diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/CoreInfoParserTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/CoreInfoParserTests.cs index 383b45f67d..69c8d89587 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/CoreInfoParserTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/CoreInfoParserTests.cs @@ -17,7 +17,7 @@ internal class CoreInfoParserTests [Test] public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_Intel.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_Intel.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -45,7 +45,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario1() [Test] public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_Intel_2.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_Intel_2.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -73,7 +73,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario2() [Test] public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario3() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_Intel_3.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_Intel_3.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -101,7 +101,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromIntelSystems_Scenario3() [Test] public void CoreInfoParserParsesTheExpectedResultsFromAMDSystems_Scenario1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_AMD.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_AMD.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -129,7 +129,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromAMDSystems_Scenario1() [Test] public void CoreInfoParserParsesTheExpectedResultsFromAMDSystems_Scenario2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_AMD_Milan.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_AMD_Milan.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -157,7 +157,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromAMDSystems_Scenario2() [Test] public void CoreInfoParserParsesTheExpectedResultsFromAmpereSystems_Scenario1() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_Ampere.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_Ampere.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); @@ -184,7 +184,7 @@ public void CoreInfoParserParsesTheExpectedResultsFromAmpereSystems_Scenario1() [Test] public void CoreInfoParserParsesTheExpectedResultsFromAmpereSystems_Scenario2() { - string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "Examples", "CoreInfo", "CoreInfo_Results_Ampere_2.txt")); + string results = File.ReadAllText(MockFixture.GetDirectory(typeof(CoreInfoParserTests), "test_examples", "CoreInfo", "CoreInfo_Results_Ampere_2.txt")); CoreInfoParser parser = new CoreInfoParser(results); CpuInfo info = parser.Parse(); diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/DmiDecodeParserTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/DmiDecodeParserTests.cs index 5f919fe467..c9242c4788 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/DmiDecodeParserTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/DmiDecodeParserTests.cs @@ -12,7 +12,7 @@ namespace VirtualClient.Contracts.Parser [Category("Unit")] internal class DmiDecodeParserTests { - private static readonly string DmiDecodeExamples = Path.Combine(MockFixture.TestResourcesDirectory, "Unix", "dmidecode"); + private static readonly string DmiDecodeExamples = Path.Combine(MockFixture.TestResourcesDirectory, "unix", "dmidecode"); [Test] public void DmiDecodeMemoryParserParsesTheExpectedResultsFromBareMetalSystems_Scenario_1() diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/LscpuParserTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/LscpuParserTests.cs index 108a3aaa84..e4a983055d 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/LscpuParserTests.cs +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/LscpuParserTests.cs @@ -13,7 +13,7 @@ namespace VirtualClient.Contracts [Category("Unit")] internal class LscpuParserTests { - private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LscpuParserTests), "TestResources", "Unix", "lscpu"); + private static readonly string ExamplesDirectory = MockFixture.GetDirectory(typeof(LscpuParserTests), "test_resources", "unix", "lscpu"); [Test] public void LscpuParserParsesTheExpectedResultsFromIntelSystems_Scenario1() diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/VirtualClient.Contracts.UnitTests.csproj b/src/VirtualClient/VirtualClient.Contracts.UnitTests/VirtualClient.Contracts.UnitTests.csproj index c604f3a240..8f17ca87cc 100644 --- a/src/VirtualClient/VirtualClient.Contracts.UnitTests/VirtualClient.Contracts.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.Contracts.UnitTests/VirtualClient.Contracts.UnitTests.csproj @@ -20,25 +20,34 @@ + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + - - - PreserveNewest - - - PreserveNewest - - - - - TestResources\%(RecursiveDir)%(Filename)%(Extension) - PreserveNewest - - + + + + + + + + + + + + + + + + + + diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Metadata/MetadataExtensionsTests.cs b/src/VirtualClient/VirtualClient.Core.UnitTests/Metadata/MetadataExtensionsTests.cs index c43b23b1b5..bd0609ac1d 100644 --- a/src/VirtualClient/VirtualClient.Core.UnitTests/Metadata/MetadataExtensionsTests.cs +++ b/src/VirtualClient/VirtualClient.Core.UnitTests/Metadata/MetadataExtensionsTests.cs @@ -21,7 +21,7 @@ namespace VirtualClient.Metadata [Category("Unit")] public class MetadataExtensionsTests { - private static readonly string LspciExamples = Path.Combine(MockFixture.TestResourcesDirectory, "Unix", "lspci"); + private static readonly string LspciExamples = Path.Combine(MockFixture.TestResourcesDirectory, "unix", "lspci"); private MockFixture mockFixture; public void SetupFixture(PlatformID platform, Architecture architecture = Architecture.X64) diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.Designer.cs b/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.Designer.cs deleted file mode 100644 index 9029b01b62..0000000000 --- a/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.Designer.cs +++ /dev/null @@ -1,190 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace VirtualClient.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VirtualClient.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes" ?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.4.0-1046-azure #48~18.04.1-Ubuntu SMP Tue Apr 13 19:41:38 UTC 2021 x86_64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="disk:0" claimed="true" class="disk" handle="GUID:8baf2489-b867-4532-bf70-b34611d9cd15"> - /// <description>SCSI Disk</description> - /// <product>Virtual Disk</product> - /// <vendor>Msft</vendor> - /// <physid>0.0.0</physid> - /// <businfo>scsi@0:0.0. [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results { - get { - return ResourceManager.GetString("lshw_disk_storage_results", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes" ?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.4.0-1046-azure #48~18.04.1-Ubuntu SMP Tue Apr 13 19:41:38 UTC 2021 x86_64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="disk:0" claimed="true" class="disk" handle="GUID:8baf2489-b867-4532-bf70-b34611d9cd15"> - /// <description>SCSI Disk</description> - /// <product>Virtual Disk</product> - /// <vendor>Msft</vendor> - /// <physid>0.0.0</physid> - /// <businfo>scsi@0:0.0. [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results_before_partitioning { - get { - return ResourceManager.GetString("lshw_disk_storage_results_before_partitioning", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes" ?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.4.0-1046-azure #48~18.04.1-Ubuntu SMP Tue Apr 13 19:41:38 UTC 2021 x86_64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="disk:0" claimed="true" class="disk" handle="GUID:8baf2489-b867-4532-bf70-b34611d9cd15"> - /// <description>SCSI Disk</description> - /// <product>Virtual Disk</product> - /// <vendor>Msft</vendor> - /// <physid>0.0.0</physid> - /// <businfo>scsi@0:0.0. [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results_with_cdrom { - get { - return ResourceManager.GetString("lshw_disk_storage_results_with_cdrom", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes" ?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.4.0-1046-azure #48~18.04.1-Ubuntu SMP Tue Apr 13 19:41:38 UTC 2021 x86_64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="disk:0" claimed="true" class="disk" handle="GUID:8baf2489-b867-4532-bf70-b34611d9cd15"> - /// <description>SCSI Disk</description> - /// <product>Virtual Disk</product> - /// <vendor>Msft</vendor> - /// <physid>0.0.0</physid> - /// <businfo>scsi@0:0.0. [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results_with_duplicate_index_and_logicalunit { - get { - return ResourceManager.GetString("lshw_disk_storage_results_with_duplicate_index_and_logicalunit", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes" ?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.4.0-1051-azure #53~18.04.1-Ubuntu SMP Fri Jun 18 22:32:58 UTC 2021 x86_64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="namespace" claimed="true" class="disk" handle=""> - /// <description>NVMe namespace</description> - /// <physid>1</physid> - /// <logicalname>/dev/nvme0n1</logicalname> - /// <size units="bytes">960197124096</size> - /// <configuration> - /// <setting id="logicalsectorsize" value [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results_with_nvme { - get { - return ResourceManager.GetString("lshw_disk_storage_results_with_nvme", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0" standalone="yes"?> - ///<!-- generated by lshw-B.02.18 --> - ///<!-- GCC 7.5.0 --> - ///<!-- Linux 5.13.1-0-ref-generic #0 SMP Wed Jul 28 13:20:59 UTC 2021 aarch64 --> - ///<!-- GNU libc 2 (glibc 2.27) --> - ///<list> - /// <node id="disk" claimed="true" class="disk" handle="SCSI:00:00:00:00"> - /// <description> - /// SCSI Disk - /// </description> - /// <product> - /// Virtual Disk - /// </product> - /// <vendor> - /// Msft - /// </vendor> - /// <physid> - /// [rest of string was truncated]";. - /// - internal static string lshw_disk_storage_results_with_volume_without_logicalname { - get { - return ResourceManager.GetString("lshw_disk_storage_results_with_volume_without_logicalname", resourceCulture); - } - } - } -} diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.resx b/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.resx deleted file mode 100644 index 4f6de87eb4..0000000000 --- a/src/VirtualClient/VirtualClient.Core.UnitTests/Properties/Resources.resx +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\lshw_disk_storage_results.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\lshw_disk_storage_results_before_partitioning.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\lshw_disk_storage_results_with_cdrom.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\lshw_disk_storage_results_with_duplicate_index_and_logicalunit.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\lshw_disk_storage_results_with_nvme.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\lshw_disk_storage_results_with_volume_without_logicalname.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/UnixDiskManagerTests.cs b/src/VirtualClient/VirtualClient.Core.UnitTests/UnixDiskManagerTests.cs index b90dd527f3..4d2e7dbb9b 100644 --- a/src/VirtualClient/VirtualClient.Core.UnitTests/UnixDiskManagerTests.cs +++ b/src/VirtualClient/VirtualClient.Core.UnitTests/UnixDiskManagerTests.cs @@ -5,20 +5,15 @@ namespace VirtualClient { using System; using System.Collections.Generic; - using System.IO; using System.Linq; - using System.Text; - using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; - using System.Xml; - using System.Xml.Linq; - using VirtualClient.Common; using Moq; using NUnit.Framework; using Polly; + using VirtualClient.Common; using VirtualClient.Contracts; - using VirtualClient.Properties; + using VirtualClient.TestExtensions; [TestFixture] [Category("Unit")] @@ -60,7 +55,7 @@ public async Task UnixDiskManagerUsesTheSystemInstalledInstanceOfTheLshwCommandB // results in the standard output. this.testProcess.OnHasExited = () => true; this.testProcess.OnStart = () => true; - this.testProcess.StandardOutput.Append(Resources.lshw_disk_storage_results); + this.testProcess.StandardOutput.Append(MockFixture.ReadTestResourcesFile("unix", "lshw", "lshw_disk_storage_results.xml")); // The instance of lshw that is installed by default on the Linux system. string expectedCommand = "lshw"; @@ -78,7 +73,7 @@ public async Task UnixDiskManagerUsesACustomInstanceOfTheLshwCommandWhenAPathToI // results in the standard output. this.testProcess.OnHasExited = () => true; this.testProcess.OnStart = () => true; - this.testProcess.StandardOutput.Append(Resources.lshw_disk_storage_results); + this.testProcess.StandardOutput.Append(MockFixture.ReadTestResourcesFile("unix", "lshw", "lshw_disk_storage_results.xml")); // Use a custom instance of lshw vs. the default installation on the system. string expectedCommand = "/any/path/to/custom/built/lshw"; @@ -102,7 +97,7 @@ public async Task UnixDiskManagerCallsTheExpectedCommandsToGetDiskInformation() this.testProcess.OnStart = () => { this.testProcess.StandardOutput.Clear(); - this.testProcess.StandardOutput.Append(Resources.lshw_disk_storage_results); + this.testProcess.StandardOutput.Append(MockFixture.ReadTestResourcesFile("unix", "lshw", "lshw_disk_storage_results.xml")); commandsExecuted.Add($"{this.testProcess.StartInfo.FileName} {this.testProcess.StartInfo.Arguments}"); return true; diff --git a/src/VirtualClient/VirtualClient.Core.UnitTests/VirtualClient.Core.UnitTests.csproj b/src/VirtualClient/VirtualClient.Core.UnitTests/VirtualClient.Core.UnitTests.csproj index d65a20cca8..9131af4e19 100644 --- a/src/VirtualClient/VirtualClient.Core.UnitTests/VirtualClient.Core.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.Core.UnitTests/VirtualClient.Core.UnitTests.csproj @@ -20,32 +20,22 @@ - - - True - True - Resources.resx - - + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + - - - ResXFileCodeGenerator - Resources.Designer.cs - - + + + + + - - - - TestResources\%(RecursiveDir)%(Filename)%(Extension) - PreserveNewest - - + + diff --git a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/NetworkConfigurationSetupTests.cs b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/NetworkConfigurationSetupTests.cs index 007273b903..f6ea1df7dd 100644 --- a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/NetworkConfigurationSetupTests.cs +++ b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/NetworkConfigurationSetupTests.cs @@ -316,7 +316,7 @@ public void NetworkConfigurationSetupDoesNotMakeAnyChangesToSettingsNotAddedByTh public async Task NetworkConfigurationSetsTheExpectedSettingsInTheSystemConfigFile_UnixSystems() { this.mockFixture.Setup(PlatformID.Unix); - string systemConf = File.ReadAllText(MockFixture.GetDirectory(typeof(NetworkConfigurationSetupTests), "Examples", "example-system.conf")); + string systemConf = File.ReadAllText(MockFixture.GetDirectory(typeof(NetworkConfigurationSetupTests), "test_examples", "example-system.conf")); using (TestNetworkConfigurationSetup setup = new TestNetworkConfigurationSetup(this.mockFixture)) { @@ -343,7 +343,7 @@ public async Task NetworkConfigurationSetsTheExpectedSettingsInTheSystemConfigFi public async Task NetworkConfigurationSetsTheExpectedSettingsInTheUserConfigFile_UnixSystems() { this.mockFixture.Setup(PlatformID.Unix); - string systemConf = File.ReadAllText(MockFixture.GetDirectory(typeof(NetworkConfigurationSetupTests), "Examples", "example-system.conf")); + string systemConf = File.ReadAllText(MockFixture.GetDirectory(typeof(NetworkConfigurationSetupTests), "test_examples", "example-system.conf")); using (TestNetworkConfigurationSetup setup = new TestNetworkConfigurationSetup(this.mockFixture)) { diff --git a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs index 93e09698a7..2c1bac6f56 100644 --- a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs +++ b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs @@ -20,13 +20,13 @@ public class LinuxPackageInstallationTests // Great examples could be found at https://github.com/chef/os_release private static readonly string HostnamectlExamples = MockFixture.GetDirectory( typeof(LinuxPackageInstallationTests), - "TestResources", + "MockFixture", "Unix", "hostnamectl"); private static readonly string OSReleaseExamples = MockFixture.GetDirectory( typeof(LinuxPackageInstallationTests), - "TestResources", + "MockFixture", "Unix", "os-release"); diff --git a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/UploadTelemetryTests.cs b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/UploadTelemetryTests.cs index 1c02deeeec..c6d5c2cd16 100644 --- a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/UploadTelemetryTests.cs +++ b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/UploadTelemetryTests.cs @@ -21,7 +21,7 @@ namespace VirtualClient.Dependencies [Category("Unit")] public class UploadTelemetryTests : MockFixture { - private static readonly string Examples = MockFixture.GetDirectory(typeof(UploadTelemetryTests), "Examples", "Extensibility"); + private static readonly string Examples = MockFixture.GetDirectory(typeof(UploadTelemetryTests), "test_examples", "Extensibility"); public void SetupTest(PlatformID platform, Architecture architecture = Architecture.X64) { diff --git a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/VirtualClient.Dependencies.UnitTests.csproj b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/VirtualClient.Dependencies.UnitTests.csproj index 80ac565343..c15b05f337 100644 --- a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/VirtualClient.Dependencies.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/VirtualClient.Dependencies.UnitTests.csproj @@ -22,11 +22,33 @@ - - PreserveNewest + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + + + + + + + + + + diff --git a/src/VirtualClient/VirtualClient.IntegrationTests/FileUploadTests.cs b/src/VirtualClient/VirtualClient.IntegrationTests/FileUploadTests.cs index 1edbabbafd..25648a26b8 100644 --- a/src/VirtualClient/VirtualClient.IntegrationTests/FileUploadTests.cs +++ b/src/VirtualClient/VirtualClient.IntegrationTests/FileUploadTests.cs @@ -66,7 +66,7 @@ public async Task ProcessRepeatFileUploads(int totalMinutesToRun) // expected to simply overwrite the existing files. Random randomGen = new Random(); - IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources"), "results*.*"); + IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources"), "results*.*"); using (TestExecutor component = new TestExecutor(this.mockFixture)) { @@ -123,7 +123,7 @@ public async Task ProcessRandomFileUploads(int totalMinutesToRun) // Scenario: // Upload random files for a given experiment. - IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources"), "results*.*"); + IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources"), "results*.*"); await this.ProcessRandomFileUploadsAsync(Guid.NewGuid(), "Agent01", totalMinutesToRun, resultsFiles); } @@ -139,7 +139,7 @@ public async Task ProcessRandomFileUploadsWithClientServerRoles(int totalMinutes // Upload random files for a given experiment where client and server roles are used. Guid experimentId = Guid.NewGuid(); - IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources"), "results*.*"); + IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources"), "results*.*"); await this.ProcessRandomFileUploadsAsync(experimentId, "Agent01", totalMinutesToRun, resultsFiles, "Client"); await this.ProcessRandomFileUploadsAsync(experimentId, "Agent02", totalMinutesToRun, resultsFiles, "Server"); @@ -153,7 +153,7 @@ public async Task ProcessRandomFileUploadsWithMonitor(int totalMinutesToRun) // Make sure to define the connection string above for the BlobManager relevant to the target storage account where the test // data should be uploaded. - IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "Resources"), "results*.*"); + IEnumerable resultsFiles = Directory.GetFiles(Path.Combine(MockFixture.TestAssemblyDirectory, "test_resources"), "results*.*"); string requestDirectory = Path.Combine(MockFixture.TestAssemblyDirectory, "contentuploads"); if (this.fileSystem.Directory.Exists(requestDirectory)) diff --git a/src/VirtualClient/VirtualClient.IntegrationTests/PackageManagerTests.cs b/src/VirtualClient/VirtualClient.IntegrationTests/PackageManagerTests.cs index db630e82b1..4523893d4c 100644 --- a/src/VirtualClient/VirtualClient.IntegrationTests/PackageManagerTests.cs +++ b/src/VirtualClient/VirtualClient.IntegrationTests/PackageManagerTests.cs @@ -37,7 +37,7 @@ public void SetupFixture() this.fileSystem = new FileSystem(); PlatformSpecifics platformSpecifics = new PlatformSpecifics(Environment.OSVersion.Platform, RuntimeInformation.ProcessArchitecture); - this.resourcesDirectory = platformSpecifics.Combine(DependencyFixture.TestAssemblyDirectory, "Resources"); + this.resourcesDirectory = platformSpecifics.Combine(DependencyFixture.TestAssemblyDirectory, "test_resources"); this.packagesDirectory = platformSpecifics.PackagesDirectory; this.packageManager = new PackageManager(platformSpecifics, fileSystem); diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiQueryGpuParserUnitTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiQueryGpuParserUnitTests.cs index bba3396138..e3b5bf1709 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiQueryGpuParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiQueryGpuParserUnitTests.cs @@ -22,7 +22,7 @@ public class AmdSmiQueryGpuParserUnitTests public void AmdSmiQueryGpuParserParsesMetricsCorrectly() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "amd-smi", "result.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "amd-smi", "result.txt"); string rawText = File.ReadAllText(outputPath); AmdSmiQueryGpuParser testParser = new AmdSmiQueryGpuParser(rawText); diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/AtopParserUnitTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/AtopParserUnitTests.cs index 47d5b53dce..f708dc77a8 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/AtopParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/AtopParserUnitTests.cs @@ -22,7 +22,7 @@ public class AtopParserUnitTests public void AtopParserParsesMetricsCorrectly_Scenario1() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample1.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample1.txt"); string rawText = File.ReadAllText(outputPath); // Single distinct sample group. If there is only one record we consider it. @@ -144,7 +144,7 @@ public void AtopParserParsesMetricsCorrectly_Scenario1() public void AtopParserParsesMetricsCorrectly_Scenario2() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample2.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample2.txt"); string rawText = File.ReadAllText(outputPath); // Single distinct sample group. If there is only one record we consider it. @@ -260,7 +260,7 @@ public void AtopParserParsesMetricsCorrectly_Scenario2() public void AtopParserParsesMetricsCorrectly_Scenario3() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample-1s-5s.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample-1s-5s.txt"); string rawText = File.ReadAllText(outputPath); // 1 second sample rate, 5 intervals = 4 distinct sample groups as we don't consider first atop sample. @@ -421,7 +421,7 @@ public void AtopParserParsesMetricsCorrectly_Scenario3() public void AtopParserParsesMetricsCorrectly_Scenario4() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample-1s-60s.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample-1s-60s.txt"); string rawText = File.ReadAllText(outputPath); // 1 second sample rate, 60 intervals = 59 distinct sample groups as we don't consider first atop sample. @@ -597,7 +597,7 @@ public void AtopParserParsesMetricsCorrectly_Scenario4() public void AtopParserParsesMetricsCorrectly_Scenario5() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample3.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample3.txt"); string rawText = File.ReadAllText(outputPath); // Single distinct sample group @@ -613,7 +613,7 @@ public void AtopParserSupportsDefiningExplicitSubsetsOfCounters_Scenario1() { // Subsets of Counters string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample-1s-60s.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample-1s-60s.txt"); string rawText = File.ReadAllText(outputPath); AtopParser testParser = new AtopParser(rawText); @@ -635,7 +635,7 @@ public void AtopParserSupportsDefiningExplicitSubsetsOfCounters_Scenario2() { // Individual/Single Counters string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "Atop", "AtopExample-1s-60s.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "Atop", "AtopExample-1s-60s.txt"); string rawText = File.ReadAllText(outputPath); AtopParser testParser = new AtopParser(rawText); diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/LinuxEventLogMonitorTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/LinuxEventLogMonitorTests.cs index baf936b20b..8c7e4a29a7 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/LinuxEventLogMonitorTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/LinuxEventLogMonitorTests.cs @@ -17,7 +17,7 @@ namespace VirtualClient.Monitors [Category("Unit")] public class LinuxEventLogMonitorTests : MockFixture { - private static readonly string ExamplesFolder = MockFixture.GetDirectory(typeof(LinuxEventLogMonitorTests), "Examples", "EventLog"); + private static readonly string ExamplesFolder = MockFixture.GetDirectory(typeof(LinuxEventLogMonitorTests), "test_examples", "EventLog"); [SetUp] public void SetupTest() diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/WindowsEventLogMonitorTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/WindowsEventLogMonitorTests.cs index 0a39855c99..18b464b04a 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/WindowsEventLogMonitorTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/EventLog/WindowsEventLogMonitorTests.cs @@ -17,7 +17,7 @@ namespace VirtualClient.Monitors [Category("Unit")] public class WindowsEventLogMonitorTests : MockFixture { - private static readonly string ExamplesFolder = MockFixture.GetDirectory(typeof(WindowsEventLogMonitorTests), "Examples", "EventLog"); + private static readonly string ExamplesFolder = MockFixture.GetDirectory(typeof(WindowsEventLogMonitorTests), "test_examples", "EventLog"); [SetUp] public void SetupTest() diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/LspciParserUnitTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/LspciParserUnitTests.cs index d82c8ae5c4..e3deb2ea7e 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/LspciParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/LspciParserUnitTests.cs @@ -22,7 +22,7 @@ public class LspciParserUnitTests public void LspciParserParsesPciDevicesCorrectly_Scenario1() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "lspci", "linux-1.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "lspci", "linux-1.txt"); string rawText = File.ReadAllText(outputPath); LspciParser testParser = new LspciParser(rawText); @@ -46,7 +46,7 @@ public void LspciParserParsesPciDevicesCorrectly_Scenario1() public void LspciParserParsesPciDevicesCorrectly_Scenario2() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "lspci", "linux-2.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "lspci", "linux-2.txt"); string rawText = File.ReadAllText(outputPath); LspciParser testParser = new LspciParser(rawText); @@ -59,7 +59,7 @@ public void LspciParserParsesPciDevicesCorrectly_Scenario2() public void LspciParserParsesPciDevicesCorrectly_Scenario3() { string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string outputPath = Path.Combine(workingDirectory, "Examples", "lspci", "windows-1.txt"); + string outputPath = Path.Combine(workingDirectory, "test_examples", "lspci", "windows-1.txt"); string rawText = File.ReadAllText(outputPath); LspciParser testParser = new LspciParser(rawText); diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/Nvidia-Smi/NvidiaSmiResultsParserUnitTests.cs b/src/VirtualClient/VirtualClient.Monitors.UnitTests/Nvidia-Smi/NvidiaSmiResultsParserUnitTests.cs index 3c960a41ce..eedb7bcb2d 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/Nvidia-Smi/NvidiaSmiResultsParserUnitTests.cs +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/Nvidia-Smi/NvidiaSmiResultsParserUnitTests.cs @@ -20,7 +20,7 @@ public class NvidiaSmiResultsParserUnitTests [Test] public void NvidiaSmiParserParsesExpectedMetricsFromC2CResults_Single_GPU() { - string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "Examples", "nvidia-smi"), "query-c2c.txt"); + string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "test_examples", "nvidia-smi"), "query-c2c.txt"); string exampleResults = File.ReadAllText(outputPath); IList metrics = NvidiaSmiResultsParser.ParseC2CResults(exampleResults); @@ -41,7 +41,7 @@ public void NvidiaSmiParserParsesExpectedMetricsFromC2CResults_Single_GPU() [Test] public void NvidiaSmiParserParsesExpectedMetricsFromC2CResults_Multiple_GPUs() { - string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "Examples", "nvidia-smi"), "query-c2c-multiple-gpu.txt"); + string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "test_examples", "nvidia-smi"), "query-c2c-multiple-gpu.txt"); string exampleResults = File.ReadAllText(outputPath); IList metrics = NvidiaSmiResultsParser.ParseC2CResults(exampleResults); @@ -75,7 +75,7 @@ public void NvidiaSmiParserParsesExpectedMetricsFromC2CResults_Multiple_GPUs() [Test] public void NvidiaSmiParserParsesExpectedMetricsFromQueryResults_Scenario1xT4() { - string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "Examples", "nvidia-smi"), "query-gpu-1xH100.csv"); + string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "test_examples", "nvidia-smi"), "query-gpu-1xH100.csv"); string exampleResults = File.ReadAllText(outputPath); IList metrics = NvidiaSmiResultsParser.ParseQueryResults(exampleResults); @@ -119,7 +119,7 @@ public void NvidiaSmiParserParsesExpectedMetricsFromQueryResults_Scenario1xT4() [Test] public void NvidiaSmiParserParsesExpectedMetricsFromQueryResults_Scenario1xT4_2() { - string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "Examples", "nvidia-smi"), "query-gpu-1xT4-NA.csv"); + string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "test_examples", "nvidia-smi"), "query-gpu-1xT4-NA.csv"); string exampleResults = File.ReadAllText(outputPath); IList metrics = NvidiaSmiResultsParser.ParseQueryResults(exampleResults); @@ -163,7 +163,7 @@ public void NvidiaSmiParserParsesExpectedMetricsFromQueryResults_Scenario1xT4_2( [Test] public void NvidiaSmiParserParsesExpectedMetricsFromQueryResults_Scenario4xT4() { - string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "Examples", "nvidia-smi"), "query-gpu-8xH100.csv"); + string outputPath = Path.Combine(MockFixture.GetDirectory(typeof(NvidiaSmiResultsParserUnitTests), "test_examples", "nvidia-smi"), "query-gpu-8xH100.csv"); string exampleResults = File.ReadAllText(outputPath); IList metrics = NvidiaSmiResultsParser.ParseQueryResults(exampleResults); diff --git a/src/VirtualClient/VirtualClient.Monitors.UnitTests/VirtualClient.Monitors.UnitTests.csproj b/src/VirtualClient/VirtualClient.Monitors.UnitTests/VirtualClient.Monitors.UnitTests.csproj index cc82097cef..a7f9ec4895 100644 --- a/src/VirtualClient/VirtualClient.Monitors.UnitTests/VirtualClient.Monitors.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.Monitors.UnitTests/VirtualClient.Monitors.UnitTests.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -14,19 +14,39 @@ - - - - PreserveNewest + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + + + + + + + + + + diff --git a/src/VirtualClient/VirtualClient.TestExtensions/AutoFixtureExtensions.cs b/src/VirtualClient/VirtualClient.TestExtensions/AutoFixtureExtensions.cs index a0013814af..682cd7a59c 100644 --- a/src/VirtualClient/VirtualClient.TestExtensions/AutoFixtureExtensions.cs +++ b/src/VirtualClient/VirtualClient.TestExtensions/AutoFixtureExtensions.cs @@ -49,7 +49,7 @@ public static Fixture SetupCertificateMocks(this Fixture fixture) public static X509Certificate2 CreateCertificate(this Fixture fixture, bool withPrivateKey = false) { X509Certificate2 certificate = null; - string resourcesDirectory = Path.Combine(Path.GetDirectoryName(AutoFixtureExtensions.thisAssembly.Location), "resources"); + string resourcesDirectory = Path.Combine(Path.GetDirectoryName(AutoFixtureExtensions.thisAssembly.Location), "test_resources"); #if NET9_0_OR_GREATER if (withPrivateKey) diff --git a/src/VirtualClient/VirtualClient.TestExtensions/VirtualClient.TestExtensions.csproj b/src/VirtualClient/VirtualClient.TestExtensions/VirtualClient.TestExtensions.csproj index 3c6d5c64c6..d15288855f 100644 --- a/src/VirtualClient/VirtualClient.TestExtensions/VirtualClient.TestExtensions.csproj +++ b/src/VirtualClient/VirtualClient.TestExtensions/VirtualClient.TestExtensions.csproj @@ -21,12 +21,14 @@ - + PreserveNewest + test_resources\test-certificate.private PreserveNewest + test_resources\test-certificate.public diff --git a/src/VirtualClient/VirtualClient.TestFramework.UnitTests/VirtualClient.TestFramework.UnitTests.csproj b/src/VirtualClient/VirtualClient.TestFramework.UnitTests/VirtualClient.TestFramework.UnitTests.csproj index 1a908ed3fc..46814c6b2f 100644 --- a/src/VirtualClient/VirtualClient.TestFramework.UnitTests/VirtualClient.TestFramework.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.TestFramework.UnitTests/VirtualClient.TestFramework.UnitTests.csproj @@ -22,11 +22,33 @@ - - - PreserveNewest - - + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + + + + + + + + + + + + diff --git a/src/VirtualClient/VirtualClient.TestFramework/MockFixture.cs b/src/VirtualClient/VirtualClient.TestFramework/MockFixture.cs index 7f125e5ba5..13995b1d6c 100644 --- a/src/VirtualClient/VirtualClient.TestFramework/MockFixture.cs +++ b/src/VirtualClient/VirtualClient.TestFramework/MockFixture.cs @@ -5,6 +5,7 @@ namespace VirtualClient { using System; using System.Collections.Generic; + using System.IO; using System.IO.Abstractions; using System.Linq; using System.Net; @@ -16,7 +17,6 @@ namespace VirtualClient using System.Threading; using System.Threading.Tasks; using AutoFixture; - using Azure.Core; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -49,13 +49,13 @@ public class MockFixture : Fixture /// The path to the directory where test example files can be found. Note that this requires the /// test project to copy the files to a directory called 'Examples'. /// - public static readonly string ExamplesDirectory = System.IO.Path.Combine(TestAssemblyDirectory, "Examples"); + public static readonly string TestExamplesDirectory = System.IO.Path.Combine(TestAssemblyDirectory, "test_examples"); /// /// The path to the directory where test test resource/example files can be found. Note that this requires the - /// test project to copy the files to a directory called 'TestResources'. + /// test project to copy the files to a directory called 'MockFixture'. /// - public static readonly string TestResourcesDirectory = System.IO.Path.Combine(TestAssemblyDirectory, "TestResources"); + public static readonly string TestResourcesDirectory = System.IO.Path.Combine(TestAssemblyDirectory, "test_resources"); private static readonly char[] PathDividers = new char[] { '\\', '/' }; private static readonly Regex UnixTopLevelFolderExpression = new Regex(@"^(\/[^\/]+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase); @@ -280,6 +280,36 @@ public static string ReadFile(params string[] pathSegments) return System.IO.File.ReadAllText(MockFixture.CurrentPlatform.Combine(pathSegments)); } + /// + /// Returns the contents of the file at the specified path in the 'examples' directory. Note that this + /// directory is expected to be copied to the build output directory for the test project. + /// + /// One or more path segments to use for compiling the full path to the example. + /// The contents of the example file. + public static string ReadTestExamplesFile(params string[] filePath) + { + List fileSegments = new List(); + fileSegments.Add(MockFixture.TestExamplesDirectory); + fileSegments.AddRange(filePath); + + return System.IO.File.ReadAllText(Path.Combine(fileSegments.ToArray())); + } + + /// + /// Returns the contents of the file at the specified path in the 'resources' directory. Note that this + /// directory is expected to be copied to the build output directory for the test project. + /// + /// One or more path segments to use for compiling the full path to the resource. + /// The contents of the resource file. + public static string ReadTestResourcesFile(params string[] filePath) + { + List fileSegments = new List(); + fileSegments.Add(MockFixture.TestResourcesDirectory); + fileSegments.AddRange(filePath); + + return System.IO.File.ReadAllText(Path.Combine(fileSegments.ToArray())); + } + /// /// Gets a directory path relevant to the test class type (.dll location) that is formatted /// for the particular OS platform on which the developer is working (e.g. Linux, Windows). diff --git a/src/VirtualClient/VirtualClient.UnitTests/CommandLineOptionTests.cs b/src/VirtualClient/VirtualClient.UnitTests/CommandLineOptionTests.cs index 184264e555..887971b721 100644 --- a/src/VirtualClient/VirtualClient.UnitTests/CommandLineOptionTests.cs +++ b/src/VirtualClient/VirtualClient.UnitTests/CommandLineOptionTests.cs @@ -24,7 +24,7 @@ public class CommandLineOptionTests { private static readonly string ResourcesDirectory = Path.Combine( Path.GetDirectoryName(Assembly.GetAssembly(typeof(CommandLineOptionTests)).Location), - "Resources"); + "test_resources"); [Test] [TestCase( diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/ActionWithNoArguments.json b/src/VirtualClient/VirtualClient.UnitTests/TestData/ActionWithNoArguments.json deleted file mode 100644 index 7faa58bebe..0000000000 --- a/src/VirtualClient/VirtualClient.UnitTests/TestData/ActionWithNoArguments.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "LoopInfinitely": "false", - "Metadata": { - }, - "Actions": [ - { - "Type": "TestAction" - } - ], - "Monitors": [ - { - "Type": "TestMonitor", - "Arguments": [ - { - "Name": "anotherParameter", - "Value": "anotherValue" - } - ] - } - ] -} - - \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TarDummyArchive.tar b/src/VirtualClient/VirtualClient.UnitTests/TestData/TarDummyArchive.tar deleted file mode 100644 index a5e123cec0..0000000000 Binary files a/src/VirtualClient/VirtualClient.UnitTests/TestData/TarDummyArchive.tar and /dev/null differ diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TarGZDummyArchive.tar.gz b/src/VirtualClient/VirtualClient.UnitTests/TestData/TarGZDummyArchive.tar.gz deleted file mode 100644 index 012128dd9c..0000000000 Binary files a/src/VirtualClient/VirtualClient.UnitTests/TestData/TarGZDummyArchive.tar.gz and /dev/null differ diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestExecutionProfile.json b/src/VirtualClient/VirtualClient.UnitTests/TestData/TestExecutionProfile.json deleted file mode 100644 index 8925f4098c..0000000000 --- a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestExecutionProfile.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "LoopInfinitely": "false", - "Metadata": { - }, - "Actions": [ - { - "Type": "TestAction", - "Arguments": [ - { - "Name": "aParameter", - "Value": "aValue" - }, - { - "Name": "ParallelDiskExecution", - "Value": "true" - } - ] - } - ], - "Monitors": [ - { - "Type": "TestMonitor", - "Arguments": [ - { - "Name": "anotherParameter", - "Value": "anotherValue" - } - ] - } - ] -} - - \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJson.txt b/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJson.txt deleted file mode 100644 index ca3d8bf81e..0000000000 --- a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJson.txt +++ /dev/null @@ -1,306 +0,0 @@ -{ - "fio version": "fio-3.13", - "timestamp": 1585275229, - "timestamp_ms": 1585275229432, - "time": "Thu Mar 26 19:13:49 2020", - "jobs": [ - { - "jobname": "fiotest", - "groupid": 0, - "error": 0, - "eta": 0, - "elapsed": 8, - "job options": { - "name": "fiotest", - "size": "1G", - "rw": "randread", - "bs": "4k", - "iodepth": "512", - "runtime": "60", - "direct": "1", - "thread": "1", - "filename": ".\\mlzahthz.ntc" - }, - "read": { - "io_bytes": 1073741824, - "io_kbytes": 1048576, - "bw_bytes": 145473760, - "bw": 142064, - "iops": 35516.054735, - "runtime": 7381, - "total_ios": 262144, - "short_ios": 0, - "drop_ios": 0, - "slat_ms": { - "min": 4408, - "max": 3573909, - "mean": 23006.938496, - "stddev": 22006.753774 - }, - "clat_ns": { - "min": 67936, - "max": 92994183, - "mean": 7843056.611698, - "stddev": 9444990.777445, - "percentile": { - "1.000000": 272384, - "5.000000": 798720, - "10.000000": 1449984, - "20.000000": 2768896, - "30.000000": 4079616, - "40.000000": 5406720, - "50.000000": 6717440, - "60.000000": 7962624, - "70.000000": 9240576, - "80.000000": 10551296, - "90.000000": 11993088, - "95.000000": 13303808, - "99.000000": 67633152, - "99.500000": 68681728, - "99.900000": 89653248, - "99.950000": 90701824, - "99.990000": 92798976 - } - }, - "lat_us": { - "min": 123931, - "max": 93007807, - "mean": 7866063.550194, - "stddev": 9443784.182074 - }, - "bw_min": 20752, - "bw_max": 162168, - "bw_agg": 99.185277, - "bw_mean": 140906.571429, - "bw_dev": 40477.974147, - "bw_samples": 14, - "iops_min": 5188, - "iops_max": 40542, - "iops_mean": 35226.571429, - "iops_stddev": 10119.455752, - "iops_samples": 14 - }, - "write": { - "io_bytes": 1073741824, - "io_kbytes": 1048576, - "bw_bytes": 145473760, - "bw": 142064, - "iops": 35516.054735, - "runtime": 7381, - "total_ios": 262144, - "short_ios": 0, - "drop_ios": 0, - "slat_ms": { - "min": 4408, - "max": 3573909, - "mean": 23006.938496, - "stddev": 22006.753774 - }, - "clat_ns": { - "min": 67936, - "max": 92994183, - "mean": 7843056.611698, - "stddev": 9444990.777445, - "percentile": { - "1.000000": 272384, - "5.000000": 798720, - "10.000000": 1449984, - "20.000000": 2768896, - "30.000000": 4079616, - "40.000000": 5406720, - "50.000000": 6717440, - "60.000000": 7962624, - "70.000000": 9240576, - "80.000000": 10551296, - "90.000000": 11993088, - "95.000000": 13303808, - "99.000000": 67633152, - "99.500000": 68681728, - "99.900000": 89653248, - "99.950000": 90701824, - "99.990000": 92798976 - } - }, - "lat_us": { - "min": 123931, - "max": 93007807, - "mean": 7866063.550194, - "stddev": 9443784.182074 - }, - "bw_min": 20752, - "bw_max": 162168, - "bw_agg": 99.185277, - "bw_mean": 140906.571429, - "bw_dev": 40477.974147, - "bw_samples": 14, - "iops_min": 5188, - "iops_max": 40542, - "iops_mean": 35226.571429, - "iops_stddev": 10119.455752, - "iops_samples": 14 - }, - "trim": { - "io_bytes": 0, - "io_kbytes": 0, - "bw_bytes": 0, - "bw": 0, - "iops": 0.000000, - "runtime": 0, - "total_ios": 0, - "short_ios": 0, - "drop_ios": 0, - "slat_ns": { - "min": 0, - "max": 0, - "mean": 0.000000, - "stddev": 0.000000 - }, - "clat_ns": { - "min": 0, - "max": 0, - "mean": 0.000000, - "stddev": 0.000000, - "percentile": { - "1.000000": 0, - "5.000000": 0, - "10.000000": 0, - "20.000000": 0, - "30.000000": 0, - "40.000000": 0, - "50.000000": 0, - "60.000000": 0, - "70.000000": 0, - "80.000000": 0, - "90.000000": 0, - "95.000000": 0, - "99.000000": 0, - "99.500000": 0, - "99.900000": 0, - "99.950000": 0, - "99.990000": 0 - } - }, - "lat_ns": { - "min": 0, - "max": 0, - "mean": 0.000000, - "stddev": 0.000000 - }, - "bw_min": 0, - "bw_max": 0, - "bw_agg": 0.000000, - "bw_mean": 0.000000, - "bw_dev": 0.000000, - "bw_samples": 0, - "iops_min": 0, - "iops_max": 0, - "iops_mean": 0.000000, - "iops_stddev": 0.000000, - "iops_samples": 0 - }, - "sync": { - "lat_ns": { - "min": 0, - "max": 0, - "mean": 0.000000, - "stddev": 0.000000, - "percentile": { - "1.000000": 0, - "5.000000": 0, - "10.000000": 0, - "20.000000": 0, - "30.000000": 0, - "40.000000": 0, - "50.000000": 0, - "60.000000": 0, - "70.000000": 0, - "80.000000": 0, - "90.000000": 0, - "95.000000": 0, - "99.000000": 0, - "99.500000": 0, - "99.900000": 0, - "99.950000": 0, - "99.990000": 0 - } - }, - "total_ios": 0 - }, - "job_runtime": 7380, - "usr_cpu": 0.000000, - "sys_cpu": 40.650407, - "ctx": 0, - "majf": 0, - "minf": 0, - "iodepth_level": { - "1": 0.100000, - "2": 0.100000, - "4": 0.367355, - "8": 1.467133, - "16": 3.013992, - "32": 6.106949, - ">=64": 89.037323 - }, - "iodepth_submit": { - "0": 0.000000, - "4": 100.000000, - "8": 0.000000, - "16": 0.000000, - "32": 0.000000, - "64": 0.000000, - ">=64": 0.000000 - }, - "iodepth_complete": { - "0": 0.000000, - "4": 99.806414, - "8": 0.100000, - "16": 0.100000, - "32": 0.100000, - "64": 0.100000, - ">=64": 0.191344 - }, - "latency_ns": { - "2": 0.000000, - "4": 0.000000, - "10": 0.000000, - "20": 0.000000, - "50": 0.000000, - "100": 0.000000, - "250": 0.000000, - "500": 0.000000, - "750": 0.000000, - "1000": 0.000000 - }, - "latency_us": { - "2": 0.000000, - "4": 0.000000, - "10": 0.000000, - "20": 0.000000, - "50": 0.000000, - "100": 0.010000, - "250": 0.851822, - "500": 1.848984, - "750": 1.919174, - "1000": 1.897430 - }, - "latency_ms": { - "2": 7.647705, - "4": 15.239716, - "10": 45.944595, - "20": 22.623825, - "50": 0.181580, - "100": 1.841354, - "250": 0.000000, - "500": 0.000000, - "750": 0.000000, - "1000": 0.000000, - "2000": 0.000000, - ">=2000": 0.000000 - }, - "latency_depth": 512, - "latency_target": 0, - "latency_percentile": 100.000000, - "latency_window": 0 - } - ] -} \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJsonWithError.txt b/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJsonWithError.txt deleted file mode 100644 index 99f18d845c..0000000000 --- a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestFioJsonWithError.txt +++ /dev/null @@ -1,310 +0,0 @@ -fio: pid=19192, err=42/file:io_u.c:2074, func=io_u_queued_complete, error=Illegal byte sequence -fio: pid=19192, err=43/file:io_u.c:2074, func=io_u_queued_complete, error=Different Error -{ - "fio version" : "fio-3.13", - "timestamp" : 1598385433, - "timestamp_ms" : 1598385433858, - "time" : "Tue Aug 25 12:57:13 2020", - "global options" : { - "ioengine" : "windowsaio", - "rw" : "read", - "verify" : "md5", - "bs" : "4k", - "iodepth" : "512", - "size" : "1g", - "directory" : ".", - "thread" : "1" - }, - "jobs" : [ - { - "jobname" : "fiotest", - "groupid" : 0, - "error" : 42, - "eta" : 0, - "elapsed" : 4, - "job options" : { - "name" : "fiotest" - }, - "read" : { - "io_bytes" : 536973312, - "io_kbytes" : 524388, - "bw_bytes" : 202249835, - "bw" : 197509, - "iops" : 49501.318267, - "runtime" : 2655, - "total_ios" : 131426, - "short_ios" : 0, - "drop_ios" : 0, - "slat_ns" : { - "min" : 4021, - "max" : 555951, - "mean" : 11328.926856, - "stddev" : 11664.898298 - }, - "clat_ns" : { - "min" : 220057, - "max" : 16434775, - "mean" : 5922036.884193, - "stddev" : 2236444.572861, - "percentile" : { - "1.000000" : 1335296, - "5.000000" : 2179072, - "10.000000" : 2736128, - "20.000000" : 3489792, - "30.000000" : 4816896, - "40.000000" : 5668864, - "50.000000" : 6258688, - "60.000000" : 6782976, - "70.000000" : 7241728, - "80.000000" : 7831552, - "90.000000" : 8585216, - "95.000000" : 9371648, - "99.000000" : 10420224, - "99.500000" : 11075584, - "99.900000" : 12517376, - "99.950000" : 12910592, - "99.990000" : 14745600 - } - }, - "lat_ns" : { - "min" : 286606, - "max" : 16443603, - "mean" : 5933374.176961, - "stddev" : 2235791.364193 - }, - "bw_min" : 178248, - "bw_max" : 205394, - "bw_agg" : 98.821927, - "bw_mean" : 195182.200000, - "bw_dev" : 11139.371356, - "bw_samples" : 5, - "iops_min" : 44562, - "iops_max" : 51348, - "iops_mean" : 48795.200000, - "iops_stddev" : 2784.762234, - "iops_samples" : 5 - }, - "write" : { - "io_bytes" : 0, - "io_kbytes" : 0, - "bw_bytes" : 0, - "bw" : 0, - "iops" : 0.000000, - "runtime" : 0, - "total_ios" : 0, - "short_ios" : 0, - "drop_ios" : 0, - "slat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000 - }, - "clat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000, - "percentile" : { - "1.000000" : 0, - "5.000000" : 0, - "10.000000" : 0, - "20.000000" : 0, - "30.000000" : 0, - "40.000000" : 0, - "50.000000" : 0, - "60.000000" : 0, - "70.000000" : 0, - "80.000000" : 0, - "90.000000" : 0, - "95.000000" : 0, - "99.000000" : 0, - "99.500000" : 0, - "99.900000" : 0, - "99.950000" : 0, - "99.990000" : 0 - } - }, - "lat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000 - }, - "bw_min" : 0, - "bw_max" : 0, - "bw_agg" : 0.000000, - "bw_mean" : 0.000000, - "bw_dev" : 0.000000, - "bw_samples" : 0, - "iops_min" : 0, - "iops_max" : 0, - "iops_mean" : 0.000000, - "iops_stddev" : 0.000000, - "iops_samples" : 0 - }, - "trim" : { - "io_bytes" : 0, - "io_kbytes" : 0, - "bw_bytes" : 0, - "bw" : 0, - "iops" : 0.000000, - "runtime" : 0, - "total_ios" : 0, - "short_ios" : 0, - "drop_ios" : 0, - "slat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000 - }, - "clat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000, - "percentile" : { - "1.000000" : 0, - "5.000000" : 0, - "10.000000" : 0, - "20.000000" : 0, - "30.000000" : 0, - "40.000000" : 0, - "50.000000" : 0, - "60.000000" : 0, - "70.000000" : 0, - "80.000000" : 0, - "90.000000" : 0, - "95.000000" : 0, - "99.000000" : 0, - "99.500000" : 0, - "99.900000" : 0, - "99.950000" : 0, - "99.990000" : 0 - } - }, - "lat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000 - }, - "bw_min" : 0, - "bw_max" : 0, - "bw_agg" : 0.000000, - "bw_mean" : 0.000000, - "bw_dev" : 0.000000, - "bw_samples" : 0, - "iops_min" : 0, - "iops_max" : 0, - "iops_mean" : 0.000000, - "iops_stddev" : 0.000000, - "iops_samples" : 0 - }, - "sync" : { - "lat_ns" : { - "min" : 0, - "max" : 0, - "mean" : 0.000000, - "stddev" : 0.000000, - "percentile" : { - "1.000000" : 0, - "5.000000" : 0, - "10.000000" : 0, - "20.000000" : 0, - "30.000000" : 0, - "40.000000" : 0, - "50.000000" : 0, - "60.000000" : 0, - "70.000000" : 0, - "80.000000" : 0, - "90.000000" : 0, - "95.000000" : 0, - "99.000000" : 0, - "99.500000" : 0, - "99.900000" : 0, - "99.950000" : 0, - "99.990000" : 0 - } - }, - "total_ios" : 0 - }, - "job_runtime" : 2654, - "usr_cpu" : 37.678975, - "sys_cpu" : 37.678975, - "ctx" : 0, - "majf" : 0, - "minf" : 0, - "iodepth_level" : { - "1" : 0.100000, - "2" : 0.100000, - "4" : 0.100000, - "8" : 0.100000, - "16" : 0.100000, - "32" : 0.356094, - ">=64" : 99.614232 - }, - "iodepth_submit" : { - "0" : 0.000000, - "4" : 100.000000, - "8" : 0.000000, - "16" : 0.000000, - "32" : 0.000000, - "64" : 0.000000, - ">=64" : 0.000000 - }, - "iodepth_complete" : { - "0" : 0.000000, - "4" : 99.663305, - "8" : 0.000000, - "16" : 0.000000, - "32" : 0.000000, - "64" : 0.000000, - ">=64" : 0.336695 - }, - "latency_ns" : { - "2" : 0.000000, - "4" : 0.000000, - "10" : 0.000000, - "20" : 0.000000, - "50" : 0.000000, - "100" : 0.000000, - "250" : 0.000000, - "500" : 0.000000, - "750" : 0.000000, - "1000" : 0.000000 - }, - "latency_us" : { - "2" : 0.000000, - "4" : 0.000000, - "10" : 0.000000, - "20" : 0.000000, - "50" : 0.000000, - "100" : 0.000000, - "250" : 0.010000, - "500" : 0.019783, - "750" : 0.086741, - "1000" : 0.228265 - }, - "latency_ms" : { - "2" : 3.592896, - "4" : 20.681600, - "10" : 73.018276, - "20" : 2.121346, - "50" : 0.000000, - "100" : 0.000000, - "250" : 0.000000, - "500" : 0.000000, - "750" : 0.000000, - "1000" : 0.000000, - "2000" : 0.000000, - ">=2000" : 0.000000 - }, - "latency_depth" : 512, - "latency_target" : 0, - "latency_percentile" : 100.000000, - "latency_window" : 0 - } - ] -} diff --git a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestNestedExecutionProfile.json b/src/VirtualClient/VirtualClient.UnitTests/TestData/TestNestedExecutionProfile.json deleted file mode 100644 index 338a8d40a2..0000000000 --- a/src/VirtualClient/VirtualClient.UnitTests/TestData/TestNestedExecutionProfile.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "LoopInfinitely": "false", - "Metadata": { - "ApplicationInsightsKey": "0e3b9f05-6df2-47a5-a471-0794a4655c91" - }, - "Actions": [ - { - "Type": "LoopAction", - "ChildActions": [ - { - "Type": "ParallelAction", - "ChildActions": [ - { - "Type": "TestAction", - "Arguments": [ - { - "Name": "aParameter", - "Value": "aValue" - }, - { - "Name": "ParallelDiskExecution", - "Value": "true" - } - ] - } - ] - } - ], - "Arguments": [ - { - "Name": "RepeatCount", - "Value": "1" - }, - { - "Name": "ParallelDiskExecution", - "Value": "true" - } - ] - } - ], - "Monitors": [ - { - "Type": "TestMonitor", - "Arguments": [ - { - "Name": "anotherParameter", - "Value": "anotherValue" - } - ] - } - ] -} - - \ No newline at end of file diff --git a/src/VirtualClient/VirtualClient.UnitTests/VirtualClient.UnitTests.csproj b/src/VirtualClient/VirtualClient.UnitTests/VirtualClient.UnitTests.csproj index 66fbc34d3e..8cde296a73 100644 --- a/src/VirtualClient/VirtualClient.UnitTests/VirtualClient.UnitTests.csproj +++ b/src/VirtualClient/VirtualClient.UnitTests/VirtualClient.UnitTests.csproj @@ -21,48 +21,34 @@ - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest + + + TestResources\%(RecursiveDir)%(Filename)%(Extension) - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + + + + + + + + + + + + + + + + + +