From b9a1efdacc5af9b14864b1ba25df5ce23ce95202 Mon Sep 17 00:00:00 2001 From: amsga <49681949+amsga@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:32:00 +0800 Subject: [PATCH] Changed folder structure to match the TensionDev.UUID namespace. --- CHANGELOG.md | 34 +-- .../TensionDev.UUID.Tests.csproj | 4 +- .../UUIDNamespaceTests.cs | 12 +- .../UUIDv1Tests.cs | 84 ++++---- TensionDev.UUID.Tests/UUIDv3Tests.cs | 108 ++++++++++ .../UUIDv4Tests.cs | 38 ++-- TensionDev.UUID.Tests/UUIDv5Tests.cs | 108 ++++++++++ .../UUIDv6Tests.cs | 82 ++++---- .../UUIDv7Tests.cs | 94 ++++----- .../UuidTests.cs | 195 +++++++++--------- UUIDUtil.sln => TensionDev.UUID.sln | 4 +- .../TensionDev.UUID.csproj | 0 .../UUIDNamespace.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv1.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv3.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv4.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv5.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv6.cs | 0 {UUIDUtil => TensionDev.UUID}/UUIDv7.cs | 0 {UUIDUtil => TensionDev.UUID}/Uuid.cs | 0 XUnitTestProjectUUID/UnitTestUUIDv3.cs | 108 ---------- XUnitTestProjectUUID/UnitTestUUIDv5.cs | 108 ---------- 22 files changed, 491 insertions(+), 488 deletions(-) rename XUnitTestProjectUUID/XUnitTestProjectUUID.csproj => TensionDev.UUID.Tests/TensionDev.UUID.Tests.csproj (85%) rename XUnitTestProjectUUID/UnitTestUUIDNamespace.cs => TensionDev.UUID.Tests/UUIDNamespaceTests.cs (89%) rename XUnitTestProjectUUID/UnitTestUUIDv1.cs => TensionDev.UUID.Tests/UUIDv1Tests.cs (53%) create mode 100644 TensionDev.UUID.Tests/UUIDv3Tests.cs rename XUnitTestProjectUUID/UnitTestUUIDv4.cs => TensionDev.UUID.Tests/UUIDv4Tests.cs (53%) create mode 100644 TensionDev.UUID.Tests/UUIDv5Tests.cs rename XUnitTestProjectUUID/UnitTestUUIDv6.cs => TensionDev.UUID.Tests/UUIDv6Tests.cs (51%) rename XUnitTestProjectUUID/UnitTestUUIDv7.cs => TensionDev.UUID.Tests/UUIDv7Tests.cs (53%) rename XUnitTestProjectUUID/UnitTestUuid.cs => TensionDev.UUID.Tests/UuidTests.cs (66%) rename UUIDUtil.sln => TensionDev.UUID.sln (80%) rename UUIDUtil/UUIDUtil.csproj => TensionDev.UUID/TensionDev.UUID.csproj (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDNamespace.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv1.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv3.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv4.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv5.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv6.cs (100%) rename {UUIDUtil => TensionDev.UUID}/UUIDv7.cs (100%) rename {UUIDUtil => TensionDev.UUID}/Uuid.cs (100%) delete mode 100644 XUnitTestProjectUUID/UnitTestUUIDv3.cs delete mode 100644 XUnitTestProjectUUID/UnitTestUUIDv5.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index b1dccfb..e845f54 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.UUID namespace. + + ## [v2.4.0] - 2026-01-30 -[v2.4.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.4.0) +[v2.4.0](https://github.com/TensionDev/UUID/releases/tag/v2.4.0) ### Changed - Changed ToVariant1 to ToRfc4122Variant for clarity. @@ -17,14 +21,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v2.3.1] - 2025-07-01 -[v2.3.1](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.3.1) +[v2.3.1](https://github.com/TensionDev/UUID/releases/tag/v2.3.1) ### Fixed - Fixed Node ID for generated UUID v1 to check for valid MAC address. ## [v2.3.0] - 2025-03-30 -[v2.3.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.3.0) +[v2.3.0](https://github.com/TensionDev/UUID/releases/tag/v2.3.0) ### Added - Added functions to test which version of UUID it is. @@ -32,18 +36,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v2.2.0] - 2025-02-22 -[v2.2.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.2.0) +[v2.2.0](https://github.com/TensionDev/UUID/releases/tag/v2.2.0) ### Changed - Changed Classes to static with private fields. ## [v2.1.0] - 2024-06-05 -[v2.1.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.1.0) +[v2.1.0](https://github.com/TensionDev/UUID/releases/tag/v2.1.0) ## [v2.1.0-beta] - 2024-06-05 -[v2.1.0-beta](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.1.0-beta) +[v2.1.0-beta](https://github.com/TensionDev/UUID/releases/tag/v2.1.0-beta) ### Changed - Added UUID v7 generated based on current system date and time as well as Fixed Bit-Length Dedicated Counter (Method 1). @@ -51,21 +55,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v2.1.0-alpha] - 2023-06-15 -[v2.1.0-alpha](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.1.0-alpha) +[v2.1.0-alpha](https://github.com/TensionDev/UUID/releases/tag/v2.1.0-alpha) ### Changed - Changed license from GNU General Public License Version 3 to Apache License Version 2.0. ## [v2.0.0] - 2023-06-15 -[v2.0.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v2.0.0) +[v2.0.0](https://github.com/TensionDev/UUID/releases/tag/v2.0.0) ### Changed - Changed license from GNU General Public License Version 3 to Apache License Version 2.0. ## [v1.2.0-alpha] - 2022-12-15 -[v1.2.0-alpha](https://github.com/TensionDev/UUIDUtil/releases/tag/v1.2.0-alpha) +[v1.2.0-alpha](https://github.com/TensionDev/UUID/releases/tag/v1.2.0-alpha) ### Added - Added UUID v6 generated based on current system date and time as well as local Network MAC Address. @@ -78,14 +82,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v1.1.0] - 2022-05-31 -[v1.1.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v1.1.0) +[v1.1.0](https://github.com/TensionDev/UUID/releases/tag/v1.1.0) ### Added - Added support to convert System.Guid to TensionDev.UUID.Uuid and vice-versa. ## [v1.0.0] - 2022-03-26 -[v1.0.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v1.0.0) +[v1.0.0](https://github.com/TensionDev/UUID/releases/tag/v1.0.0) ### Added - Added TensionDev.UUID.Uuid as an implementation based on RFC 4122. @@ -97,28 +101,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v0.2.0] - 2021-09-10 -[v0.2.0](https://github.com/TensionDev/UUIDUtil/releases/tag/v0.2.0) +[v0.2.0](https://github.com/TensionDev/UUID/releases/tag/v0.2.0) ### Added - Added UUID v4 generated based on Pseudo Random Number Generator, System.Security.Cryptography.RNGCryptoServiceProvider. ## [v0.1.1] - 2021-09-10 -[v0.1.1](https://github.com/TensionDev/UUIDUtil/releases/tag/v0.1.1) +[v0.1.1](https://github.com/TensionDev/UUID/releases/tag/v0.1.1) ### Changed - Changed Namespace from UUIDUtil to TensionDev.UUID to reflect official prefix for Package Id. ## [v0.1.1-alpha] - 2021-09-08 -[v0.1.1-alpha](https://github.com/TensionDev/UUIDUtil/releases/tag/v0.1.1-alpha) +[v0.1.1-alpha](https://github.com/TensionDev/UUID/releases/tag/v0.1.1-alpha) ### Fixed - Fixed Variant Field for generated UUID v1 to be of the correct range. (0x8xxx - 0xbxxx) ## [v0.1.0-alpha] - 2021-09-04 -[v0.1.0-alpha](https://github.com/TensionDev/UUIDUtil/releases/tag/v0.1.0-alpha) +[v0.1.0-alpha](https://github.com/TensionDev/UUID/releases/tag/v0.1.0-alpha) ### Added - Added UUID v1 generated based on current system date and time as well as local Network MAC Address. diff --git a/XUnitTestProjectUUID/XUnitTestProjectUUID.csproj b/TensionDev.UUID.Tests/TensionDev.UUID.Tests.csproj similarity index 85% rename from XUnitTestProjectUUID/XUnitTestProjectUUID.csproj rename to TensionDev.UUID.Tests/TensionDev.UUID.Tests.csproj index ca32ca4..f6f889f 100644 --- a/XUnitTestProjectUUID/XUnitTestProjectUUID.csproj +++ b/TensionDev.UUID.Tests/TensionDev.UUID.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 false @@ -20,7 +20,7 @@ - + diff --git a/XUnitTestProjectUUID/UnitTestUUIDNamespace.cs b/TensionDev.UUID.Tests/UUIDNamespaceTests.cs similarity index 89% rename from XUnitTestProjectUUID/UnitTestUUIDNamespace.cs rename to TensionDev.UUID.Tests/UUIDNamespaceTests.cs index 7c03474..cf1b5b6 100644 --- a/XUnitTestProjectUUID/UnitTestUUIDNamespace.cs +++ b/TensionDev.UUID.Tests/UUIDNamespaceTests.cs @@ -1,14 +1,14 @@ using System; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUUIDNamespace + public class UUIDNamespaceTests { [Fact] public void TestUUIDNamespace_DNS() { - Byte[] guidBytes = TensionDev.UUID.UUIDNamespace.DNS.ToByteArray(); + Byte[] guidBytes = UUIDNamespace.DNS.ToByteArray(); Assert.Equal(0x6b, guidBytes[0]); Assert.Equal(0xa7, guidBytes[1]); @@ -30,7 +30,7 @@ public void TestUUIDNamespace_DNS() [Fact] public void TestUUIDNamespace_URL() { - Byte[] guidBytes = TensionDev.UUID.UUIDNamespace.URL.ToByteArray(); + Byte[] guidBytes = UUIDNamespace.URL.ToByteArray(); Assert.Equal(0x6b, guidBytes[0]); Assert.Equal(0xa7, guidBytes[1]); @@ -52,7 +52,7 @@ public void TestUUIDNamespace_URL() [Fact] public void TestUUIDNamespace_ISOOID() { - Byte[] guidBytes = TensionDev.UUID.UUIDNamespace.OID.ToByteArray(); + Byte[] guidBytes = UUIDNamespace.OID.ToByteArray(); Assert.Equal(0x6b, guidBytes[0]); Assert.Equal(0xa7, guidBytes[1]); @@ -74,7 +74,7 @@ public void TestUUIDNamespace_ISOOID() [Fact] public void TestUUIDNamespace_X500() { - Byte[] guidBytes = TensionDev.UUID.UUIDNamespace.X500.ToByteArray(); + Byte[] guidBytes = UUIDNamespace.X500.ToByteArray(); Assert.Equal(0x6b, guidBytes[0]); Assert.Equal(0xa7, guidBytes[1]); diff --git a/XUnitTestProjectUUID/UnitTestUUIDv1.cs b/TensionDev.UUID.Tests/UUIDv1Tests.cs similarity index 53% rename from XUnitTestProjectUUID/UnitTestUUIDv1.cs rename to TensionDev.UUID.Tests/UUIDv1Tests.cs index 950004c..98e275a 100644 --- a/XUnitTestProjectUUID/UnitTestUUIDv1.cs +++ b/TensionDev.UUID.Tests/UUIDv1Tests.cs @@ -5,14 +5,14 @@ using System.Threading.Tasks; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUUIDv1 + public class UUIDv1Tests { [Fact] public void TestGetNodeID() { - List expectedNodeIDs = new List(); + List expectedNodeIDs = []; int expectedLength = 6; NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); foreach (NetworkInterface nic in nics) @@ -20,7 +20,7 @@ public void TestGetNodeID() expectedNodeIDs.Add(nic.GetPhysicalAddress().GetAddressBytes()); } - byte[] nodeID = TensionDev.UUID.UUIDv1.GetNodeID(); + byte[] nodeID = UUIDv1.GetNodeID(); if (nics.Length > 0) Assert.Contains(nodeID, expectedNodeIDs); @@ -31,8 +31,8 @@ public void TestGetNodeID() [Fact] public void TestConsistentGetNodeID() { - byte[] nodeID1 = TensionDev.UUID.UUIDv1.GetNodeID(); - byte[] nodeID2 = TensionDev.UUID.UUIDv1.GetNodeID(); + byte[] nodeID1 = UUIDv1.GetNodeID(); + byte[] nodeID2 = UUIDv1.GetNodeID(); Assert.Equal(nodeID1, nodeID2); } @@ -40,12 +40,12 @@ public void TestConsistentGetNodeID() [Fact] public void TestNewUUIDv1() { - TensionDev.UUID.Uuid expectedUUID = new TensionDev.UUID.Uuid("164a714c-0c79-11ec-82a8-0242ac130003"); + Uuid expectedUUID = new Uuid("164a714c-0c79-11ec-82a8-0242ac130003"); - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; + byte[] clockSequence = [0x82, 0xa8]; DateTime dateTime = DateTime.Parse("2021-09-03T05:37:54.619630Z"); - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(dateTime, clockSequence, nodeID); + Uuid uuid = UUIDv1.NewUUIDv1(dateTime, clockSequence, nodeID); Assert.Equal(expectedUUID, uuid); } @@ -59,7 +59,7 @@ public void TestGetClockSequence() Parallel.For(0, UInt16.MaxValue, clock => { - Byte[] vs = TensionDev.UUID.UUIDv1.GetClockSequence(); + Byte[] vs = UUIDv1.GetClockSequence(); Int16 networkorder = BitConverter.ToInt16(vs); UInt16 key = (UInt16)System.Net.IPAddress.NetworkToHostOrder(networkorder); concurrentDictionary.TryAdd(key, true); @@ -76,14 +76,14 @@ public void TestGetClockSequence() [Fact] public void TestUUIDVariantField() { - IList expectedVariantField = new List() { '8', '9', 'a', 'b' }; + IList expectedVariantField = ['8', '9', 'a', 'b']; - ConcurrentBag concurrentBag = new ConcurrentBag(); + ConcurrentBag concurrentBag = []; Parallel.For(0, UInt16.MaxValue, body => { - concurrentBag.Add(TensionDev.UUID.UUIDv1.NewUUIDv1().ToString()); + concurrentBag.Add(UUIDv1.NewUUIDv1().ToString()); }); foreach (String value in concurrentBag) @@ -95,41 +95,41 @@ public void TestUUIDVariantField() [Fact] public void TestNewUUIDv1NullClockSequence() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; byte[] clockSequence = null; - Assert.Throws(() => TensionDev.UUID.UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); + Assert.Throws(() => UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv1ReducedClockSequence() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; - byte[] clockSequence = new byte[] { 0x82 }; - Assert.Throws(() => TensionDev.UUID.UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; + byte[] clockSequence = [0x82]; + Assert.Throws(() => UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv1NullNodeID() { byte[] nodeID = null; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; - Assert.Throws(() => TensionDev.UUID.UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); + byte[] clockSequence = [0x82, 0xa8]; + Assert.Throws(() => UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv1ReducedNodeID() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13 }; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; - Assert.Throws(() => TensionDev.UUID.UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); + byte[] nodeID = [0x02, 0x42, 0xac, 0x13]; + byte[] clockSequence = [0x82, 0xa8]; + Assert.Throws(() => UUIDv1.NewUUIDv1(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestIsUUIDv1Withv1() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); + Uuid uuid = UUIDv1.NewUUIDv1(); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.True(actual); } @@ -137,18 +137,18 @@ public void TestIsUUIDv1Withv1() public void TestIsUUIDv1Withv3() { String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv1Withv4() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); + Uuid uuid = UUIDv4.NewUUIDv4(); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.False(actual); } @@ -156,27 +156,27 @@ public void TestIsUUIDv1Withv4() public void TestIsUUIDv1Withv5() { String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv1Withv6() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); + Uuid uuid = UUIDv6.NewUUIDv6(); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv1Withv7() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); + Uuid uuid = UUIDv7.NewUUIDv7(); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid); + bool actual = UUIDv1.IsUUIDv1(uuid); Assert.False(actual); } @@ -184,9 +184,9 @@ public void TestIsUUIDv1Withv7() public void TestToDateTime() { DateTime expected = DateTime.UtcNow; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(expected); + Uuid uuid = UUIDv1.NewUUIDv1(expected); - DateTime actual = TensionDev.UUID.UUIDv1.ToDateTime(uuid); + DateTime actual = UUIDv1.ToDateTime(uuid); Assert.Equal(expected, actual); } @@ -194,11 +194,11 @@ public void TestToDateTime() public void TestToUUIDv6() { DateTime expectedDateTime = DateTime.UtcNow; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.UUIDv1.NewUUIDv1(expectedDateTime); - TensionDev.UUID.Uuid uuid6 = TensionDev.UUID.UUIDv1.ToUUIDv6(uuid1); + Uuid uuid1 = UUIDv1.NewUUIDv1(expectedDateTime); + Uuid uuid6 = UUIDv1.ToUUIDv6(uuid1); - DateTime actualDateTime = TensionDev.UUID.UUIDv6.ToDateTime(uuid6); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid6); + DateTime actualDateTime = UUIDv6.ToDateTime(uuid6); + bool actual = UUIDv6.IsUUIDv6(uuid6); Assert.Equal(expectedDateTime, actualDateTime); Assert.True(actual); } diff --git a/TensionDev.UUID.Tests/UUIDv3Tests.cs b/TensionDev.UUID.Tests/UUIDv3Tests.cs new file mode 100644 index 0000000..6a60b1a --- /dev/null +++ b/TensionDev.UUID.Tests/UUIDv3Tests.cs @@ -0,0 +1,108 @@ +using System; +using Xunit; + +namespace TensionDev.UUID.Tests +{ + public class UUIDv3Tests + { + [Fact] + public void TestNewUUIDv3_DNS() + { + Uuid expectedGuid = new Uuid("de87628d-5377-3ba7-b31b-cde1cc8d423f"); + + String name = "www.google.com"; + Uuid guid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv3_URL() + { + Uuid expectedGuid = new Uuid("d39a36cc-b262-3c67-a6ca-0168e948bdd4"); + + String name = "https://www.google.com"; + Uuid guid = UUIDv3.NewUUIDv3(UUIDNamespace.URL, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv3_OID() + { + Uuid expectedGuid = new Uuid("ef4dc0a0-9fc8-368e-9413-0bbf811aca7b"); + + String name = "1.0.3166.1"; + Uuid guid = UUIDv3.NewUUIDv3(UUIDNamespace.OID, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv3_X500() + { + Uuid expectedGuid = new Uuid("87d4875f-af5a-3491-8c26-cef5a0d16aa0"); + + String name = "/c=us/o=Sun/ou=People/cn=Rosanna Lee"; + Uuid guid = UUIDv3.NewUUIDv3(UUIDNamespace.X500, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestIsUUIDv3Withv1() + { + Uuid uuid = UUIDv1.NewUUIDv1(); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv3Withv3() + { + String name = "www.google.com"; + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.True(actual); + } + + [Fact] + public void TestIsUUIDv3Withv4() + { + Uuid uuid = UUIDv4.NewUUIDv4(); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv3Withv5() + { + String name = "www.contoso.com"; + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv3Withv6() + { + Uuid uuid = UUIDv6.NewUUIDv6(); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv3Withv7() + { + Uuid uuid = UUIDv7.NewUUIDv7(); + + bool actual = UUIDv3.IsUUIDv3(uuid); + Assert.False(actual); + } + } +} diff --git a/XUnitTestProjectUUID/UnitTestUUIDv4.cs b/TensionDev.UUID.Tests/UUIDv4Tests.cs similarity index 53% rename from XUnitTestProjectUUID/UnitTestUUIDv4.cs rename to TensionDev.UUID.Tests/UUIDv4Tests.cs index 75c9be7..362f619 100644 --- a/XUnitTestProjectUUID/UnitTestUUIDv4.cs +++ b/TensionDev.UUID.Tests/UUIDv4Tests.cs @@ -4,21 +4,21 @@ using System.Threading.Tasks; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUUIDv4 + public class UUIDv4Tests { [Fact] public void TestNewUUIDv4() { char expectedVersionField = '4'; - ConcurrentBag concurrentBag = new ConcurrentBag(); + ConcurrentBag concurrentBag = []; Parallel.For(0, UInt16.MaxValue, body => { - concurrentBag.Add(TensionDev.UUID.UUIDv4.NewUUIDv4().ToString()); + concurrentBag.Add(UUIDv4.NewUUIDv4().ToString()); }); foreach (String value in concurrentBag) @@ -30,14 +30,14 @@ public void TestNewUUIDv4() [Fact] public void TestUUIDVariantField() { - IList expectedVariantField = new List() { '8', '9', 'a', 'b' }; + IList expectedVariantField = ['8', '9', 'a', 'b']; - ConcurrentBag concurrentBag = new ConcurrentBag(); + ConcurrentBag concurrentBag = []; Parallel.For(0, UInt16.MaxValue, body => { - concurrentBag.Add(TensionDev.UUID.UUIDv4.NewUUIDv4().ToString()); + concurrentBag.Add(UUIDv4.NewUUIDv4().ToString()); }); foreach (String value in concurrentBag) @@ -49,9 +49,9 @@ public void TestUUIDVariantField() [Fact] public void TestIsUUIDv4Withv1() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); + Uuid uuid = UUIDv1.NewUUIDv1(); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.False(actual); } @@ -59,18 +59,18 @@ public void TestIsUUIDv4Withv1() public void TestIsUUIDv4Withv3() { String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv4Withv4() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); + Uuid uuid = UUIDv4.NewUUIDv4(); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.True(actual); } @@ -78,27 +78,27 @@ public void TestIsUUIDv4Withv4() public void TestIsUUIDv4Withv5() { String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv4Withv6() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); + Uuid uuid = UUIDv6.NewUUIDv6(); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv4Withv7() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); + Uuid uuid = UUIDv7.NewUUIDv7(); - bool actual = TensionDev.UUID.UUIDv4.IsUUIDv4(uuid); + bool actual = UUIDv4.IsUUIDv4(uuid); Assert.False(actual); } } diff --git a/TensionDev.UUID.Tests/UUIDv5Tests.cs b/TensionDev.UUID.Tests/UUIDv5Tests.cs new file mode 100644 index 0000000..fe3afbe --- /dev/null +++ b/TensionDev.UUID.Tests/UUIDv5Tests.cs @@ -0,0 +1,108 @@ +using System; +using Xunit; + +namespace TensionDev.UUID.Tests +{ + public class UUIDv5Tests + { + [Fact] + public void TestNewUUIDv5_DNS() + { + Uuid expectedGuid = new Uuid("016ab729-5c3f-55fe-9d10-e30cb958f0e0"); + + String name = "www.contoso.com"; + Uuid guid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv5_URL() + { + Uuid expectedGuid = new Uuid("1bf6935b-49e6-54cf-a9c8-51fb21c41b46"); + + String name = "https://www.contoso.com"; + Uuid guid = UUIDv5.NewUUIDv5(UUIDNamespace.URL, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv5_OID() + { + Uuid expectedGuid = new Uuid("8d3d0edc-5b53-56a7-953b-f11fbc48388a"); + + String name = "1.0.3166.1"; + Uuid guid = UUIDv5.NewUUIDv5(UUIDNamespace.OID, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestNewUUIDv5_X500() + { + Uuid expectedGuid = new Uuid("61c75a15-eedd-5349-ab65-b35f0ef81d7c"); + + String name = "/c=us/o=Sun/ou=People/cn=Rosanna Lee"; + Uuid guid = UUIDv5.NewUUIDv5(UUIDNamespace.X500, name); + + Assert.Equal(expectedGuid, guid); + } + + [Fact] + public void TestIsUUIDv5Withv1() + { + Uuid uuid = UUIDv1.NewUUIDv1(); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv5Withv3() + { + String name = "www.google.com"; + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv5Withv4() + { + Uuid uuid = UUIDv4.NewUUIDv4(); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv5Withv5() + { + String name = "www.contoso.com"; + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.True(actual); + } + + [Fact] + public void TestIsUUIDv5Withv6() + { + Uuid uuid = UUIDv6.NewUUIDv6(); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.False(actual); + } + + [Fact] + public void TestIsUUIDv5Withv7() + { + Uuid uuid = UUIDv7.NewUUIDv7(); + + bool actual = UUIDv5.IsUUIDv5(uuid); + Assert.False(actual); + } + } +} diff --git a/XUnitTestProjectUUID/UnitTestUUIDv6.cs b/TensionDev.UUID.Tests/UUIDv6Tests.cs similarity index 51% rename from XUnitTestProjectUUID/UnitTestUUIDv6.cs rename to TensionDev.UUID.Tests/UUIDv6Tests.cs index 92489c1..2e266e1 100644 --- a/XUnitTestProjectUUID/UnitTestUUIDv6.cs +++ b/TensionDev.UUID.Tests/UUIDv6Tests.cs @@ -4,15 +4,15 @@ using System.Threading.Tasks; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUUIDv6 + public class UUIDv6Tests { [Fact] public void TestGetNodeID() { int expectedLength = 6; - byte[] nodeID = TensionDev.UUID.UUIDv6.GetNodeID(); + byte[] nodeID = UUIDv6.GetNodeID(); Assert.Equal(expectedLength, nodeID.Length); } @@ -20,8 +20,8 @@ public void TestGetNodeID() [Fact] public void TestRandomGetNodeID() { - byte[] nodeID1 = TensionDev.UUID.UUIDv6.GetNodeID(); - byte[] nodeID2 = TensionDev.UUID.UUIDv6.GetNodeID(); + byte[] nodeID1 = UUIDv6.GetNodeID(); + byte[] nodeID2 = UUIDv6.GetNodeID(); Assert.NotEqual(nodeID1, nodeID2); } @@ -29,12 +29,12 @@ public void TestRandomGetNodeID() [Fact] public void TestNewUUIDv6() { - TensionDev.UUID.Uuid expectedUUID = new TensionDev.UUID.Uuid("1ec9414c-232a-6b00-82a8-0242ac130003"); + Uuid expectedUUID = new Uuid("1ec9414c-232a-6b00-82a8-0242ac130003"); - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; + byte[] clockSequence = [0x82, 0xa8]; DateTime dateTime = DateTime.Parse("2022-02-22T19:22:22.000000Z"); - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(dateTime, clockSequence, nodeID); + Uuid uuid = UUIDv6.NewUUIDv6(dateTime, clockSequence, nodeID); Assert.Equal(expectedUUID, uuid); } @@ -48,7 +48,7 @@ public void TestGetClockSequence() Parallel.For(0, UInt16.MaxValue, clock => { - Byte[] vs = TensionDev.UUID.UUIDv6.GetClockSequence(); + Byte[] vs = UUIDv6.GetClockSequence(); Int16 networkorder = BitConverter.ToInt16(vs); UInt16 key = (UInt16)System.Net.IPAddress.NetworkToHostOrder(networkorder); concurrentDictionary.TryAdd(key, true); @@ -65,14 +65,14 @@ public void TestGetClockSequence() [Fact] public void TestUUIDVariantField() { - List expectedVariantField = new List() { '8', '9', 'a', 'b' }; + List expectedVariantField = ['8', '9', 'a', 'b']; - ConcurrentBag concurrentBag = new ConcurrentBag(); + ConcurrentBag concurrentBag = []; Parallel.For(0, UInt16.MaxValue, body => { - concurrentBag.Add(TensionDev.UUID.UUIDv6.NewUUIDv6().ToString()); + concurrentBag.Add(UUIDv6.NewUUIDv6().ToString()); }); foreach (String value in concurrentBag) @@ -84,41 +84,41 @@ public void TestUUIDVariantField() [Fact] public void TestNewUUIDv6NullClockSequence() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; byte[] clockSequence = null; - Assert.Throws(() => TensionDev.UUID.UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); + Assert.Throws(() => UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv6ReducedClockSequence() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13, 0x00, 0x03 }; - byte[] clockSequence = new byte[] { 0x82 }; - Assert.Throws(() => TensionDev.UUID.UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); + byte[] nodeID = [0x02, 0x42, 0xac, 0x13, 0x00, 0x03]; + byte[] clockSequence = [0x82]; + Assert.Throws(() => UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv6NullNodeID() { byte[] nodeID = null; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; - Assert.Throws(() => TensionDev.UUID.UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); + byte[] clockSequence = [0x82, 0xa8]; + Assert.Throws(() => UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestNewUUIDv6ReducedNodeID() { - byte[] nodeID = new byte[] { 0x02, 0x42, 0xac, 0x13 }; - byte[] clockSequence = new byte[] { 0x82, 0xa8 }; - Assert.Throws(() => TensionDev.UUID.UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); + byte[] nodeID = [0x02, 0x42, 0xac, 0x13]; + byte[] clockSequence = [0x82, 0xa8]; + Assert.Throws(() => UUIDv6.NewUUIDv6(DateTime.UtcNow, clockSequence, nodeID)); } [Fact] public void TestIsUUIDv6Withv1() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); + Uuid uuid = UUIDv1.NewUUIDv1(); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.False(actual); } @@ -126,18 +126,18 @@ public void TestIsUUIDv6Withv1() public void TestIsUUIDv6Withv3() { String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv6Withv4() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); + Uuid uuid = UUIDv4.NewUUIDv4(); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.False(actual); } @@ -145,27 +145,27 @@ public void TestIsUUIDv6Withv4() public void TestIsUUIDv6Withv5() { String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv6Withv6() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); + Uuid uuid = UUIDv6.NewUUIDv6(); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.True(actual); } [Fact] public void TestIsUUIDv6Withv7() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); + Uuid uuid = UUIDv7.NewUUIDv7(); - bool actual = TensionDev.UUID.UUIDv6.IsUUIDv6(uuid); + bool actual = UUIDv6.IsUUIDv6(uuid); Assert.False(actual); } @@ -173,9 +173,9 @@ public void TestIsUUIDv6Withv7() public void TestToDateTime() { DateTime expected = DateTime.UtcNow; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(expected); + Uuid uuid = UUIDv6.NewUUIDv6(expected); - DateTime actual = TensionDev.UUID.UUIDv6.ToDateTime(uuid); + DateTime actual = UUIDv6.ToDateTime(uuid); Assert.Equal(expected, actual); } @@ -183,11 +183,11 @@ public void TestToDateTime() public void TestToUUIDv1() { DateTime expectedDateTime = DateTime.UtcNow; - TensionDev.UUID.Uuid uuid6 = TensionDev.UUID.UUIDv6.NewUUIDv6(expectedDateTime); - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.UUIDv6.ToUUIDv1(uuid6); + Uuid uuid6 = UUIDv6.NewUUIDv6(expectedDateTime); + Uuid uuid1 = UUIDv6.ToUUIDv1(uuid6); - DateTime actualDateTime = TensionDev.UUID.UUIDv1.ToDateTime(uuid1); - bool actual = TensionDev.UUID.UUIDv1.IsUUIDv1(uuid1); + DateTime actualDateTime = UUIDv1.ToDateTime(uuid1); + bool actual = UUIDv1.IsUUIDv1(uuid1); Assert.Equal(expectedDateTime, actualDateTime); Assert.True(actual); } diff --git a/XUnitTestProjectUUID/UnitTestUUIDv7.cs b/TensionDev.UUID.Tests/UUIDv7Tests.cs similarity index 53% rename from XUnitTestProjectUUID/UnitTestUUIDv7.cs rename to TensionDev.UUID.Tests/UUIDv7Tests.cs index 855430b..57b0246 100644 --- a/XUnitTestProjectUUID/UnitTestUUIDv7.cs +++ b/TensionDev.UUID.Tests/UUIDv7Tests.cs @@ -5,14 +5,14 @@ using System.Threading.Tasks; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUUIDv7 + public class UUIDv7Tests { [Fact] public void TestGetRandomA() { - byte[] randA = TensionDev.UUID.UUIDv7.GetRandomA(); + byte[] randA = UUIDv7.GetRandomA(); Assert.Equal(2, randA.Length); } @@ -20,8 +20,8 @@ public void TestGetRandomA() [Fact] public void TestRandomGetRandomA() { - byte[] randA1 = TensionDev.UUID.UUIDv7.GetRandomA(); - byte[] randA2 = TensionDev.UUID.UUIDv7.GetRandomA(); + byte[] randA1 = UUIDv7.GetRandomA(); + byte[] randA2 = UUIDv7.GetRandomA(); Assert.NotEqual(randA1, randA2); } @@ -29,7 +29,7 @@ public void TestRandomGetRandomA() [Fact] public void TestGetFixedBitLengthDedicatedCounterA() { - byte[] counterA = TensionDev.UUID.UUIDv7.GetFixedBitLengthDedicatedCounterA(); + byte[] counterA = UUIDv7.GetFixedBitLengthDedicatedCounterA(); Assert.Equal(2, counterA.Length); } @@ -37,12 +37,12 @@ public void TestGetFixedBitLengthDedicatedCounterA() [Fact] public void TestUniqueGetFixedBitLengthDedicatedCounterA() { - ConcurrentBag countersA = new ConcurrentBag(); + ConcurrentBag countersA = []; Parallel.For(0, 0x1000, counter => { - countersA.Add(TensionDev.UUID.UUIDv7.GetFixedBitLengthDedicatedCounterA()); + countersA.Add(UUIDv7.GetFixedBitLengthDedicatedCounterA()); }); IEnumerable distinctCounters = countersA.Distinct(); @@ -55,12 +55,12 @@ public void TestUniqueGetFixedBitLengthDedicatedCounterA() [Fact] public void TestOverflowGetCounterA() { - ConcurrentBag countersA = new ConcurrentBag(); + ConcurrentBag countersA = []; Parallel.For(0, 0x4000, counter => { - countersA.Add(TensionDev.UUID.UUIDv7.GetFixedBitLengthDedicatedCounterA()); + countersA.Add(UUIDv7.GetFixedBitLengthDedicatedCounterA()); }); IEnumerable distinctCounters = countersA.Select(m => BitConverter.ToInt16(m)).Distinct(); @@ -73,7 +73,7 @@ public void TestOverflowGetCounterA() public void TestGetIncreasedClockPrecisionA() { DateTime dateTime = DateTime.Now; - byte[] counterA = TensionDev.UUID.UUIDv7.GetIncreasedClockPrecisionA(dateTime); + byte[] counterA = UUIDv7.GetIncreasedClockPrecisionA(dateTime); Assert.Equal(2, counterA.Length); } @@ -81,7 +81,7 @@ public void TestGetIncreasedClockPrecisionA() [Fact] public void TestOverflowGetIncreasedClockPrecisionA() { - ConcurrentBag countersA = new ConcurrentBag(); + ConcurrentBag countersA = []; DateTime start = DateTime.Now; DateTime end = start.AddMilliseconds(1); @@ -90,7 +90,7 @@ public void TestOverflowGetIncreasedClockPrecisionA() ticks => { DateTime dateTime = new DateTime(ticks, DateTimeKind.Local); - countersA.Add(TensionDev.UUID.UUIDv7.GetIncreasedClockPrecisionA(dateTime)); + countersA.Add(UUIDv7.GetIncreasedClockPrecisionA(dateTime)); }); IEnumerable distinctCounters = countersA.Select(m => BitConverter.ToInt16(m)).Distinct(); @@ -102,7 +102,7 @@ public void TestOverflowGetIncreasedClockPrecisionA() [Fact] public void TestGetRandomB() { - byte[] randB = TensionDev.UUID.UUIDv7.GetRandomB(); + byte[] randB = UUIDv7.GetRandomB(); Assert.Equal(8, randB.Length); } @@ -110,8 +110,8 @@ public void TestGetRandomB() [Fact] public void TestRandomGetRandomB() { - byte[] randB1 = TensionDev.UUID.UUIDv7.GetRandomB(); - byte[] randB2 = TensionDev.UUID.UUIDv7.GetRandomB(); + byte[] randB1 = UUIDv7.GetRandomB(); + byte[] randB2 = UUIDv7.GetRandomB(); Assert.NotEqual(randB1, randB2); } @@ -119,12 +119,12 @@ public void TestRandomGetRandomB() [Fact] public void TestNewUUIDv7() { - TensionDev.UUID.Uuid expectedUUID = new TensionDev.UUID.Uuid("017f22e2-79B0-7cc3-98c4-dc0c0c07398f"); + Uuid expectedUUID = new Uuid("017f22e2-79B0-7cc3-98c4-dc0c0c07398f"); - byte[] randA = new byte[] { 0x7c, 0xc3 }; - byte[] randB = new byte[] { 0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f }; + byte[] randA = [0x7c, 0xc3]; + byte[] randB = [0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f]; DateTime dateTime = DateTime.Parse("2022-02-22T19:22:22.000000Z"); - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(dateTime, randA, randB); + Uuid uuid = UUIDv7.NewUUIDv7(dateTime, randA, randB); Assert.Equal(expectedUUID, uuid); } @@ -132,14 +132,14 @@ public void TestNewUUIDv7() [Fact] public void TestUUIDVariantField() { - IList expectedVariantField = new List() { '8', '9', 'a', 'b' }; + IList expectedVariantField = ['8', '9', 'a', 'b']; - ConcurrentBag concurrentBag = new ConcurrentBag(); + ConcurrentBag concurrentBag = []; Parallel.For(0, UInt16.MaxValue, body => { - concurrentBag.Add(TensionDev.UUID.UUIDv7.NewUUIDv7().ToString()); + concurrentBag.Add(UUIDv7.NewUUIDv7().ToString()); }); foreach (String value in concurrentBag) @@ -152,40 +152,40 @@ public void TestUUIDVariantField() public void TestNewUUIDv7NullRandomA() { byte[] randA = null; - byte[] randB = new byte[] { 0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f }; - Assert.Throws(() => TensionDev.UUID.UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); + byte[] randB = [0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f]; + Assert.Throws(() => UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); } [Fact] public void TestNewUUIDv7ReducedRandomA() { - byte[] randA = new byte[] { 0x7c }; - byte[] randB = new byte[] { 0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f }; - Assert.Throws(() => TensionDev.UUID.UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); + byte[] randA = [0x7c]; + byte[] randB = [0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39, 0x8f]; + Assert.Throws(() => UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); } [Fact] public void TestNewUUIDv7NullRandomB() { - byte[] randA = new byte[] { 0x7c, 0xc3 }; + byte[] randA = [0x7c, 0xc3]; byte[] randB = null; - Assert.Throws(() => TensionDev.UUID.UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); + Assert.Throws(() => UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); } [Fact] public void TestNewUUIDv7ReducedRandomB() { - byte[] randA = new byte[] { 0x7c, 0xc3 }; - byte[] randB = new byte[] { 0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39 }; - Assert.Throws(() => TensionDev.UUID.UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); + byte[] randA = [0x7c, 0xc3]; + byte[] randB = [0x98, 0xc4, 0xdc, 0x0c, 0x0c, 0x07, 0x39]; + Assert.Throws(() => UUIDv7.NewUUIDv7(DateTime.UtcNow, randA, randB)); } [Fact] public void TestIsUUIDv7Withv1() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); + Uuid uuid = UUIDv1.NewUUIDv1(); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.False(actual); } @@ -193,18 +193,18 @@ public void TestIsUUIDv7Withv1() public void TestIsUUIDv7Withv3() { String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv3.NewUUIDv3(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv7Withv4() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); + Uuid uuid = UUIDv4.NewUUIDv4(); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.False(actual); } @@ -212,27 +212,27 @@ public void TestIsUUIDv7Withv4() public void TestIsUUIDv7Withv5() { String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); + Uuid uuid = UUIDv5.NewUUIDv5(UUIDNamespace.DNS, name); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv7Withv6() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); + Uuid uuid = UUIDv6.NewUUIDv6(); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.False(actual); } [Fact] public void TestIsUUIDv7Withv7() { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); + Uuid uuid = UUIDv7.NewUUIDv7(); - bool actual = TensionDev.UUID.UUIDv7.IsUUIDv7(uuid); + bool actual = UUIDv7.IsUUIDv7(uuid); Assert.True(actual); } @@ -240,9 +240,9 @@ public void TestIsUUIDv7Withv7() public void TestToDateTime() { DateTime expected = DateTime.UtcNow; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(expected); + Uuid uuid = UUIDv7.NewUUIDv7(expected); - DateTime actual = TensionDev.UUID.UUIDv7.ToDateTime(uuid); + DateTime actual = UUIDv7.ToDateTime(uuid); Assert.Equal(expected, actual, TimeSpan.FromMilliseconds(1)); } } diff --git a/XUnitTestProjectUUID/UnitTestUuid.cs b/TensionDev.UUID.Tests/UuidTests.cs similarity index 66% rename from XUnitTestProjectUUID/UnitTestUuid.cs rename to TensionDev.UUID.Tests/UuidTests.cs index 85a8173..857bf5f 100644 --- a/XUnitTestProjectUUID/UnitTestUuid.cs +++ b/TensionDev.UUID.Tests/UuidTests.cs @@ -1,17 +1,16 @@ using System; -using TensionDev.UUID; using Xunit; -namespace XUnitTestProjectUUID +namespace TensionDev.UUID.Tests { - public class UnitTestUuid + public class UuidTests { [Fact] public void TestEmptyUUID() { string expectedUUID = "00000000-0000-0000-0000-000000000000"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Empty; + Uuid uuid = Uuid.Empty; Assert.Equal(expectedUUID, uuid.ToString()); } @@ -20,7 +19,7 @@ public void TestMaxUUID() { string expectedUUID = "ffffffff-ffff-ffff-ffff-ffffffffffff"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Max; + Uuid uuid = Uuid.Max; Assert.Equal(expectedUUID, uuid.ToString()); } @@ -28,14 +27,14 @@ public void TestMaxUUID() public void TestConstructorByteArray1() { byte[] vs = null; - Assert.Throws(() => { new TensionDev.UUID.Uuid(vs); }); + Assert.Throws(() => { new Uuid(vs); }); } [Fact] public void TestConstructorByteArray2() { byte[] vs = new byte[17]; - Assert.Throws(() => { new TensionDev.UUID.Uuid(vs); }); + Assert.Throws(() => { new Uuid(vs); }); } [Fact] @@ -44,7 +43,7 @@ public void TestConstructorByteArray3() string expectedUUID = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); Assert.Equal(expectedUUID, uuid.ToString()); } @@ -52,14 +51,14 @@ public void TestConstructorByteArray3() public void TestConstructorString1() { string vs = null; - Assert.Throws(() => { new TensionDev.UUID.Uuid(vs); }); + Assert.Throws(() => { new Uuid(vs); }); } [Fact] public void TestConstructorString2() { string vs = "(7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - Assert.Throws(() => { new TensionDev.UUID.Uuid(vs); }); + Assert.Throws(() => { new Uuid(vs); }); } [Fact] @@ -68,7 +67,7 @@ public void TestConstructorString3() string expectedUUID = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); Assert.Equal(expectedUUID, uuid.ToString()); } @@ -81,7 +80,7 @@ public void TestConstructorComponents1() byte d = byte.MaxValue; byte e = byte.MaxValue; byte[] f = null; - Assert.Throws(() => { new TensionDev.UUID.Uuid(a, b, c, d, e, f); }); + Assert.Throws(() => { new Uuid(a, b, c, d, e, f); }); } [Fact] @@ -93,7 +92,7 @@ public void TestConstructorComponents2() byte d = byte.MinValue; byte e = byte.MinValue; byte[] f = new byte[5]; - Assert.Throws(() => { new TensionDev.UUID.Uuid(a, b, c, d, e, f); }); + Assert.Throws(() => { new Uuid(a, b, c, d, e, f); }); } [Fact] @@ -107,7 +106,7 @@ public void TestConstructorComponents3() byte e = 69; byte[] f = [0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(a, b, c, d, e, f); + Uuid uuid = new Uuid(a, b, c, d, e, f); Assert.Equal(expectedUUID, uuid.ToString()); } @@ -127,7 +126,7 @@ public void TestConstructorNodeBytes1() byte j = 0xfa; byte k = 0xd2; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(a, b, c, d, e, f, g, h, i, j, k); + Uuid uuid = new Uuid(a, b, c, d, e, f, g, h, i, j, k); Assert.Equal(expectedUUID, uuid.ToString()); } @@ -136,7 +135,7 @@ public void TestParse1() { string expectedUUID = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(expectedUUID); + Uuid uuid = Uuid.Parse(expectedUUID); Assert.Equal(expectedUUID, uuid.ToString()); } @@ -145,7 +144,7 @@ public void TestTryParse1() { string expectedUUID = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - bool result = TensionDev.UUID.Uuid.TryParse(expectedUUID, out TensionDev.UUID.Uuid uuid); + bool result = Uuid.TryParse(expectedUUID, out Uuid uuid); Assert.Equal(expectedUUID, uuid.ToString()); Assert.True(result); } @@ -156,7 +155,7 @@ public void TestTryParse2() string expectedUUID = "00000000-0000-0000-0000-000000000000"; string vs = "(7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - bool result = TensionDev.UUID.Uuid.TryParse(vs, out TensionDev.UUID.Uuid uuid); + bool result = Uuid.TryParse(vs, out Uuid uuid); Assert.Equal(expectedUUID, uuid.ToString()); Assert.False(result); } @@ -166,7 +165,7 @@ public void TestCompareToObject() { object other = new object(); string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); int actualResult = uuid.CompareTo(other); Assert.True(actualResult > 0); @@ -177,8 +176,8 @@ public void TestCompareToUUIDObject() { int expectedResult = 0; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - object other = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + object other = Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); int actualResult = uuid.CompareTo(other); Assert.Equal(expectedResult, actualResult); @@ -189,8 +188,8 @@ public void TestCompareToUUID() { int expectedResult = 0; string vs = "7d4448409dc011d1b2455ffdce74fad2"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); int actualResult = uuid1.CompareTo(uuid2); Assert.Equal(expectedResult, actualResult); @@ -199,8 +198,8 @@ public void TestCompareToUUID() [Fact] public void TestCompareToTimeLow() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448309dc011d1b2455ffdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448309dc011d1b2455ffdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -209,8 +208,8 @@ public void TestCompareToTimeLow() [Fact] public void TestCompareToTimeMid() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dd011d1b2455ffdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dd011d1b2455ffdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult > 0); @@ -219,8 +218,8 @@ public void TestCompareToTimeMid() [Fact] public void TestCompareToTimeHigh() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011c1b2455ffdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011c1b2455ffdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -229,8 +228,8 @@ public void TestCompareToTimeHigh() [Fact] public void TestCompareToClockHigh() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1a2455ffdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1a2455ffdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -239,8 +238,8 @@ public void TestCompareToClockHigh() [Fact] public void TestCompareToClockLow() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2555ffdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2555ffdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult > 0); @@ -249,8 +248,8 @@ public void TestCompareToClockLow() [Fact] public void TestCompareToNode1() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455efdce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455efdce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -259,8 +258,8 @@ public void TestCompareToNode1() [Fact] public void TestCompareToNode2() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffcce74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455ffcce74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -269,8 +268,8 @@ public void TestCompareToNode2() [Fact] public void TestCompareToNode3() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdcd74fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455ffdcd74fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -279,8 +278,8 @@ public void TestCompareToNode3() [Fact] public void TestCompareToNode4() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce73fad2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455ffdce73fad2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult < 0); @@ -289,8 +288,8 @@ public void TestCompareToNode4() [Fact] public void TestCompareToNode5() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fbd2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fbd2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult > 0); @@ -299,8 +298,8 @@ public void TestCompareToNode5() [Fact] public void TestCompareToNode6() { - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74faf2"); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); + Uuid uuid1 = Uuid.Parse("7d4448409dc011d1b2455ffdce74faf2"); + Uuid uuid2 = Uuid.Parse("7d4448409dc011d1b2455ffdce74fad2"); int actualResult = uuid1.CompareTo(uuid2); Assert.True(actualResult > 0); @@ -311,7 +310,7 @@ public void TestEquals1() { object other = new object(); string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid.Equals(other); Assert.False(actualResult); @@ -321,8 +320,8 @@ public void TestEquals1() public void TestEquals2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1.Equals(uuid2); Assert.True(actualResult); @@ -333,7 +332,7 @@ public void TestToByteArray3() { byte[] expected = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); byte[] actual = uuid.ToByteArray(); Assert.Equal(expected, actual); @@ -343,7 +342,7 @@ public void TestToByteArray3() public void TestToGuid() { Guid expected = new Guid("7d444840-9dc0-11d1-b245-5ffdce74fad2"); - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid("7d444840-9dc0-11d1-b245-5ffdce74fad2"); + Uuid uuid = new Uuid("7d444840-9dc0-11d1-b245-5ffdce74fad2"); Guid actual = uuid.ToGuid(); Assert.Equal(expected, actual); @@ -353,7 +352,7 @@ public void TestToGuid() public void TestToVariant2() { Guid expected = new Guid("7d444840-9dc0-11d1-d245-5ffdce74fad2"); - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid("7d444840-9dc0-11d1-b245-5ffdce74fad2"); + Uuid uuid = new Uuid("7d444840-9dc0-11d1-b245-5ffdce74fad2"); Guid actual = uuid.ToMicrosoftVariant(); Assert.Equal(expected, actual); @@ -362,10 +361,10 @@ public void TestToVariant2() [Fact] public void TestToVariant1() { - TensionDev.UUID.Uuid expected = new TensionDev.UUID.Uuid("7d444840-9dc0-11d1-9245-5ffdce74fad2"); + Uuid expected = new Uuid("7d444840-9dc0-11d1-9245-5ffdce74fad2"); Guid guid = new Guid("7d444840-9dc0-11d1-d245-5ffdce74fad2"); - TensionDev.UUID.Uuid actual = TensionDev.UUID.Uuid.ToRfc4122Variant(guid); + Uuid actual = Uuid.ToRfc4122Variant(guid); Assert.Equal(expected, actual); } @@ -374,7 +373,7 @@ public void TestToString1() { string expected = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString(); Assert.Equal(expected, actual); @@ -385,7 +384,7 @@ public void TestToString2() { string expected = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString(null); Assert.Equal(expected, actual); @@ -396,7 +395,7 @@ public void TestToString3() { string expected = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString(String.Empty); Assert.Equal(expected, actual); @@ -407,7 +406,7 @@ public void TestToHexString4() { string expected = "7d4448409dc011d1b2455ffdce74fad2"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString("N"); Assert.Equal(expected, actual); @@ -418,7 +417,7 @@ public void TestToString5() { string expected = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString("B"); Assert.Equal(expected, actual); @@ -429,7 +428,7 @@ public void TestToString6() { string expected = "(7d444840-9dc0-11d1-b245-5ffdce74fad2)"; byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); string actual = uuid.ToString("P"); Assert.Equal(expected, actual); @@ -439,7 +438,7 @@ public void TestToString6() public void TestToString7() { byte[] vs = [0x7d, 0x44, 0x48, 0x40, 0x9d, 0xc0, 0x11, 0xd1, 0xb2, 0x45, 0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2]; - TensionDev.UUID.Uuid uuid = new TensionDev.UUID.Uuid(vs); + Uuid uuid = new Uuid(vs); Assert.Throws(() => { uuid.ToString("C"); }); } @@ -449,7 +448,7 @@ public void TestOperatorEquals1() { object other = new object(); string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = (uuid == other); Assert.False(actualResult); @@ -459,8 +458,8 @@ public void TestOperatorEquals1() public void TestOperatorEquals2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 == uuid2; Assert.True(actualResult); @@ -469,8 +468,8 @@ public void TestOperatorEquals2() [Fact] public void TestOperatorEquals3() { - TensionDev.UUID.Uuid other = null; - TensionDev.UUID.Uuid uuid = null; + Uuid other = null; + Uuid uuid = null; bool actualResult = uuid == other; Assert.True(actualResult); @@ -480,8 +479,8 @@ public void TestOperatorEquals3() public void TestOperatorEquals4() { string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid other = null; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid other = null; + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid == other; Assert.False(actualResult); @@ -491,8 +490,8 @@ public void TestOperatorEquals4() public void TestOperatorEquals5() { string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid other = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid = null; + Uuid other = Uuid.Parse(vs); + Uuid uuid = null; bool actualResult = uuid == other; Assert.False(actualResult); @@ -503,7 +502,7 @@ public void TestOperatorNotEquals1() { object other = new object(); string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = (uuid != other); Assert.True(actualResult); @@ -513,8 +512,8 @@ public void TestOperatorNotEquals1() public void TestOperatorNotEquals2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 != uuid2; Assert.False(actualResult); @@ -523,9 +522,9 @@ public void TestOperatorNotEquals2() [Fact] public void TestOperatorNotEquals3() { - TensionDev.UUID.Uuid other = null; + Uuid other = null; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid != other; Assert.True(actualResult); @@ -536,8 +535,8 @@ public void TestOperatorLessThan1() { string vs1 = "7d444830-9dc0-11d1-b245-5ffdce74fad2"; string vs2 = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs1); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs2); + Uuid uuid1 = Uuid.Parse(vs1); + Uuid uuid2 = Uuid.Parse(vs2); bool actualResult = uuid1 < uuid2; Assert.True(actualResult); @@ -547,8 +546,8 @@ public void TestOperatorLessThan1() public void TestOperatorLessThan2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 < uuid2; Assert.False(actualResult); @@ -557,9 +556,9 @@ public void TestOperatorLessThan2() [Fact] public void TestOperatorLessThan3() { - TensionDev.UUID.Uuid other = null; + Uuid other = null; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid < other; Assert.False(actualResult); @@ -570,8 +569,8 @@ public void TestOperatorGreaterThan1() { string vs1 = "7d444830-9dc0-11d1-b245-5ffdce74fad2"; string vs2 = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs1); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs2); + Uuid uuid1 = Uuid.Parse(vs1); + Uuid uuid2 = Uuid.Parse(vs2); bool actualResult = uuid1 > uuid2; Assert.False(actualResult); @@ -581,8 +580,8 @@ public void TestOperatorGreaterThan1() public void TestOperatorGreaterThan2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 > uuid2; Assert.False(actualResult); @@ -591,9 +590,9 @@ public void TestOperatorGreaterThan2() [Fact] public void TestOperatorGreaterThan3() { - TensionDev.UUID.Uuid other = null; + Uuid other = null; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid > other; Assert.True(actualResult); @@ -604,8 +603,8 @@ public void TestOperatorLessThanOrEqual1() { string vs1 = "7d444830-9dc0-11d1-b245-5ffdce74fad2"; string vs2 = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs1); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs2); + Uuid uuid1 = Uuid.Parse(vs1); + Uuid uuid2 = Uuid.Parse(vs2); bool actualResult = uuid1 <= uuid2; Assert.True(actualResult); @@ -615,8 +614,8 @@ public void TestOperatorLessThanOrEqual1() public void TestOperatorLessThanOrEqual2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 <= uuid2; Assert.True(actualResult); @@ -625,9 +624,9 @@ public void TestOperatorLessThanOrEqual2() [Fact] public void TestOperatorLessThanOrEqual3() { - TensionDev.UUID.Uuid other = null; + Uuid other = null; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid <= other; Assert.False(actualResult); @@ -638,8 +637,8 @@ public void TestOperatorGreaterThanOrEqual1() { string vs1 = "7d444830-9dc0-11d1-b245-5ffdce74fad2"; string vs2 = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs1); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs2); + Uuid uuid1 = Uuid.Parse(vs1); + Uuid uuid2 = Uuid.Parse(vs2); bool actualResult = uuid1 >= uuid2; Assert.False(actualResult); @@ -649,8 +648,8 @@ public void TestOperatorGreaterThanOrEqual1() public void TestOperatorGreaterThanOrEqual2() { string vs = "{7d444840-9dc0-11d1-b245-5ffdce74fad2}"; - TensionDev.UUID.Uuid uuid1 = TensionDev.UUID.Uuid.Parse(vs); - TensionDev.UUID.Uuid uuid2 = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid1 = Uuid.Parse(vs); + Uuid uuid2 = Uuid.Parse(vs); bool actualResult = uuid1 >= uuid2; Assert.True(actualResult); @@ -659,9 +658,9 @@ public void TestOperatorGreaterThanOrEqual2() [Fact] public void TestOperatorGreaterThanOrEqual3() { - TensionDev.UUID.Uuid other = null; + Uuid other = null; string vs = "7d444840-9dc0-11d1-b245-5ffdce74fad2"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.Uuid.Parse(vs); + Uuid uuid = Uuid.Parse(vs); bool actualResult = uuid >= other; Assert.True(actualResult); diff --git a/UUIDUtil.sln b/TensionDev.UUID.sln similarity index 80% rename from UUIDUtil.sln rename to TensionDev.UUID.sln index 77fd344..396fd1a 100644 --- a/UUIDUtil.sln +++ b/TensionDev.UUID.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31624.102 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UUIDUtil", "UUIDUtil\UUIDUtil.csproj", "{DF307C5B-6821-4CAD-A045-B2DF2D94743A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensionDev.UUID", "TensionDev.UUID\TensionDev.UUID.csproj", "{DF307C5B-6821-4CAD-A045-B2DF2D94743A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XUnitTestProjectUUID", "XUnitTestProjectUUID\XUnitTestProjectUUID.csproj", "{AA2755A0-FF8B-4F3E-813B-D4604B272738}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensionDev.UUID.Tests", "TensionDev.UUID.Tests\TensionDev.UUID.Tests.csproj", "{AA2755A0-FF8B-4F3E-813B-D4604B272738}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/UUIDUtil/UUIDUtil.csproj b/TensionDev.UUID/TensionDev.UUID.csproj similarity index 100% rename from UUIDUtil/UUIDUtil.csproj rename to TensionDev.UUID/TensionDev.UUID.csproj diff --git a/UUIDUtil/UUIDNamespace.cs b/TensionDev.UUID/UUIDNamespace.cs similarity index 100% rename from UUIDUtil/UUIDNamespace.cs rename to TensionDev.UUID/UUIDNamespace.cs diff --git a/UUIDUtil/UUIDv1.cs b/TensionDev.UUID/UUIDv1.cs similarity index 100% rename from UUIDUtil/UUIDv1.cs rename to TensionDev.UUID/UUIDv1.cs diff --git a/UUIDUtil/UUIDv3.cs b/TensionDev.UUID/UUIDv3.cs similarity index 100% rename from UUIDUtil/UUIDv3.cs rename to TensionDev.UUID/UUIDv3.cs diff --git a/UUIDUtil/UUIDv4.cs b/TensionDev.UUID/UUIDv4.cs similarity index 100% rename from UUIDUtil/UUIDv4.cs rename to TensionDev.UUID/UUIDv4.cs diff --git a/UUIDUtil/UUIDv5.cs b/TensionDev.UUID/UUIDv5.cs similarity index 100% rename from UUIDUtil/UUIDv5.cs rename to TensionDev.UUID/UUIDv5.cs diff --git a/UUIDUtil/UUIDv6.cs b/TensionDev.UUID/UUIDv6.cs similarity index 100% rename from UUIDUtil/UUIDv6.cs rename to TensionDev.UUID/UUIDv6.cs diff --git a/UUIDUtil/UUIDv7.cs b/TensionDev.UUID/UUIDv7.cs similarity index 100% rename from UUIDUtil/UUIDv7.cs rename to TensionDev.UUID/UUIDv7.cs diff --git a/UUIDUtil/Uuid.cs b/TensionDev.UUID/Uuid.cs similarity index 100% rename from UUIDUtil/Uuid.cs rename to TensionDev.UUID/Uuid.cs diff --git a/XUnitTestProjectUUID/UnitTestUUIDv3.cs b/XUnitTestProjectUUID/UnitTestUUIDv3.cs deleted file mode 100644 index 6bb3be1..0000000 --- a/XUnitTestProjectUUID/UnitTestUUIDv3.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using Xunit; - -namespace XUnitTestProjectUUID -{ - public class UnitTestUUIDv3 - { - [Fact] - public void TestNewUUIDv3_DNS() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("de87628d-5377-3ba7-b31b-cde1cc8d423f"); - - String name = "www.google.com"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv3_URL() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("d39a36cc-b262-3c67-a6ca-0168e948bdd4"); - - String name = "https://www.google.com"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.URL, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv3_OID() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("ef4dc0a0-9fc8-368e-9413-0bbf811aca7b"); - - String name = "1.0.3166.1"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.OID, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv3_X500() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("87d4875f-af5a-3491-8c26-cef5a0d16aa0"); - - String name = "/c=us/o=Sun/ou=People/cn=Rosanna Lee"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.X500, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestIsUUIDv3Withv1() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv3Withv3() - { - String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.True(actual); - } - - [Fact] - public void TestIsUUIDv3Withv4() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv3Withv5() - { - String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv3Withv6() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv3Withv7() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); - - bool actual = TensionDev.UUID.UUIDv3.IsUUIDv3(uuid); - Assert.False(actual); - } - } -} diff --git a/XUnitTestProjectUUID/UnitTestUUIDv5.cs b/XUnitTestProjectUUID/UnitTestUUIDv5.cs deleted file mode 100644 index 1b02c75..0000000 --- a/XUnitTestProjectUUID/UnitTestUUIDv5.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using Xunit; - -namespace XUnitTestProjectUUID -{ - public class UnitTestUUIDv5 - { - [Fact] - public void TestNewUUIDv5_DNS() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("016ab729-5c3f-55fe-9d10-e30cb958f0e0"); - - String name = "www.contoso.com"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv5_URL() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("1bf6935b-49e6-54cf-a9c8-51fb21c41b46"); - - String name = "https://www.contoso.com"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.URL, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv5_OID() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("8d3d0edc-5b53-56a7-953b-f11fbc48388a"); - - String name = "1.0.3166.1"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.OID, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestNewUUIDv5_X500() - { - TensionDev.UUID.Uuid expectedGuid = new TensionDev.UUID.Uuid("61c75a15-eedd-5349-ab65-b35f0ef81d7c"); - - String name = "/c=us/o=Sun/ou=People/cn=Rosanna Lee"; - TensionDev.UUID.Uuid guid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.X500, name); - - Assert.Equal(expectedGuid, guid); - } - - [Fact] - public void TestIsUUIDv5Withv1() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv1.NewUUIDv1(); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv5Withv3() - { - String name = "www.google.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv3.NewUUIDv3(TensionDev.UUID.UUIDNamespace.DNS, name); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv5Withv4() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv4.NewUUIDv4(); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv5Withv5() - { - String name = "www.contoso.com"; - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv5.NewUUIDv5(TensionDev.UUID.UUIDNamespace.DNS, name); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.True(actual); - } - - [Fact] - public void TestIsUUIDv5Withv6() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv6.NewUUIDv6(); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.False(actual); - } - - [Fact] - public void TestIsUUIDv5Withv7() - { - TensionDev.UUID.Uuid uuid = TensionDev.UUID.UUIDv7.NewUUIDv7(); - - bool actual = TensionDev.UUID.UUIDv5.IsUUIDv5(uuid); - Assert.False(actual); - } - } -}