tests: move uuid* tool test scripts to dedicated subdirectories

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/expected/uuidd/uuidd b/tests/expected/uuidd/uuidd
new file mode 100644 (file)
index 0000000..ae440b2
--- /dev/null
+++ b/tests/expected/uuidd/uuidd
@@ -0,0 +1,11 @@
+options: -t
+return value: 0
+options: --time
+return value: 0
+options: -r
+return value: 0
+options: --random
+return value: 0
+options: -r -n 65
+return value: 0
+Killed uuidd running at pid <num>.

diff --git a/tests/expected/uuidgen/oids b/tests/expected/uuidgen/oids
new file mode 100644 (file)
index 0000000..c121cbe
--- /dev/null
+++ b/tests/expected/uuidgen/oids
@@ -0,0 +1,4 @@
+3d813cbb-47fb-32ba-91df-831e1593ac29
+5df41881-3aed-3515-88a7-2f4a814cf09e
+2ed6657d-e927-568b-95e1-2665a8aea6a2
+fcdc2122-78d2-59f7-b1ed-041a561ef652

diff --git a/tests/expected/uuidgen/uuidgen b/tests/expected/uuidgen/uuidgen
new file mode 100644 (file)
index 0000000..7d517af
--- /dev/null
+++ b/tests/expected/uuidgen/uuidgen
@@ -0,0 +1,16 @@
+option: -r
+return values: 0 and 0
+option: -t
+return values: 0 and 0
+option: -6
+return values: 0 and 0
+option: -7
+return values: 0 and 0
+option: --random
+return values: 0 and 0
+option: --time
+return values: 0 and 0
+option: --time-v6
+return values: 0 and 0
+option: --time-v7
+return values: 0 and 0

diff --git a/tests/expected/uuidparse/time b/tests/expected/uuidparse/time
new file mode 100644 (file)
index 0000000..e850d68
--- /dev/null
+++ b/tests/expected/uuidparse/time
@@ -0,0 +1,4 @@
+VARIANT TYPE       TIME
+DCE     time-based 2022-02-22 19:22:22,123456+00:00
+DCE     time-v6    2022-02-22 19:22:22,123456+00:00
+DCE     time-v7    2022-02-22 19:22:22,123000+00:00

diff --git a/tests/expected/uuidparse/uuidparse b/tests/expected/uuidparse/uuidparse
new file mode 100644 (file)
index 0000000..61b49ef
--- /dev/null
+++ b/tests/expected/uuidparse/uuidparse
@@ -0,0 +1,37 @@
+UUID                                  VARIANT   TYPE       TIME
+00000000-0000-0000-0000-000000000000  NCS                  
+00000000-0000-1000-0000-000000000000  NCS                  
+00000000-0000-2000-0000-000000000000  NCS                  
+00000000-0000-3000-0000-000000000000  NCS                  
+00000000-0000-4000-0000-000000000000  NCS                  
+00000000-0000-5000-0000-000000000000  NCS                  
+00000000-0000-6000-0000-000000000000  NCS                  
+00000000-0000-0000-8000-000000000000  DCE       unknown    
+00000000-0000-2000-8000-000000000000  DCE       DCE        
+00000000-0000-3000-8000-000000000000  DCE       name-based 
+00000000-0000-4000-8000-000000000000  DCE       random     
+00000000-0000-5000-8000-000000000000  DCE       sha1-based 
+00000000-0000-6000-8000-000000000000  DCE       time-v6    1582-10-15 00:00:00,000000+00:00
+00000000-0000-0000-d000-000000000000  Microsoft            
+00000000-0000-1000-d000-000000000000  Microsoft            
+00000000-0000-2000-d000-000000000000  Microsoft            
+00000000-0000-3000-d000-000000000000  Microsoft            
+00000000-0000-4000-d000-000000000000  Microsoft            
+00000000-0000-5000-d000-000000000000  Microsoft            
+00000000-0000-6000-d000-000000000000  Microsoft            
+00000000-0000-0000-f000-000000000000  other                
+00000000-0000-1000-f000-000000000000  other                
+00000000-0000-2000-f000-000000000000  other                
+00000000-0000-3000-f000-000000000000  other                
+00000000-0000-4000-f000-000000000000  other                
+00000000-0000-5000-f000-000000000000  other                
+00000000-0000-6000-f000-000000000000  other                
+9b274c46-544a-11e7-a972-00037f500001  DCE       time-based 2017-06-18 17:21:46,544647+00:00
+1ec9414c-232a-6b00-b3c8-9f6bdeced846  DCE       time-v6    2022-02-22 19:22:22,000000+00:00
+017f22e2-79b2-7cc3-98c4-dc0c0c07398f  DCE       time-v7    2022-02-22 19:22:22,002000+00:00
+bf2eb110-d788-1003-aa59-ce1e9e293641  DCE       time-based 1586-03-19 15:05:26,3611398+00:00
+f81d4fae-7dec-11d0-a765-00a0c91e6bf6  DCE       time-based 1997-02-03 17:43:12,216875+00:00
+01234567-89ab-1def-8000-123456789abc  DCE       time-based 4764-11-18 19:35:47,841162+00:00
+5c146b14-3c52-8afd-938a-375d0df1fbf6  DCE       vendor     
+invalid-input                         invalid   invalid    invalid
+return value: 0

diff --git a/tests/ts/uuid/uuidd b/tests/ts/uuidd/uuidd
similarity index 100%
rename from tests/ts/uuid/uuidd
rename to tests/ts/uuidd/uuidd

diff --git a/tests/ts/uuid/oids b/tests/ts/uuidgen/oids
similarity index 100%
rename from tests/ts/uuid/oids
rename to tests/ts/uuidgen/oids

diff --git a/tests/ts/uuid/uuidgen b/tests/ts/uuidgen/uuidgen
similarity index 100%
rename from tests/ts/uuid/uuidgen
rename to tests/ts/uuidgen/uuidgen

diff --git a/tests/ts/uuid/time b/tests/ts/uuidparse/time
similarity index 100%
rename from tests/ts/uuid/time
rename to tests/ts/uuidparse/time

diff --git a/tests/ts/uuid/uuidparse b/tests/ts/uuidparse/uuidparse
similarity index 100%
rename from tests/ts/uuid/uuidparse
rename to tests/ts/uuidparse/uuidparse