From e8059c61be68410a98cf67dc94615a4dc839c48b Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Fri, 23 Sep 2022 10:57:34 -0700 Subject: [PATCH] (maint) Pester test directory structure shuffle Move the command tests into a new commands directory, with features in a new features directory. This should make it easier and clearer which tests are specific to what aspects of Chocolatey. --- .../{ => commands}/choco-apikey.Tests.ps1 | 0 .../{ => commands}/choco-config.Tests.ps1 | 0 .../{ => commands}/choco-deprecated.Tests.ps1 | 0 .../{ => commands}/choco-export.Tests.ps1 | 0 .../{ => commands}/choco-feature.Tests.ps1 | 0 .../{ => commands}/choco-help.Tests.ps1 | 0 .../{ => commands}/choco-info.Tests.ps1 | 0 .../{ => commands}/choco-install.Tests.ps1 | 0 .../{ => commands}/choco-list.Tests.ps1 | 0 .../{ => commands}/choco-new.Tests.ps1 | 0 .../{ => commands}/choco-outdated.Tests.ps1 | 0 .../{ => commands}/choco-pack.Tests.ps1 | 0 .../{ => commands}/choco-pin.Tests.ps1 | 0 .../{ => commands}/choco-push.Tests.ps1 | 0 .../{ => commands}/choco-removed.Tests.ps1 | 0 .../{ => commands}/choco-source.Tests.ps1 | 0 .../{ => commands}/choco-template.Tests.ps1 | 0 .../{ => commands}/choco-uninstall.Tests.ps1 | 0 .../{ => commands}/choco-upgrade.Tests.ps1 | 0 .../{ => commands}/choco-version.Tests.ps1 | 0 .../basic-dependencies/basic-dependencies.nuspec | 0 .../{ => commands}/testnuspecs/basic/basic.nuspec | 0 .../testnuspecs/basic/tools/purpose.txt | 0 .../{ => commands}/testnuspecs/cdata/cdata.nuspec | 0 .../testnuspecs/description-long.nuspec | 0 .../empty-requireLicenseAcceptance.nuspec | 0 .../{ => commands}/testnuspecs/empty.nuspec | 0 .../testnuspecs/forward-slash/forward-slash.nuspec | 0 .../testnuspecs/forward-slash/tools/purpose.txt | 0 .../{ => commands}/testnuspecs/full/full.nuspec | 0 .../testnuspecs/full/tools/purpose.txt | 0 .../testnuspecs/invalid-bugtrackerurl.nuspec | 0 .../testnuspecs/invalid-character-and.nuspec | 0 .../testnuspecs/invalid-character-lesser.nuspec | 0 .../testnuspecs/invalid-docsurl.nuspec | 0 .../testnuspecs/invalid-iconurl.nuspec | 0 .../{ => commands}/testnuspecs/invalid-id.nuspec | 0 .../testnuspecs/invalid-licenseUrl.nuspec | 0 .../testnuspecs/invalid-mailinglisturl.nuspec | 0 .../testnuspecs/invalid-no-content.nuspec | 0 .../testnuspecs/invalid-projectsourceurl.nuspec | 0 .../testnuspecs/invalid-projecturl.nuspec | 0 .../invalid-requireLicenseAcceptance.nuspec | 0 .../testnuspecs/invalid-version.nuspec | 0 .../{ => commands}/testnuspecs/missing.nuspec | 0 .../{ => commands}/testnuspecs/required.nuspec | 0 .../{ => commands}/testpackages/.gitignore | 0 .../1.0.0/chocolatey-dummy-package.nuspec | 0 .../installpackage/1.0.0/installpackage.nuspec | 0 .../1.0.0/tools/Casemismatch.exe.ignore | 0 .../installpackage/1.0.0/tools/casemismatch.exe | 0 .../1.0.0/tools/chocolateyBeforeModify.ps1 | 0 .../1.0.0/tools/chocolateyinstall.ps1 | 0 .../1.0.0/tools/chocolateyuninstall.ps1 | 0 .../installpackage/1.0.0/tools/console.exe | 0 .../installpackage/1.0.0/tools/graphical.exe | 0 .../installpackage/1.0.0/tools/graphical.exe.gui | 0 .../installpackage/1.0.0/tools/not.installed.exe | 0 .../1.0.0/tools/not.installed.exe.ignore | 0 .../1.0.0/too-long-description.nuspec | 0 .../too-long-title/1.0.0/too-long-title.nuspec | 0 .../tools/chocolateyinstall.ps1 | 0 .../tools/zip-log-disable-test.zip | Bin .../zip-log-disable-test.nuspec | 0 .../chocolatey-tests/{ => features}/Hooks.Tests.ps1 | 0 .../{ => features}/PythonSource.Tests.ps1 | 0 66 files changed, 0 insertions(+), 0 deletions(-) rename tests/chocolatey-tests/{ => commands}/choco-apikey.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-config.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-deprecated.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-export.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-feature.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-help.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-info.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-install.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-list.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-new.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-outdated.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-pack.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-pin.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-push.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-removed.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-source.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-template.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-uninstall.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-upgrade.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/choco-version.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/basic-dependencies/basic-dependencies.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/basic/basic.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/basic/tools/purpose.txt (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/cdata/cdata.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/description-long.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/empty-requireLicenseAcceptance.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/empty.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/forward-slash/forward-slash.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/forward-slash/tools/purpose.txt (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/full/full.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/full/tools/purpose.txt (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-bugtrackerurl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-character-and.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-character-lesser.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-docsurl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-iconurl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-id.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-licenseUrl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-mailinglisturl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-no-content.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-projectsourceurl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-projecturl.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-requireLicenseAcceptance.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/invalid-version.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/missing.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testnuspecs/required.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/.gitignore (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/installpackage.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/casemismatch.exe (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/console.exe (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/graphical.exe (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/graphical.exe.gui (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/not.installed.exe (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/too-long-description/1.0.0/too-long-description.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/too-long-title/1.0.0/too-long-title.nuspec (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip (100%) rename tests/chocolatey-tests/{ => commands}/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec (100%) rename tests/chocolatey-tests/{ => features}/Hooks.Tests.ps1 (100%) rename tests/chocolatey-tests/{ => features}/PythonSource.Tests.ps1 (100%) diff --git a/tests/chocolatey-tests/choco-apikey.Tests.ps1 b/tests/chocolatey-tests/commands/choco-apikey.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-apikey.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-apikey.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-config.Tests.ps1 b/tests/chocolatey-tests/commands/choco-config.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-config.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-config.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-deprecated.Tests.ps1 b/tests/chocolatey-tests/commands/choco-deprecated.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-deprecated.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-deprecated.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-export.Tests.ps1 b/tests/chocolatey-tests/commands/choco-export.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-export.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-export.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-feature.Tests.ps1 b/tests/chocolatey-tests/commands/choco-feature.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-feature.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-feature.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-help.Tests.ps1 b/tests/chocolatey-tests/commands/choco-help.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-help.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-help.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-info.Tests.ps1 b/tests/chocolatey-tests/commands/choco-info.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-info.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-info.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-install.Tests.ps1 b/tests/chocolatey-tests/commands/choco-install.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-install.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-install.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-list.Tests.ps1 b/tests/chocolatey-tests/commands/choco-list.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-list.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-list.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-new.Tests.ps1 b/tests/chocolatey-tests/commands/choco-new.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-new.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-new.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-outdated.Tests.ps1 b/tests/chocolatey-tests/commands/choco-outdated.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-outdated.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-outdated.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-pack.Tests.ps1 b/tests/chocolatey-tests/commands/choco-pack.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-pack.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-pack.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-pin.Tests.ps1 b/tests/chocolatey-tests/commands/choco-pin.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-pin.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-pin.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-push.Tests.ps1 b/tests/chocolatey-tests/commands/choco-push.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-push.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-push.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-removed.Tests.ps1 b/tests/chocolatey-tests/commands/choco-removed.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-removed.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-removed.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-source.Tests.ps1 b/tests/chocolatey-tests/commands/choco-source.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-source.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-source.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-template.Tests.ps1 b/tests/chocolatey-tests/commands/choco-template.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-template.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-template.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-uninstall.Tests.ps1 b/tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-uninstall.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-upgrade.Tests.ps1 b/tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-upgrade.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1 diff --git a/tests/chocolatey-tests/choco-version.Tests.ps1 b/tests/chocolatey-tests/commands/choco-version.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/choco-version.Tests.ps1 rename to tests/chocolatey-tests/commands/choco-version.Tests.ps1 diff --git a/tests/chocolatey-tests/testnuspecs/basic-dependencies/basic-dependencies.nuspec b/tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/basic-dependencies/basic-dependencies.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/basic/basic.nuspec b/tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/basic/basic.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/basic/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt similarity index 100% rename from tests/chocolatey-tests/testnuspecs/basic/tools/purpose.txt rename to tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt diff --git a/tests/chocolatey-tests/testnuspecs/cdata/cdata.nuspec b/tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/cdata/cdata.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/description-long.nuspec b/tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/description-long.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/empty-requireLicenseAcceptance.nuspec b/tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/empty-requireLicenseAcceptance.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/empty.nuspec b/tests/chocolatey-tests/commands/testnuspecs/empty.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/empty.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/empty.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/forward-slash/forward-slash.nuspec b/tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/forward-slash/forward-slash.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/forward-slash/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt similarity index 100% rename from tests/chocolatey-tests/testnuspecs/forward-slash/tools/purpose.txt rename to tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt diff --git a/tests/chocolatey-tests/testnuspecs/full/full.nuspec b/tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/full/full.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/full/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt similarity index 100% rename from tests/chocolatey-tests/testnuspecs/full/tools/purpose.txt rename to tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt diff --git a/tests/chocolatey-tests/testnuspecs/invalid-bugtrackerurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-bugtrackerurl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-character-and.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-character-and.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-character-lesser.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-character-lesser.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-docsurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-docsurl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-iconurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-iconurl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-id.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-id.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-licenseUrl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-licenseUrl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-mailinglisturl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-mailinglisturl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-no-content.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-no-content.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-projectsourceurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-projectsourceurl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-projecturl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-projecturl.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-requireLicenseAcceptance.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-requireLicenseAcceptance.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/invalid-version.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/invalid-version.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/missing.nuspec b/tests/chocolatey-tests/commands/testnuspecs/missing.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/missing.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/missing.nuspec diff --git a/tests/chocolatey-tests/testnuspecs/required.nuspec b/tests/chocolatey-tests/commands/testnuspecs/required.nuspec similarity index 100% rename from tests/chocolatey-tests/testnuspecs/required.nuspec rename to tests/chocolatey-tests/commands/testnuspecs/required.nuspec diff --git a/tests/chocolatey-tests/testpackages/.gitignore b/tests/chocolatey-tests/commands/testpackages/.gitignore similarity index 100% rename from tests/chocolatey-tests/testpackages/.gitignore rename to tests/chocolatey-tests/commands/testpackages/.gitignore diff --git a/tests/chocolatey-tests/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec b/tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec similarity index 100% rename from tests/chocolatey-tests/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec rename to tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/installpackage.nuspec b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/installpackage.nuspec rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/casemismatch.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/casemismatch.exe rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/console.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/console.exe rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe.gui b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe.gui rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore similarity index 100% rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore diff --git a/tests/chocolatey-tests/testpackages/too-long-description/1.0.0/too-long-description.nuspec b/tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec similarity index 100% rename from tests/chocolatey-tests/testpackages/too-long-description/1.0.0/too-long-description.nuspec rename to tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec diff --git a/tests/chocolatey-tests/testpackages/too-long-title/1.0.0/too-long-title.nuspec b/tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec similarity index 100% rename from tests/chocolatey-tests/testpackages/too-long-title/1.0.0/too-long-title.nuspec rename to tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 similarity index 100% rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip similarity index 100% rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec similarity index 100% rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec diff --git a/tests/chocolatey-tests/Hooks.Tests.ps1 b/tests/chocolatey-tests/features/Hooks.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/Hooks.Tests.ps1 rename to tests/chocolatey-tests/features/Hooks.Tests.ps1 diff --git a/tests/chocolatey-tests/PythonSource.Tests.ps1 b/tests/chocolatey-tests/features/PythonSource.Tests.ps1 similarity index 100% rename from tests/chocolatey-tests/PythonSource.Tests.ps1 rename to tests/chocolatey-tests/features/PythonSource.Tests.ps1