Skip to content

Commit de3d697

Browse files
MrMatthewLaytonMrMatthewLayton
authored
update/text-base (#35)
Updated text/base implementation.
1 parent 4228813 commit de3d697

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1323
-819
lines changed

‎OnixLabs.Core.UnitTests/Text/Base32Base32HexAlphabetTests.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base32Base32HexAlphabetTests
2323
public void Base32ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Base32Hex);
27-
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Base32Hex);
26+
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base32ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResultWithPadding(string expected, string value)
4242
{
4343
// Given
44-
Base32 candidate = Base32.Create(value, Base32Alphabet.Base32Hex, true);
44+
Base32 candidate = Base32.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString("P", Base32FormatInfo.Base32Hex);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,10 +57,10 @@ public void CreateShouldProduceExpectedResultWithPadding(string expected, string
5757
public void CreateShouldProduceExpectedResultWithoutPadding(string expected, string value)
5858
{
5959
// Given
60-
Base32 candidate = Base32.Create(value, Base32Alphabet.Base32Hex, false);
60+
Base32 candidate = Base32.Create(value);
6161

6262
// When
63-
string actual = candidate.ToString();
63+
string actual = candidate.ToString(null, Base32FormatInfo.Base32Hex);
6464

6565
// Then
6666
Assert.Equal(expected, actual);
@@ -73,7 +73,7 @@ public void CreateShouldProduceExpectedResultWithoutPadding(string expected, str
7373
public void ParseShouldProduceExpectedResult(string expected, string value)
7474
{
7575
// Given
76-
Base32 candidate = Base32.Parse(value, Base32Alphabet.Base32Hex);
76+
Base32 candidate = Base32.Parse(value, Base32FormatInfo.Base32Hex);
7777

7878
// When
7979
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base32CrockfordAlphabetTests.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base32CrockfordAlphabetTests
2323
public void Base32ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Crockford);
27-
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Crockford);
26+
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base32ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResultWithPadding(string expected, string value)
4242
{
4343
// Given
44-
Base32 candidate = Base32.Create(value, Base32Alphabet.Crockford, true);
44+
Base32 candidate = Base32.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString("P", Base32FormatInfo.Crockford);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,10 +57,10 @@ public void CreateShouldProduceExpectedResultWithPadding(string expected, string
5757
public void CreateShouldProduceExpectedResultWithoutPadding(string expected, string value)
5858
{
5959
// Given
60-
Base32 candidate = Base32.Create(value, Base32Alphabet.Crockford, false);
60+
Base32 candidate = Base32.Create(value);
6161

6262
// When
63-
string actual = candidate.ToString();
63+
string actual = candidate.ToString(null, Base32FormatInfo.Crockford);
6464

6565
// Then
6666
Assert.Equal(expected, actual);
@@ -73,7 +73,7 @@ public void CreateShouldProduceExpectedResultWithoutPadding(string expected, str
7373
public void ParseShouldProduceExpectedResult(string expected, string value)
7474
{
7575
// Given
76-
Base32 candidate = Base32.Parse(value, Base32Alphabet.Crockford);
76+
Base32 candidate = Base32.Parse(value, Base32FormatInfo.Crockford);
7777

7878
// When
7979
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base32DefaultAlphabetTests.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base32DefaultAlphabetTests
2323
public void Base32ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Default);
27-
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.Default);
26+
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base32ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResultWithPadding(string expected, string value)
4242
{
4343
// Given
44-
Base32 candidate = Base32.Create(value, Base32Alphabet.Default, true);
44+
Base32 candidate = Base32.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString("P", Base32FormatInfo.Default);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,10 +57,10 @@ public void CreateShouldProduceExpectedResultWithPadding(string expected, string
5757
public void CreateShouldProduceExpectedResultWithoutPadding(string expected, string value)
5858
{
5959
// Given
60-
Base32 candidate = Base32.Create(value, Base32Alphabet.Default, false);
60+
Base32 candidate = Base32.Create(value);
6161

6262
// When
63-
string actual = candidate.ToString();
63+
string actual = candidate.ToString(null, Base32FormatInfo.Default);
6464

6565
// Then
6666
Assert.Equal(expected, actual);
@@ -73,7 +73,7 @@ public void CreateShouldProduceExpectedResultWithoutPadding(string expected, str
7373
public void ParseShouldProduceExpectedResult(string expected, string value)
7474
{
7575
// Given
76-
Base32 candidate = Base32.Parse(value, Base32Alphabet.Default);
76+
Base32 candidate = Base32.Parse(value, Base32FormatInfo.Default);
7777

7878
// When
7979
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base32ZBase32AlphabetTests.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base32ZBase32AlphabetTests
2323
public void Base32ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.ZBase32);
27-
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz", Base32Alphabet.ZBase32);
26+
Base32 a = Base32.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base32 b = Base32.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base32ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResultWithPadding(string expected, string value)
4242
{
4343
// Given
44-
Base32 candidate = Base32.Create(value, Base32Alphabet.ZBase32, true);
44+
Base32 candidate = Base32.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString("P", Base32FormatInfo.ZBase32);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,10 +57,10 @@ public void CreateShouldProduceExpectedResultWithPadding(string expected, string
5757
public void CreateShouldProduceExpectedResultWithoutPadding(string expected, string value)
5858
{
5959
// Given
60-
Base32 candidate = Base32.Create(value, Base32Alphabet.ZBase32, false);
60+
Base32 candidate = Base32.Create(value);
6161

6262
// When
63-
string actual = candidate.ToString();
63+
string actual = candidate.ToString(null, Base32FormatInfo.ZBase32);
6464

6565
// Then
6666
Assert.Equal(expected, actual);
@@ -73,7 +73,7 @@ public void CreateShouldProduceExpectedResultWithoutPadding(string expected, str
7373
public void ParseShouldProduceExpectedResult(string expected, string value)
7474
{
7575
// Given
76-
Base32 candidate = Base32.Parse(value, Base32Alphabet.ZBase32);
76+
Base32 candidate = Base32.Parse(value, Base32FormatInfo.ZBase32);
7777

7878
// When
7979
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base58DefaultAlphabetTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base58DefaultAlphabetTests
2323
public void Base58ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Default);
27-
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Default);
26+
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base58ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResult(string expected, string value)
4242
{
4343
// Given
44-
Base58 candidate = Base58.Create(value, Base58Alphabet.Default);
44+
Base58 candidate = Base58.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString(null, Base58FormatInfo.Default);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,7 +57,7 @@ public void CreateShouldProduceExpectedResult(string expected, string value)
5757
public void ParseShouldProduceExpectedResult(string expected, string value)
5858
{
5959
// Given
60-
Base58 candidate = Base58.Parse(value, Base58Alphabet.Default);
60+
Base58 candidate = Base58.Parse(value, Base58FormatInfo.Default);
6161

6262
// When
6363
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base58FlickrAlphabetTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base58FlickrAlphabetTests
2323
public void Base58ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Flickr);
27-
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Flickr);
26+
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base58ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResult(string expected, string value)
4242
{
4343
// Given
44-
Base58 candidate = Base58.Create(value, Base58Alphabet.Flickr);
44+
Base58 candidate = Base58.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString(null, Base58FormatInfo.Flickr);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,7 +57,7 @@ public void CreateShouldProduceExpectedResult(string expected, string value)
5757
public void ParseShouldProduceExpectedResult(string expected, string value)
5858
{
5959
// Given
60-
Base58 candidate = Base58.Parse(value, Base58Alphabet.Flickr);
60+
Base58 candidate = Base58.Parse(value, Base58FormatInfo.Flickr);
6161

6262
// When
6363
string actual = candidate.ToPlainTextString();

‎OnixLabs.Core.UnitTests/Text/Base58RippleAlphabetTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright © 2020 ONIXLabs
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ public sealed class Base58RippleAlphabetTests
2323
public void Base58ValuesShouldBeIdentical()
2424
{
2525
// Given
26-
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Ripple);
27-
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz", Base58Alphabet.Ripple);
26+
Base58 a = Base58.Create("abcdefghijklmnopqrstuvwxyz");
27+
Base58 b = Base58.Create("abcdefghijklmnopqrstuvwxyz");
2828

2929
// When
3030
int hashCodeA = a.GetHashCode();
@@ -41,10 +41,10 @@ public void Base58ValuesShouldBeIdentical()
4141
public void CreateShouldProduceExpectedResult(string expected, string value)
4242
{
4343
// Given
44-
Base58 candidate = Base58.Create(value, Base58Alphabet.Ripple);
44+
Base58 candidate = Base58.Create(value);
4545

4646
// When
47-
string actual = candidate.ToString();
47+
string actual = candidate.ToString(null, Base58FormatInfo.Ripple);
4848

4949
// Then
5050
Assert.Equal(expected, actual);
@@ -57,7 +57,7 @@ public void CreateShouldProduceExpectedResult(string expected, string value)
5757
public void ParseShouldProduceExpectedResult(string expected, string value)
5858
{
5959
// Given
60-
Base58 candidate = Base58.Parse(value, Base58Alphabet.Ripple);
60+
Base58 candidate = Base58.Parse(value, Base58FormatInfo.Ripple);
6161

6262
// When
6363
string actual = candidate.ToPlainTextString();

0 commit comments

Comments
 (0)