From 27e286e1182aab240d916d43d4d31546002fd3a3 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 11 Aug 2017 08:35:59 -0700
Subject: [PATCH 1/2] Move some engine tests and asset

---
 test/powershell/engine/{ => Api}/BasicEngine.Tests.ps1        | 0
 .../powershell/engine/{ => Api}/InitialSessionState.Tests.ps1 | 4 ++--
 .../{Common => engine/Api/assets}/TestTypeFile.ps1xml         | 0
 test/powershell/engine/{ => Basic}/PropertyAccessor.Tests.ps1 | 0
 test/powershell/engine/{ => Basic}/SemanticVersion.Tests.ps1  | 0
 .../engine/{ => Basic}/ValidateAttributes.Tests.ps1           | 0
 test/powershell/engine/{ => Job}/Jobs.Tests.ps1               | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename test/powershell/engine/{ => Api}/BasicEngine.Tests.ps1 (100%)
 rename test/powershell/engine/{ => Api}/InitialSessionState.Tests.ps1 (96%)
 rename test/powershell/{Common => engine/Api/assets}/TestTypeFile.ps1xml (100%)
 rename test/powershell/engine/{ => Basic}/PropertyAccessor.Tests.ps1 (100%)
 rename test/powershell/engine/{ => Basic}/SemanticVersion.Tests.ps1 (100%)
 rename test/powershell/engine/{ => Basic}/ValidateAttributes.Tests.ps1 (100%)
 rename test/powershell/engine/{ => Job}/Jobs.Tests.ps1 (100%)

diff --git a/test/powershell/engine/BasicEngine.Tests.ps1 b/test/powershell/engine/Api/BasicEngine.Tests.ps1
similarity index 100%
rename from test/powershell/engine/BasicEngine.Tests.ps1
rename to test/powershell/engine/Api/BasicEngine.Tests.ps1
diff --git a/test/powershell/engine/InitialSessionState.Tests.ps1 b/test/powershell/engine/Api/InitialSessionState.Tests.ps1
similarity index 96%
rename from test/powershell/engine/InitialSessionState.Tests.ps1
rename to test/powershell/engine/Api/InitialSessionState.Tests.ps1
index 608bb16f3ec..bf952ac2cae 100644
--- a/test/powershell/engine/InitialSessionState.Tests.ps1
+++ b/test/powershell/engine/Api/InitialSessionState.Tests.ps1
@@ -65,7 +65,7 @@ Describe "TypeTable duplicate types in reused runspace InitialSessionState TypeT
 
         BeforeAll {
 
-            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "../Common/TestTypeFile.ps1xml"))
+            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "assets/TestTypeFile.ps1xml"))
             [initialsessionstate] $iss = [initialsessionstate]::Create()
             $iss.Types.Add($typeTable)
             [runspace] $rs1 = [runspacefactory]::CreateRunspace($iss)
@@ -98,7 +98,7 @@ Describe "TypeTable duplicate types in reused runspace InitialSessionState TypeT
         BeforeAll {
 
             # Create default ISS and add shared TypeTable.
-            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "../Common/TestTypeFile.ps1xml"))
+            $typeTable = [System.Management.Automation.Runspaces.TypeTable]::new([string[]](Join-Path $PSScriptRoot "assets/TestTypeFile.ps1xml"))
             [initialsessionstate] $iss = [initialsessionstate]::CreateDefault2()
             $iss.Types.Add($typeTable)
             $iss.ThrowOnRunspaceOpenError = $true
diff --git a/test/powershell/Common/TestTypeFile.ps1xml b/test/powershell/engine/Api/assets/TestTypeFile.ps1xml
similarity index 100%
rename from test/powershell/Common/TestTypeFile.ps1xml
rename to test/powershell/engine/Api/assets/TestTypeFile.ps1xml
diff --git a/test/powershell/engine/PropertyAccessor.Tests.ps1 b/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1
similarity index 100%
rename from test/powershell/engine/PropertyAccessor.Tests.ps1
rename to test/powershell/engine/Basic/PropertyAccessor.Tests.ps1
diff --git a/test/powershell/engine/SemanticVersion.Tests.ps1 b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
similarity index 100%
rename from test/powershell/engine/SemanticVersion.Tests.ps1
rename to test/powershell/engine/Basic/SemanticVersion.Tests.ps1
diff --git a/test/powershell/engine/ValidateAttributes.Tests.ps1 b/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
similarity index 100%
rename from test/powershell/engine/ValidateAttributes.Tests.ps1
rename to test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
diff --git a/test/powershell/engine/Jobs.Tests.ps1 b/test/powershell/engine/Job/Jobs.Tests.ps1
similarity index 100%
rename from test/powershell/engine/Jobs.Tests.ps1
rename to test/powershell/engine/Job/Jobs.Tests.ps1

From b50e900531729e4790a14082db756abe4d417d5d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 11 Aug 2017 08:53:55 -0700
Subject: [PATCH 2/2] [Feature] Move two more tests

---
 test/powershell/engine/{ => Basic}/Attributes.Tests.ps1      | 0
 test/powershell/engine/{ => Basic}/DefaultCommands.Tests.ps1 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/powershell/engine/{ => Basic}/Attributes.Tests.ps1 (100%)
 rename test/powershell/engine/{ => Basic}/DefaultCommands.Tests.ps1 (100%)

diff --git a/test/powershell/engine/Attributes.Tests.ps1 b/test/powershell/engine/Basic/Attributes.Tests.ps1
similarity index 100%
rename from test/powershell/engine/Attributes.Tests.ps1
rename to test/powershell/engine/Basic/Attributes.Tests.ps1
diff --git a/test/powershell/engine/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
similarity index 100%
rename from test/powershell/engine/DefaultCommands.Tests.ps1
rename to test/powershell/engine/Basic/DefaultCommands.Tests.ps1