Skip to content

Revert "Throw error on entering non-existing type in Get-FormatData (#7434) #7546

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.

Sign up for GitHub

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

Merged
TravisEz13 merged 1 commit into from
Aug 16, 2018
Merged

Revert "Throw error on entering non-existing type in Get-FormatData (#7434) #7546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions ...werShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation.Runspaces;
using Microsoft.PowerShell.Commands.Internal.Format;

Expand Down Expand Up @@ -168,40 +167,29 @@ protected override void ProcessRecord()
typedefs.Add(consolidatedTypeName, viewList);
}
viewList.Add(formatdef);
}
}// foreach(ViewDefinition...

if (typedefs.Count == 0)
// write out all the available type definitions
foreach (var pair in typedefs)
{
ErrorRecord errorRecord = new ErrorRecord(
new TypeLoadException(StringUtil.Format(GetFormatDataStrings.SpecifiedTypeNotFound, _typename)),
"SpecifiedTypeNotFound",
ErrorCategory.InvalidOperation,
_typename);
WriteError(errorRecord);
}
else
{
foreach (var pair in typedefs)
{
var typeNames = pair.Key;
var typeNames = pair.Key;

if (writeOldWay)
if (writeOldWay)
{
foreach (var typeName in typeNames)
{
foreach (var typeName in typeNames)
{
var etd = new ExtendedTypeDefinition(typeName, pair.Value);
WriteObject(etd);
}
var etd = new ExtendedTypeDefinition(typeName, pair.Value);
WriteObject(etd);
}
else
}
else
{
var etd = new ExtendedTypeDefinition(typeNames[0], pair.Value);
for (int i = 1; i < typeNames.Count; i++)
{
var etd = new ExtendedTypeDefinition(typeNames[0], pair.Value);
for (int i = 1; i < typeNames.Count; i++)
{
etd.TypeNames.Add(typeNames[i]);
}
WriteObject(etd);
etd.TypeNames.Add(typeNames[i]);
}
WriteObject(etd);
}
}
}
Expand Down
123 changes: 0 additions & 123 deletions src/Microsoft.PowerShell.Commands.Utility/resources/GetFormatDataStrings.resx
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FormatData.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

Describe "Get-FormatData" -Tags "CI" {

Context "Check return type of Get-FormatData" {
Expand All @@ -10,11 +9,4 @@ Describe "Get-FormatData" -Tags "CI" {
,$result | Should -BeOfType "System.Object[]"
}
}

Context "Check for error on invalid type as argument" {

It "Should throw error on invalid type as argument" {
{ Get-FormatData "NoSuch.Type.Exists.Or.IsLoaded" -ErrorAction Stop } | Should -Throw -ErrorId "SpecifiedTypeNotFound,Microsoft.PowerShell.Commands.GetFormatDataCommand"
}
}
}