Skip to content

Add -Delimiter to ConvertFrom-StringData #10665

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
anmenaga merged 10 commits into from
Oct 11, 2019
+46 −4
Merged

Add -Delimiter to ConvertFrom-StringData #10665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2fa7c9e
First attempt at -Delimiter on ConvertFrom-StringData
steviecoaster Oct 1, 2019
0faca80
Add fixes as per @iSazonov
steviecoaster Oct 1, 2019
317060e
removes errant white space
steviecoaster Oct 1, 2019
0222d7e
Adds additional tests to validate new parameter
steviecoaster Oct 1, 2019
3c82aa4
Whoopsy, add "CI" tag to new Describe block
steviecoaster Oct 1, 2019
5f9ad77
Update tests to use Test Cases. Thanks @vexx32 for the suggestion!
steviecoaster Oct 1, 2019
329509d
Reformat test cases to validate both name as value
steviecoaster Oct 2, 2019
673671c
Address pester changes from review comments.
steviecoaster Oct 2, 2019
3914c0e
Update tests per latest PR Review comments
steviecoaster Oct 8, 2019
25b571e
formatting - fixed indent and removed empty line
Oct 11, 2019
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
15 changes: 11 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Licensed under the MIT License.

using System;
using System.Management.Automation;
using System.Collections;
using System.Management.Automation;
using System.Text.RegularExpressions;

namespace Microsoft.PowerShell.Commands
Expand All @@ -30,19 +30,26 @@ public string StringData
{
return _stringData;
}

set
{
_stringData = value;
}
}

/// <summary>
/// Gets or sets the delimiter.
/// </summary>
[Parameter(Position = 1)]
public char Delimiter { get; set; } = '=';

/// <summary>
/// </summary>
protected override void ProcessRecord()
{
Hashtable result = new Hashtable(StringComparer.OrdinalIgnoreCase);

if (String.IsNullOrEmpty(_stringData))
if (string.IsNullOrEmpty(_stringData))
{
WriteObject(result);
return;
Expand All @@ -54,10 +61,10 @@ protected override void ProcessRecord()
{
string s = line.Trim();

if (String.IsNullOrEmpty(s) || s[0] == '#')
if (string.IsNullOrEmpty(s) || s[0] == '#')
continue;

int index = s.IndexOf('=');
int index = s.IndexOf(Delimiter);
Comment thread
iSazonov marked this conversation as resolved.
if (index <= 0)
{
throw PSTraceSource.NewInvalidOperationException(
Expand Down
35 changes: 35 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-StringData.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,38 @@ bazz = 2
$(ConvertFrom-StringData -StringData $sampleData).Values | Should -BeIn @("0","1","2")
}
}

Describe "Delimiter parameter tests" -Tags "CI" {
BeforeAll {
$TestCases = @(
@{ Delimiter = ':'; StringData = 'value:10'; ExpectedResult = @{ Values = 10 } }
@{ Delimiter = '-'; StringData = 'a-b' ; ExpectedResult = @{ Values = 'b' } }
@{ Delimiter = ','; StringData = 'c,d' ; ExpectedResult = @{ Values = 'd' } }
)
}

It "Default delimiter '=' works" {
$actualValue = ConvertFrom-StringData -StringData 'a=b'

$actualValue.Values | Should -BeExactly "b"
$actualValue.Keys | Should -BeExactly "a"
}

It "Should not throw on given delimiter" {
$sampleData = @"
a:b
"@
{ $sampleData | ConvertFrom-StringData -Delimiter ':' } | Should -Not -Throw
}

It 'is able to parse <StringData> with delimiter "<Delimiter>"' -TestCases $TestCases {
param($Delimiter, $StringData, $ExpectedResult)

$Result = ConvertFrom-StringData -StringData $StringData -Delimiter $Delimiter

foreach ($Key in $ExpectedResult.Keys) {
$Key | Should -BeIn $ExpectedResult.Keys
$Result.$Key | Should -Be $ExpectedResult.$Key
}
}
}