From 3e3559d9491aef249c670fc77fb5e9e5208a90f9 Mon Sep 17 00:00:00 2001 From: amsga <49681949+amsga@users.noreply.github.com> Date: Wed, 4 Mar 2026 11:09:47 +0800 Subject: [PATCH] Changed folder structure to match the TensionDev.ULID namespace. --- CHANGELOG.md | 12 +- .../CrockfordBase32DecodeData.cs | 2 +- .../TensionDev.ULID.Tests.csproj | 4 +- .../UlidTests.cs | 144 +++++++++--------- ULIDUtil.sln => TensionDev.ULID.sln | 4 +- .../TensionDev.ULID.csproj | 0 {ULIDUtil => TensionDev.ULID}/Ulid.cs | 0 7 files changed, 85 insertions(+), 81 deletions(-) rename {XUnitTestProjectULID => TensionDev.ULID.Tests}/CrockfordBase32DecodeData.cs (98%) rename XUnitTestProjectULID/XUnitTestProjectULID.csproj => TensionDev.ULID.Tests/TensionDev.ULID.Tests.csproj (87%) rename XUnitTestProjectULID/UnitTestUlid.cs => TensionDev.ULID.Tests/UlidTests.cs (73%) rename ULIDUtil.sln => TensionDev.ULID.sln (80%) rename ULIDUtil/ULIDUtil.csproj => TensionDev.ULID/TensionDev.ULID.csproj (100%) rename {ULIDUtil => TensionDev.ULID}/Ulid.cs (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a47fbd1..bf848a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Changed folder structure to match the TensionDev.ULID namespace. + + ## [v1.0.0] - 2026-02-11 -[v1.0.0](https://github.com/TensionDev/ULIDUtil/releases/tag/v1.0.0) +[v1.0.0](https://github.com/TensionDev/ULID/releases/tag/v1.0.0) ### Added - Added TryParse for character spans. @@ -21,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v0.2.0] - 2025-05-01 -[v0.2.0](https://github.com/TensionDev/ULIDUtil/releases/tag/v0.2.0) +[v0.2.0](https://github.com/TensionDev/ULID/releases/tag/v0.2.0) ### Added - Added DateTime Conversion from ULID. @@ -32,14 +36,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v0.1.1] - 2025-02-02 [YANKED] -[v0.1.1](https://github.com/TensionDev/ULIDUtil/releases/tag/v0.1.1) +[v0.1.1](https://github.com/TensionDev/ULID/releases/tag/v0.1.1) ### Changed - Changed Exception thrown message to a standardised string. ## [v0.1.0-alpha] - 2024-12-09 -[v0.1.0-alpha](https://github.com/TensionDev/ULIDUtil/releases/tag/v0.1.0-alpha) +[v0.1.0-alpha](https://github.com/TensionDev/ULID/releases/tag/v0.1.0-alpha) ### Added - Added ULID generated based on current system date and time. diff --git a/XUnitTestProjectULID/CrockfordBase32DecodeData.cs b/TensionDev.ULID.Tests/CrockfordBase32DecodeData.cs similarity index 98% rename from XUnitTestProjectULID/CrockfordBase32DecodeData.cs rename to TensionDev.ULID.Tests/CrockfordBase32DecodeData.cs index 78f3513..a9ae40b 100644 --- a/XUnitTestProjectULID/CrockfordBase32DecodeData.cs +++ b/TensionDev.ULID.Tests/CrockfordBase32DecodeData.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Xunit; -namespace XUnitTestProjectULID +namespace TensionDev.ULID.Tests { public class CrockfordBase32DecodeData : TheoryData { diff --git a/XUnitTestProjectULID/XUnitTestProjectULID.csproj b/TensionDev.ULID.Tests/TensionDev.ULID.Tests.csproj similarity index 87% rename from XUnitTestProjectULID/XUnitTestProjectULID.csproj rename to TensionDev.ULID.Tests/TensionDev.ULID.Tests.csproj index 1fceeba..9d31695 100644 --- a/XUnitTestProjectULID/XUnitTestProjectULID.csproj +++ b/TensionDev.ULID.Tests/TensionDev.ULID.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 false disable @@ -23,7 +23,7 @@ - + diff --git a/XUnitTestProjectULID/UnitTestUlid.cs b/TensionDev.ULID.Tests/UlidTests.cs similarity index 73% rename from XUnitTestProjectULID/UnitTestUlid.cs rename to TensionDev.ULID.Tests/UlidTests.cs index f7068ca..42d57b4 100644 --- a/XUnitTestProjectULID/UnitTestUlid.cs +++ b/TensionDev.ULID.Tests/UlidTests.cs @@ -1,16 +1,16 @@ using System; using Xunit; -namespace XUnitTestProjectULID +namespace TensionDev.ULID.Tests { - public class UnitTestUlid + public class UlidTests { [Fact] public void TestUlidMax() { string expectedULID = "7ZZZZZZZZZZZZZZZZZZZZZZZZZ"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Max; + Ulid ulid = Ulid.Max; Assert.Equal(expectedULID, ulid.ToString()); } @@ -20,7 +20,7 @@ public void TestConstructorDateTime() string expectedULID = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; DateTime dateTime = new DateTime(2016, 07, 30, 23, 54, 10, 259, DateTimeKind.Utc); - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(dateTime); + Ulid ulid = new Ulid(dateTime); // First 10 characters are the timestamp, next 16 are random. Assert.Equal(expectedULID.Substring(0, 10), ulid.ToString().Substring(0, 10)); @@ -30,14 +30,14 @@ public void TestConstructorDateTime() public void TestConstructorNullByteArray() { byte[] vs = null; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] public void TestConstructorInvalidSizeByteArray() { byte[] vs = new byte[17]; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] @@ -46,7 +46,7 @@ public void TestConstructorByteArray() string expectedULID = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; byte[] vs = new byte[] { 0x01, 0x56, 0x3e, 0x3a, 0xb5, 0xd3, 0xd6, 0x76, 0x4c, 0x61, 0xef, 0xb9, 0x93, 0x02, 0xbd, 0x5b }; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); + Ulid ulid = new Ulid(vs); Assert.Equal(expectedULID, ulid.ToString()); } @@ -54,28 +54,28 @@ public void TestConstructorByteArray() public void TestConstructorNullString() { string vs = null; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] public void TestConstructorEmptyString() { string vs = string.Empty; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] public void TestConstructorInvalidSizeString() { string vs = "0123456789"; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] public void TestConstructorInvalidCharacterString() { string vs = "01ARZ3NDEKTSU4RRFFQ69G5FAV"; - Assert.Throws(() => { TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); }); + Assert.Throws(() => { Ulid ulid = new Ulid(vs); }); } [Fact] @@ -83,7 +83,7 @@ public void TestTryParseStringValid() { string expectedULID = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - bool result = TensionDev.ULID.Ulid.TryParse(expectedULID, out TensionDev.ULID.Ulid ulid); + bool result = Ulid.TryParse(expectedULID, out Ulid ulid); Assert.Equal(expectedULID, ulid.ToString()); Assert.True(result); } @@ -93,7 +93,7 @@ public void TestTryParseStringInvalid() { string expectedULID = "01ARZ3NDEKTSU4RRFFQ69G5FAV"; - bool result = TensionDev.ULID.Ulid.TryParse(expectedULID, out TensionDev.ULID.Ulid _); + bool result = Ulid.TryParse(expectedULID, out Ulid _); Assert.False(result); } @@ -104,7 +104,7 @@ public void TestTryParseSpanValid() string expectedULID = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; ReadOnlySpan input = expectedULID.AsSpan(); - bool result = TensionDev.ULID.Ulid.TryParse(input, out TensionDev.ULID.Ulid ulid); + bool result = Ulid.TryParse(input, out Ulid ulid); Assert.Equal(expectedULID, ulid.ToString()); Assert.True(result); } @@ -115,7 +115,7 @@ public void TestTryParseSpanInvalid() string expectedULID = "01ARZ3NDEKTSU4RRFFQ69G5FAV"; ReadOnlySpan input = expectedULID.AsSpan(); - bool result = TensionDev.ULID.Ulid.TryParse(input, out TensionDev.ULID.Ulid _); + bool result = Ulid.TryParse(input, out Ulid _); Assert.False(result); } #endif @@ -126,7 +126,7 @@ public void TestCompareToObject() int expectedResult = 1; object other = new object(); string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = Ulid.Parse(vs); int actualResult = ulid.CompareTo(other); Assert.Equal(expectedResult, actualResult); @@ -137,8 +137,8 @@ public void TestCompareToObjectUlid() { int expectedResult = 0; string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); - object other = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = Ulid.Parse(vs); + object other = Ulid.Parse(vs); int actualResult = ulid.CompareTo(other); Assert.Equal(expectedResult, actualResult); @@ -149,8 +149,8 @@ public void TestCompareToTwoInstance() { int expectedResult = 0; string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); int actualResult = ulid1.CompareTo(ulid2); Assert.Equal(expectedResult, actualResult); @@ -161,8 +161,8 @@ public void TestCompareToNull() { int expectedResult = 1; string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = null; int actualResult = ulid1.CompareTo(ulid2); Assert.Equal(expectedResult, actualResult); @@ -172,8 +172,8 @@ public void TestCompareToNull() public void TestEqualsNull() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid = Ulid.Parse(vs); + Ulid ulid2 = null; bool actualResult = ulid.Equals(ulid2); Assert.False(actualResult); @@ -183,8 +183,8 @@ public void TestEqualsNull() public void TestEqualsObjectUlid() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); - object other = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = Ulid.Parse(vs); + object other = Ulid.Parse(vs); bool actualResult = ulid.Equals(other); Assert.True(actualResult); @@ -195,7 +195,7 @@ public void TestEqualsObject() { object other = new object(); string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = Ulid.Parse(vs); bool actualResult = ulid.Equals(other); Assert.False(actualResult); @@ -205,8 +205,8 @@ public void TestEqualsObject() public void TestEqualsTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid1.Equals(ulid2); Assert.True(actualResult); @@ -216,8 +216,8 @@ public void TestEqualsTwoInstance() public void TestGetHashCodeTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); int hashcode1 = ulid1.GetHashCode(); int hashcode2 = ulid2.GetHashCode(); @@ -229,7 +229,7 @@ public void TestToByteArray1() { byte[] expected = new byte[] { 0x01, 0x56, 0x3e, 0x3a, 0xb5, 0xd3, 0xd6, 0x76, 0x4c, 0x61, 0xef, 0xb9, 0x93, 0x02, 0xbd, 0x5b }; string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); + Ulid ulid = new Ulid(vs); byte[] actual = ulid.ToByteArray(); Assert.Equal(expected, actual); @@ -239,7 +239,7 @@ public void TestToByteArray1() public void TestToByteArray2() { byte[] expected = new byte[] { 0x01, 0x56, 0x3e, 0x3a, 0xb5, 0xd3, 0xd6, 0x76, 0x4c, 0x61, 0xef, 0xb9, 0x93, 0x02, 0xbd, 0x5b }; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(expected); + Ulid ulid = new Ulid(expected); byte[] actual = ulid.ToByteArray(); Assert.Equal(expected, actual); @@ -250,7 +250,7 @@ public void TestToString1() { string expected = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; byte[] vs = new byte[] { 0x01, 0x56, 0x3e, 0x3a, 0xb5, 0xd3, 0xd6, 0x76, 0x4c, 0x61, 0xef, 0xb9, 0x93, 0x02, 0xbd, 0x5b }; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); + Ulid ulid = new Ulid(vs); string actual = ulid.ToString(); Assert.Equal(expected, actual); @@ -260,7 +260,7 @@ public void TestToString1() public void TestToString2() { string expected = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(expected); + Ulid ulid = new Ulid(expected); string actual = ulid.ToString(); Assert.Equal(expected, actual); @@ -271,7 +271,7 @@ public void TestToGuid1() { Guid expected = new Guid("01563E3A-B5D3-D676-4C61-EFB99302BD5B"); string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); + Ulid ulid = new Ulid(vs); Guid actual = ulid.ToGuid(); Assert.Equal(expected.ToString(), actual.ToString()); @@ -282,7 +282,7 @@ public void TestToDateTimeString() { DateTime expected = new DateTime(2016, 07, 30, 23, 54, 10, 259, DateTimeKind.Utc); - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid("01ARZ3NDEKTSV4RRFFQ69G5FAV"); + Ulid ulid = new Ulid("01ARZ3NDEKTSV4RRFFQ69G5FAV"); DateTime actual = ulid.ToDateTime(); Assert.Equal(expected, actual, TimeSpan.FromMilliseconds(1)); @@ -294,7 +294,7 @@ public void TestToDateTimeByteArray() DateTime expected = new DateTime(2016, 07, 30, 23, 54, 10, 259, DateTimeKind.Utc); byte[] vs = new byte[] { 0x01, 0x56, 0x3e, 0x3a, 0xb5, 0xd3, 0xd6, 0x76, 0x4c, 0x61, 0xef, 0xb9, 0x93, 0x02, 0xbd, 0x5b }; - TensionDev.ULID.Ulid ulid = new TensionDev.ULID.Ulid(vs); + Ulid ulid = new Ulid(vs); DateTime actual = ulid.ToDateTime(); Assert.Equal(expected, actual, TimeSpan.FromMilliseconds(1)); @@ -303,8 +303,8 @@ public void TestToDateTimeByteArray() [Fact] public void TestOperatorEqualsBothNull() { - TensionDev.ULID.Ulid ulid = null; - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid = null; + Ulid ulid2 = null; bool actualResult = ulid == ulid2; Assert.True(actualResult); @@ -314,8 +314,8 @@ public void TestOperatorEqualsBothNull() public void TestOperatorEqualsNull1() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid = Ulid.Parse(vs); + Ulid ulid2 = null; bool actualResult = ulid == ulid2; Assert.False(actualResult); @@ -325,8 +325,8 @@ public void TestOperatorEqualsNull1() public void TestOperatorEqualsNull2() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = null; - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = null; + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid == ulid2; Assert.False(actualResult); @@ -336,8 +336,8 @@ public void TestOperatorEqualsNull2() public void TestOperatorEqualsTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid1 == ulid2; Assert.True(actualResult); @@ -346,8 +346,8 @@ public void TestOperatorEqualsTwoInstance() [Fact] public void TestOperatorNotEqualsBothNull() { - TensionDev.ULID.Ulid ulid = null; - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid = null; + Ulid ulid2 = null; bool actualResult = ulid != ulid2; Assert.False(actualResult); @@ -357,8 +357,8 @@ public void TestOperatorNotEqualsBothNull() public void TestOperatorNotEqualsNull1() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = null; + Ulid ulid = Ulid.Parse(vs); + Ulid ulid2 = null; bool actualResult = ulid != ulid2; Assert.True(actualResult); @@ -368,8 +368,8 @@ public void TestOperatorNotEqualsNull1() public void TestOperatorNotEqualsNull2() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid = null; - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid = null; + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid != ulid2; Assert.True(actualResult); @@ -379,8 +379,8 @@ public void TestOperatorNotEqualsNull2() public void TestOperatorNotEqualsTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid1 != ulid2; Assert.False(actualResult); @@ -390,8 +390,8 @@ public void TestOperatorNotEqualsTwoInstance() public void TestOperatorLessThanTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid1 < ulid2; Assert.False(actualResult); @@ -402,8 +402,8 @@ public void TestOperatorLessThanSmallerInstance() { string vs1 = "01ARZ3NDEKSSV4RRFFQ69G5FAV"; string vs2 = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs1); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs2); + Ulid ulid1 = Ulid.Parse(vs1); + Ulid ulid2 = Ulid.Parse(vs2); bool actualResult = ulid1 < ulid2; Assert.True(actualResult); @@ -414,8 +414,8 @@ public void TestOperatorLessThanLargerInstance() { string vs1 = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; string vs2 = "01ARZ3NDEKSSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs1); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs2); + Ulid ulid1 = Ulid.Parse(vs1); + Ulid ulid2 = Ulid.Parse(vs2); bool actualResult = ulid1 < ulid2; Assert.False(actualResult); @@ -425,8 +425,8 @@ public void TestOperatorLessThanLargerInstance() public void TestOperatorGreaterThanTwoInstance() { string vs = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs); + Ulid ulid1 = Ulid.Parse(vs); + Ulid ulid2 = Ulid.Parse(vs); bool actualResult = ulid1 > ulid2; Assert.False(actualResult); @@ -437,8 +437,8 @@ public void TestOperatorGreaterThanSmallerInstance() { string vs1 = "01ARZ3NDEKSSV4RRFFQ69G5FAV"; string vs2 = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs1); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs2); + Ulid ulid1 = Ulid.Parse(vs1); + Ulid ulid2 = Ulid.Parse(vs2); bool actualResult = ulid1 > ulid2; Assert.False(actualResult); @@ -449,8 +449,8 @@ public void TestOperatorGreaterThanLargerInstance() { string vs1 = "01ARZ3NDEKTSV4RRFFQ69G5FAV"; string vs2 = "01ARZ3NDEKSSV4RRFFQ69G5FAV"; - TensionDev.ULID.Ulid ulid1 = TensionDev.ULID.Ulid.Parse(vs1); - TensionDev.ULID.Ulid ulid2 = TensionDev.ULID.Ulid.Parse(vs2); + Ulid ulid1 = Ulid.Parse(vs1); + Ulid ulid2 = Ulid.Parse(vs2); bool actualResult = ulid1 > ulid2; Assert.True(actualResult); @@ -461,7 +461,7 @@ public void TestToCrockfordBase32ArgumentException() { ulong value = 32; - Assert.Throws(() => { Char actual = TensionDev.ULID.Ulid.ToCrockfordBase32(value); }); + Assert.Throws(() => { Char actual = Ulid.ToCrockfordBase32(value); }); } [Theory] @@ -499,7 +499,7 @@ public void TestToCrockfordBase32ArgumentException() [InlineData('Z', 31)] public void TestToCrockfordBase32UInt64(Char expected, ulong value) { - Char actual = TensionDev.ULID.Ulid.ToCrockfordBase32(value); + Char actual = Ulid.ToCrockfordBase32(value); Assert.Equal(expected, actual); } @@ -538,7 +538,7 @@ public void TestToCrockfordBase32UInt64(Char expected, ulong value) [InlineData('Z', 31)] public void TestToCrockfordBase32UInt32(Char expected, uint value) { - Char actual = TensionDev.ULID.Ulid.ToCrockfordBase32(value); + Char actual = Ulid.ToCrockfordBase32(value); Assert.Equal(expected, actual); } @@ -577,7 +577,7 @@ public void TestToCrockfordBase32UInt32(Char expected, uint value) [InlineData('Z', 31)] public void TestToCrockfordBase32UInt16(Char expected, ushort value) { - Char actual = TensionDev.ULID.Ulid.ToCrockfordBase32(value); + Char actual = Ulid.ToCrockfordBase32(value); Assert.Equal(expected, actual); } @@ -586,14 +586,14 @@ public void TestToCrockfordBase32UInt16(Char expected, ushort value) [InlineData('U')] public void TestFromCrockfordBase32ArgumentException(Char value) { - Assert.Throws(() => { ulong actual = TensionDev.ULID.Ulid.FromCrockfordBase32(value); }); + Assert.Throws(() => { ulong actual = Ulid.FromCrockfordBase32(value); }); } [Theory] [ClassData(typeof(CrockfordBase32DecodeData))] public void TestFromCrockfordBase32(Char value, ulong expected) { - ulong actual = TensionDev.ULID.Ulid.FromCrockfordBase32(value); + ulong actual = Ulid.FromCrockfordBase32(value); Assert.Equal(expected, actual); } } diff --git a/ULIDUtil.sln b/TensionDev.ULID.sln similarity index 80% rename from ULIDUtil.sln rename to TensionDev.ULID.sln index 567fb8d..6a467fb 100644 --- a/ULIDUtil.sln +++ b/TensionDev.ULID.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 VisualStudioVersion = 18.2.11415.280 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ULIDUtil", "ULIDUtil\ULIDUtil.csproj", "{97FFCEA8-F181-4034-8D96-8510BC3D7729}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensionDev.ULID", "TensionDev.ULID\TensionDev.ULID.csproj", "{97FFCEA8-F181-4034-8D96-8510BC3D7729}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XUnitTestProjectULID", "XUnitTestProjectULID\XUnitTestProjectULID.csproj", "{2F574028-685D-41E7-B807-4AC7B54D6B00}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensionDev.ULID.Tests", "TensionDev.ULID.Tests\TensionDev.ULID.Tests.csproj", "{2F574028-685D-41E7-B807-4AC7B54D6B00}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ULIDUtil/ULIDUtil.csproj b/TensionDev.ULID/TensionDev.ULID.csproj similarity index 100% rename from ULIDUtil/ULIDUtil.csproj rename to TensionDev.ULID/TensionDev.ULID.csproj diff --git a/ULIDUtil/Ulid.cs b/TensionDev.ULID/Ulid.cs similarity index 100% rename from ULIDUtil/Ulid.cs rename to TensionDev.ULID/Ulid.cs