Fixes for test time assertions, switching to hi-rez timer

Author: Kris Williams

Test/UUIDGeneratorTest.cs

@@ -305,14 +305,19 @@ public void testGenerateTimeBasedUUID()
             // before we generate all the uuids, lets get the start time
             long start_time = Environment.TickCount;
 
+            // high-resolution timer
+            Stopwatch timer = Stopwatch.StartNew();
+            
             // now create the array of uuids
             for (int i = 0; i < uuid_array.Length; i++)
             {
                 uuid_array[i] = uuid_gen.GenerateTimeBasedUUID();
             }
 
+            timer.Stop();
+            
             // now capture the end time
-            long end_time = Environment.TickCount;
+            long end_time = start_time + timer.ElapsedTicks;
 
             // check that none of the UUIDs are null
             checkUUIDArrayForNonNullUUIDs(uuid_array);
@@ -372,8 +377,8 @@ public void testGenerateTimeBasedUUIDWithEthernetAddress()
             // before we generate all the uuids, lets get the start time
             long start_time = Environment.TickCount;
 
-			  // high-resolution timer
-				var timer = Stopwatch.StartNew();
+            // high-resolution timer
+            Stopwatch timer = Stopwatch.StartNew();
 
             // now create the array of uuids
             for (int i = 0; i < uuid_array.Length; i++)

Test/UUIDTimerTest.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Net.NetworkInformation;
 using System.Security.Cryptography;
+using System.Diagnostics;
 
 namespace Jug.Test
 {
@@ -145,15 +146,19 @@ public void testGetTimestamp()
             // before generating all the uuid timer arrays, get the start time
             long start_time = Environment.TickCount;
 
+				Stopwatch timer = Stopwatch.StartNew();
+
             // now create the array of uuid timer output arrays
             for (int i = 0; i < array_of_uuid_timer_byte_arrays.Length; i++)
             {
                 array_of_uuid_timer_byte_arrays[i] = new byte[UUID_TIMER_ARRAY_LENGTH];
                 uuid_timer.GetTimestamp(array_of_uuid_timer_byte_arrays[i]);
             }
 
+				timer.Stop();
+
             // now capture the end time
-            long end_time = Environment.TickCount;
+            long end_time = start_time + timer.ElapsedTicks;
 
             // convert the array into array of longs holding the numerical values
             long[] uuid_timer_array_of_longs =