-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add projected winrt wrapper for server com interface and add tests #1373
Merged
Merged
Changes from 15 commits
Commits
Show all changes
70 commits
Select commit
Hold shift + click to select a range
32ccafc
Merge pull request #1 from microsoft/master
sreadingMSFT ef00fb8
Merge pull request #3 from ashpatil-msft/master
sreadingMSFT da6aa19
Merge pull request #5 from microsoft/master
sreadingMSFT bad3b48
Merge branch 'microsoft:master' into master
sreadingMSFT 105a7f5
Merge branch 'microsoft:master' into master
sreadingMSFT a0ebabb
Merge branch 'microsoft:master' into master
sreadingMSFT 906e4c9
Merge branch 'microsoft:master' into master
sreadingMSFT 4d20d75
Merge branch 'microsoft:master' into master
sreadingMSFT 6c16c79
Add c# in proc winrt wrapper and projection
sreadingMSFT cd2629b
Add wrapper implementation and project
sreadingMSFT a8ab9d4
Merge branch 'microsoft:master' into comtesting
sreadingMSFT 214f6b8
Override factory to return objects.
sreadingMSFT a09ad24
Merge branch 'microsoft:master' into comtesting
sreadingMSFT b1af536
Fix unreferenced parameters.
sreadingMSFT e9afd23
Guid name updates.
sreadingMSFT 8c31226
Undo unneccessary changes.
sreadingMSFT d2d45d7
Merge branch 'microsoft:master' into comtesting
sreadingMSFT b3d3a07
Remove projection.
sreadingMSFT dc2d71e
Spelling changes.
sreadingMSFT eb31f6e
Simplify packaged test csproj file.
sreadingMSFT 5d041fd
Update guids\packagereference versions.
sreadingMSFT 732e330
Remove anycpu
sreadingMSFT 48669bd
Append defines instead of overriding.
sreadingMSFT 40d62a9
Attempt switch to packages.config for nuget
sreadingMSFT 84d7982
Add packagereference back.
sreadingMSFT 95c024d
Try packages.config again.
sreadingMSFT 763f2e1
Try direct restore of csproj
sreadingMSFT 20e11a5
Try workaround solutiondir issue
sreadingMSFT 40ad2db
Try fix bundleplatforms.
sreadingMSFT 83bd272
Change outputpath
sreadingMSFT d6ddc08
Remove output path
sreadingMSFT 94dba4b
Make client and server have separate lib names.
sreadingMSFT 76c83ef
Add output path back.
sreadingMSFT 2c58369
Merge branch 'master' into comtesting
sreadingMSFT 2903f18
Merge build break fix to allow pipeline run.
sreadingMSFT 8325d9d
Move test package to its own solution.
sreadingMSFT d8ac3da
Microsoft.Management.Deployment.Client buildchange
sreadingMSFT fde3252
Merge local master to comtesting (#16)
sreadingMSFT 097cc58
Remove unneccessary cpp files
sreadingMSFT cb105ce
Merge branch 'master' into comtesting
sreadingMSFT e32bf8d
Run Com Interface tests
sreadingMSFT f9b6032
Add appxrecipe to spelling
sreadingMSFT 345100b
Update test path
sreadingMSFT ee6ac78
Update test paths.
sreadingMSFT 2681ebc
Remove test adapter dll from testassembly
sreadingMSFT 0ed4c0c
Add powershell task to install wingetdev
sreadingMSFT 6934b83
Add runsettings file to publish logs.
sreadingMSFT 33dc1fe
Test installing package in vstest
sreadingMSFT d112dc5
Try newer windows server.
sreadingMSFT 893724e
Try enable com tracing for tests.
sreadingMSFT 9d3cf61
Try direct run of vstest
sreadingMSFT 729a22c
Fix install script to call add script.
sreadingMSFT c14f1d8
Fix appxpackages path.
sreadingMSFT c125c0c
Fix path again, remove trace
sreadingMSFT e088c8c
Extract unsigned package for loose register
sreadingMSFT ed0a486
reenable tracing
sreadingMSFT d5bf1df
Include server in packagedtests
sreadingMSFT 22468d0
Remove build dependency on wingetserver project
sreadingMSFT 225ce50
Try tracelog comtracing.
sreadingMSFT 6d68e6f
Fix powershell args.
sreadingMSFT f764883
Handle variable azure src dir paths.
sreadingMSFT 4a226d1
Make Dll version of com server and use for tests
sreadingMSFT 67206e1
Fix library name parameter.
sreadingMSFT b0dc811
Merge branch 'microsoft:master' into comtesting
sreadingMSFT 750e003
Remove com tracing. Fix test.
sreadingMSFT 34bfab9
Fix copyright and spelling.
sreadingMSFT a6dba4e
Merge branch 'master' into comtesting
sreadingMSFT c67af0e
Try decrease build disk size.
sreadingMSFT 3dde67e
Merge branch 'comtesting' of https://github.com/sreadingMSFT/winget-c…
sreadingMSFT 42bcdbf
Merge branch 'microsoft:master' into comtesting
sreadingMSFT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/Microsoft.Management.Deployment.Client/CatalogPackage.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "CatalogPackage.h" | ||
#include "CatalogPackage.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
hstring CatalogPackage::Id() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring CatalogPackage::Name() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::InstalledVersion() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::PackageVersionId> CatalogPackage::AvailableVersions() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::DefaultInstallVersion() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo CatalogPackage::GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
bool CatalogPackage::IsUpdateAvailable() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/Microsoft.Management.Deployment.Client/CatalogPackage.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#pragma once | ||
#include "CatalogPackage.g.h" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
struct CatalogPackage : CatalogPackageT<CatalogPackage> | ||
{ | ||
CatalogPackage() = default; | ||
|
||
hstring Id(); | ||
hstring Name(); | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo InstalledVersion(); | ||
winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::PackageVersionId> AvailableVersions(); | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo DefaultInstallVersion(); | ||
winrt::Microsoft::Management::Deployment::PackageVersionInfo GetPackageVersionInfo(winrt::Microsoft::Management::Deployment::PackageVersionId const& versionKey); | ||
bool IsUpdateAvailable(); | ||
}; | ||
} |
17 changes: 17 additions & 0 deletions
17
src/Microsoft.Management.Deployment.Client/ConnectResult.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "ConnectResult.h" | ||
#include "ConnectResult.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
winrt::Microsoft::Management::Deployment::ConnectResultStatus ConnectResult::Status() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageCatalog ConnectResult::PackageCatalog() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
src/Microsoft.Management.Deployment.Client/ConnectResult.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#pragma once | ||
#include "ConnectResult.g.h" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
struct ConnectResult : ConnectResultT<ConnectResult> | ||
{ | ||
ConnectResult() = default; | ||
|
||
winrt::Microsoft::Management::Deployment::ConnectResultStatus Status(); | ||
winrt::Microsoft::Management::Deployment::PackageCatalog PackageCatalog(); | ||
}; | ||
} |
21 changes: 21 additions & 0 deletions
21
src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "CreateCompositePackageCatalogOptions.h" | ||
#include "CreateCompositePackageCatalogOptions.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageCatalogReference> CreateCompositePackageCatalogOptions::Catalogs() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::CompositeSearchBehavior CreateCompositePackageCatalogOptions::CompositeSearchBehavior() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void CreateCompositePackageCatalogOptions::CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
28 changes: 28 additions & 0 deletions
28
src/Microsoft.Management.Deployment.Client/CreateCompositePackageCatalogOptions.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#pragma once | ||
#include "CreateCompositePackageCatalogOptions.g.h" | ||
|
||
const CLSID CLSID_CreateCompositePackageCatalogOptions = { 0x6444B10D, 0xFE84, 0x430F, { 0x93, 0x2B, 0x3D, 0x4F, 0xE5, 0x19, 0x5B, 0xDF } }; //6444B10D-FE84-430F-932B-3D4FE5195BDF | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT<CreateCompositePackageCatalogOptions> | ||
{ | ||
CreateCompositePackageCatalogOptions() = default; | ||
|
||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageCatalogReference> Catalogs(); | ||
winrt::Microsoft::Management::Deployment::CompositeSearchBehavior CompositeSearchBehavior(); | ||
void CompositeSearchBehavior(winrt::Microsoft::Management::Deployment::CompositeSearchBehavior const& value); | ||
}; | ||
} | ||
namespace winrt::Microsoft::Management::Deployment::factory_implementation | ||
{ | ||
struct CreateCompositePackageCatalogOptions : CreateCompositePackageCatalogOptionsT<CreateCompositePackageCatalogOptions, implementation::CreateCompositePackageCatalogOptions> | ||
{ | ||
auto ActivateInstance() const | ||
{ | ||
return winrt::create_instance<winrt::Microsoft::Management::Deployment::PackageManager>(CLSID_CreateCompositePackageCatalogOptions, CLSCTX_ALL); | ||
} | ||
}; | ||
} |
25 changes: 25 additions & 0 deletions
25
src/Microsoft.Management.Deployment.Client/FindPackagesOptions.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "FindPackagesOptions.h" | ||
#include "FindPackagesOptions.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageMatchFilter> FindPackagesOptions::Selectors() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageMatchFilter> FindPackagesOptions::Filters() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
uint32_t FindPackagesOptions::ResultLimit() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void FindPackagesOptions::ResultLimit(uint32_t) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
src/Microsoft.Management.Deployment.Client/FindPackagesOptions.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#pragma once | ||
#include "FindPackagesOptions.g.h" | ||
|
||
const CLSID CLSID_FindPackagesOptions = { 0x2CAD6C15, 0xDF8E, 0x49DD, { 0xA7, 0x48, 0x96, 0xAD, 0xE0, 0xFE, 0x31, 0xB7 } }; //2CAD6C15-DF8E-49DD-A748-96ADE0FE31B7 | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
struct FindPackagesOptions : FindPackagesOptionsT<FindPackagesOptions> | ||
{ | ||
FindPackagesOptions() = default; | ||
|
||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageMatchFilter> Selectors(); | ||
winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Management::Deployment::PackageMatchFilter> Filters(); | ||
uint32_t ResultLimit(); | ||
void ResultLimit(uint32_t value); | ||
}; | ||
} | ||
namespace winrt::Microsoft::Management::Deployment::factory_implementation | ||
{ | ||
struct FindPackagesOptions : FindPackagesOptionsT<FindPackagesOptions, implementation::FindPackagesOptions> | ||
{ | ||
auto ActivateInstance() const | ||
{ | ||
return winrt::create_instance<winrt::Microsoft::Management::Deployment::PackageManager>(CLSID_FindPackagesOptions, CLSCTX_ALL); | ||
} | ||
}; | ||
} |
21 changes: 21 additions & 0 deletions
21
src/Microsoft.Management.Deployment.Client/FindPackagesResult.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "FindPackagesResult.h" | ||
#include "FindPackagesResult.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
winrt::Microsoft::Management::Deployment::FindPackagesResultStatus FindPackagesResult::Status() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult> FindPackagesResult::Matches() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
bool FindPackagesResult::WasLimitExceeded() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
src/Microsoft.Management.Deployment.Client/FindPackagesResult.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#pragma once | ||
#include "FindPackagesResult.g.h" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
struct FindPackagesResult : FindPackagesResultT<FindPackagesResult> | ||
{ | ||
FindPackagesResult() = default; | ||
|
||
winrt::Microsoft::Management::Deployment::FindPackagesResultStatus Status(); | ||
winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult> Matches(); | ||
bool WasLimitExceeded(); | ||
}; | ||
} |
81 changes: 81 additions & 0 deletions
81
src/Microsoft.Management.Deployment.Client/InstallOptions.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
#include "pch.h" | ||
#include "InstallOptions.h" | ||
#include "InstallOptions.g.cpp" | ||
|
||
namespace winrt::Microsoft::Management::Deployment::implementation | ||
{ | ||
winrt::Microsoft::Management::Deployment::PackageVersionId InstallOptions::PackageVersionId() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::PackageVersionId(winrt::Microsoft::Management::Deployment::PackageVersionId const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring InstallOptions::PreferredInstallLocation() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::PreferredInstallLocation(hstring const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageInstallScope InstallOptions::PackageInstallScope() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::PackageInstallScope(winrt::Microsoft::Management::Deployment::PackageInstallScope const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
winrt::Microsoft::Management::Deployment::PackageInstallMode InstallOptions::PackageInstallMode() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::PackageInstallMode(winrt::Microsoft::Management::Deployment::PackageInstallMode const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring InstallOptions::LogOutputPath() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::LogOutputPath(hstring const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
bool InstallOptions::AllowHashMismatch() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::AllowHashMismatch(bool) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring InstallOptions::ReplacementInstallerArguments() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::ReplacementInstallerArguments(hstring const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring InstallOptions::CorrelationData() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::CorrelationData(hstring const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
hstring InstallOptions::AdditionalPackageCatalogArguments() | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
void InstallOptions::AdditionalPackageCatalogArguments(hstring const&) | ||
{ | ||
throw hresult_not_implemented(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. Changes in this file are from an attempt to re-use the existing tests. Will revert. #Pending