From a67cc24c40211728a407bc02cb6d582ade97d211 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 4 May 2011 17:44:12 +0200
Subject: [PATCH] packets: rename, new packets

---
 test/Makefile                                    | 16 +++++-----------
 test/packets/00-length-no-content                |  4 ++++
 test/packets/00-length-no-data                   |  5 +++++
 test/packets/00-method-only                      |  3 +++
 test/packets/00-no-content                       |  3 +++
 test/packets/00-no-data                          |  5 +++++
 test/packets/00-no-entity                        |  6 ++++++
 test/packets/00-no-routing                       |  4 ++++
 test/packets/{full-1 => 01}                      |  0
 test/packets/{full-1-length => 01-length}        |  0
 test/packets/{full-1-utf8 => 01-utf8}            |  0
 test/packets/{full-2-list => 02-list}            |  0
 test/packets/{full-3-list => 03-list}            |  0
 test/packets/{full-4-circuit => 04-circuit}      |  0
 ...full-5-message-private => 05-message-private} |  0
 ...-private-remote => 06-message-private-remote} |  0
 test/packets/{full-7-dns-fake => 07-dns-fake}    |  0
 .../{full-7-dns-invalid => 07-dns-invalid}       |  0
 .../{full-8-context-enter => 08-context-enter}   |  0
 .../{full-8-context-leave => 08-context-leave}   |  0
 test/packets/{error-1-length => err-01-length}   |  0
 test/packets/{error-2-list => err-02-list}       |  0
 test/packets/full-0-no-content                   |  3 ---
 test/packets/part-1-length-p1                    |  1 -
 test/packets/part-1-length-p2                    |  1 -
 test/packets/part-1-length-p3                    |  3 ---
 test/packets/part-1-length-p4                    |  1 -
 test/packets/part-1-length-p5                    |  1 -
 test/packets/part-1-length-p6                    |  1 -
 test/packets/part-1-length-p7                    |  1 -
 test/packets/part-1-length-p8                    |  1 -
 test/packets/part-1-length-p9                    |  1 -
 test/packets/part-1-p1                           |  2 --
 test/packets/part-1-p2                           |  2 --
 test/packets/part-1-p3                           |  3 ---
 test/packets/part-1-p4                           |  2 --
 test/packets/part-1-p5                           |  1 -
 test/packets/part-1-p6                           |  4 ----
 test/packets/part-1-p7                           |  2 --
 test/packets/part-1-p8                           |  2 --
 test/packets/part-1-p9                           |  1 -
 41 files changed, 35 insertions(+), 44 deletions(-)
 create mode 100644 test/packets/00-length-no-content
 create mode 100644 test/packets/00-length-no-data
 create mode 100644 test/packets/00-method-only
 create mode 100644 test/packets/00-no-content
 create mode 100644 test/packets/00-no-data
 create mode 100644 test/packets/00-no-entity
 create mode 100644 test/packets/00-no-routing
 rename test/packets/{full-1 => 01} (100%)
 rename test/packets/{full-1-length => 01-length} (100%)
 rename test/packets/{full-1-utf8 => 01-utf8} (100%)
 rename test/packets/{full-2-list => 02-list} (100%)
 rename test/packets/{full-3-list => 03-list} (100%)
 rename test/packets/{full-4-circuit => 04-circuit} (100%)
 rename test/packets/{full-5-message-private => 05-message-private} (100%)
 rename test/packets/{full-6-message-private-remote => 06-message-private-remote} (100%)
 rename test/packets/{full-7-dns-fake => 07-dns-fake} (100%)
 rename test/packets/{full-7-dns-invalid => 07-dns-invalid} (100%)
 rename test/packets/{full-8-context-enter => 08-context-enter} (100%)
 rename test/packets/{full-8-context-leave => 08-context-leave} (100%)
 rename test/packets/{error-1-length => err-01-length} (100%)
 rename test/packets/{error-2-list => err-02-list} (100%)
 delete mode 100644 test/packets/full-0-no-content
 delete mode 120000 test/packets/part-1-length-p1
 delete mode 120000 test/packets/part-1-length-p2
 delete mode 100644 test/packets/part-1-length-p3
 delete mode 120000 test/packets/part-1-length-p4
 delete mode 120000 test/packets/part-1-length-p5
 delete mode 120000 test/packets/part-1-length-p6
 delete mode 120000 test/packets/part-1-length-p7
 delete mode 120000 test/packets/part-1-length-p8
 delete mode 120000 test/packets/part-1-length-p9
 delete mode 100644 test/packets/part-1-p1
 delete mode 100644 test/packets/part-1-p2
 delete mode 100644 test/packets/part-1-p3
 delete mode 100644 test/packets/part-1-p4
 delete mode 100644 test/packets/part-1-p5
 delete mode 100644 test/packets/part-1-p6
 delete mode 100644 test/packets/part-1-p7
 delete mode 100644 test/packets/part-1-p8
 delete mode 100644 test/packets/part-1-p9

diff --git a/test/Makefile b/test/Makefile
index 5560569..8a7837d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,8 +23,8 @@ test: ${TARGETS}
 	./testText
 	./isRoutingVar
 	./getVarType
-	for f in packets/full-*; do echo ">> $$f"; ./testParser $$f; done
-	for f in packets/full-*; do echo ">> $$f"; ./testParser $$f -r; done
+	for f in packets/[0-9]*; do echo ">> $$f"; ./testParser $$f; done
+	for f in packets/[0-9]*; do echo ">> $$f"; ./testParser $$f -r; done
 
 testServer: CFLAGS := $(subst -std=c99,,${CFLAGS})
 
@@ -41,19 +41,13 @@ netstartrv:
 	./testServer ${PORT} -rv
 
 nettest:
-	for f in packets/full-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT} | diff -u $$f -; done
+	for f in packets/[0-9]*; do echo ">> $$f"; cat $$f | nc localhost ${PORT} | diff -u $$f -; done
 
 nettesterr:
-	for f in packets/error-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT}; done
+	for f in packets/err-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT}; done
 
 splittest:
-	for f in packets/full-*; do echo ">> $$f"; ./splittest.pl $$f ${PORT} | diff -u $$f -; done
-
-nettestp1:
-	(for f in packets/part-1-p*; do cat $$f; done) | nc localhost ${PORT} | diff -u packets/full-1 -
-
-nettestp2:
-	(for f in packets/part-1-length-p*; do cat $$f; done) | nc localhost ${PORT} | diff -u packets/full-1-length -
+	for f in packets/[0-9]*; do echo ">> $$f"; ./splittest.pl $$f ${PORT} | diff -u $$f -; done
 
 clean:
 	rm -f ${TARGETS}
diff --git a/test/packets/00-length-no-content b/test/packets/00-length-no-content
new file mode 100644
index 0000000..0954c09
--- /dev/null
+++ b/test/packets/00-length-no-content
@@ -0,0 +1,4 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+0
+|
diff --git a/test/packets/00-length-no-data b/test/packets/00-length-no-data
new file mode 100644
index 0000000..5ee71c1
--- /dev/null
+++ b/test/packets/00-length-no-data
@@ -0,0 +1,5 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+16
+_notice_foo_bar
+|
diff --git a/test/packets/00-method-only b/test/packets/00-method-only
new file mode 100644
index 0000000..0f903d4
--- /dev/null
+++ b/test/packets/00-method-only
@@ -0,0 +1,3 @@
+
+_notice_foo_bar
+|
diff --git a/test/packets/00-no-content b/test/packets/00-no-content
new file mode 100644
index 0000000..0efa599
--- /dev/null
+++ b/test/packets/00-no-content
@@ -0,0 +1,3 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+|
diff --git a/test/packets/00-no-data b/test/packets/00-no-data
new file mode 100644
index 0000000..88265ca
--- /dev/null
+++ b/test/packets/00-no-data
@@ -0,0 +1,5 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+
+_notice_foo_bar
+|
diff --git a/test/packets/00-no-entity b/test/packets/00-no-entity
new file mode 100644
index 0000000..48ce4e9
--- /dev/null
+++ b/test/packets/00-no-entity
@@ -0,0 +1,6 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+
+_message_private
+OHAI
+|
diff --git a/test/packets/00-no-routing b/test/packets/00-no-routing
new file mode 100644
index 0000000..85c66e5
--- /dev/null
+++ b/test/packets/00-no-routing
@@ -0,0 +1,4 @@
+
+:_foo	bar
+_notice_foo_bar
+|
diff --git a/test/packets/full-1 b/test/packets/01
similarity index 100%
rename from test/packets/full-1
rename to test/packets/01
diff --git a/test/packets/full-1-length b/test/packets/01-length
similarity index 100%
rename from test/packets/full-1-length
rename to test/packets/01-length
diff --git a/test/packets/full-1-utf8 b/test/packets/01-utf8
similarity index 100%
rename from test/packets/full-1-utf8
rename to test/packets/01-utf8
diff --git a/test/packets/full-2-list b/test/packets/02-list
similarity index 100%
rename from test/packets/full-2-list
rename to test/packets/02-list
diff --git a/test/packets/full-3-list b/test/packets/03-list
similarity index 100%
rename from test/packets/full-3-list
rename to test/packets/03-list
diff --git a/test/packets/full-4-circuit b/test/packets/04-circuit
similarity index 100%
rename from test/packets/full-4-circuit
rename to test/packets/04-circuit
diff --git a/test/packets/full-5-message-private b/test/packets/05-message-private
similarity index 100%
rename from test/packets/full-5-message-private
rename to test/packets/05-message-private
diff --git a/test/packets/full-6-message-private-remote b/test/packets/06-message-private-remote
similarity index 100%
rename from test/packets/full-6-message-private-remote
rename to test/packets/06-message-private-remote
diff --git a/test/packets/full-7-dns-fake b/test/packets/07-dns-fake
similarity index 100%
rename from test/packets/full-7-dns-fake
rename to test/packets/07-dns-fake
diff --git a/test/packets/full-7-dns-invalid b/test/packets/07-dns-invalid
similarity index 100%
rename from test/packets/full-7-dns-invalid
rename to test/packets/07-dns-invalid
diff --git a/test/packets/full-8-context-enter b/test/packets/08-context-enter
similarity index 100%
rename from test/packets/full-8-context-enter
rename to test/packets/08-context-enter
diff --git a/test/packets/full-8-context-leave b/test/packets/08-context-leave
similarity index 100%
rename from test/packets/full-8-context-leave
rename to test/packets/08-context-leave
diff --git a/test/packets/error-1-length b/test/packets/err-01-length
similarity index 100%
rename from test/packets/error-1-length
rename to test/packets/err-01-length
diff --git a/test/packets/error-2-list b/test/packets/err-02-list
similarity index 100%
rename from test/packets/error-2-list
rename to test/packets/err-02-list
diff --git a/test/packets/full-0-no-content b/test/packets/full-0-no-content
deleted file mode 100644
index c37d4bb..0000000
--- a/test/packets/full-0-no-content
+++ /dev/null
@@ -1,3 +0,0 @@
-:_source	psyc://test.psyc.eu/
-:_target	psyc://test.psyc.eu/
-|
diff --git a/test/packets/part-1-length-p1 b/test/packets/part-1-length-p1
deleted file mode 120000
index b934188..0000000
--- a/test/packets/part-1-length-p1
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p1
\ No newline at end of file
diff --git a/test/packets/part-1-length-p2 b/test/packets/part-1-length-p2
deleted file mode 120000
index e3f9bb4..0000000
--- a/test/packets/part-1-length-p2
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p2
\ No newline at end of file
diff --git a/test/packets/part-1-length-p3 b/test/packets/part-1-length-p3
deleted file mode 100644
index ed36f14..0000000
--- a/test/packets/part-1-length-p3
+++ /dev/null
@@ -1,3 +0,0 @@
-hu3r2cm
-85
-:_foo	bar baz
\ No newline at end of file
diff --git a/test/packets/part-1-length-p4 b/test/packets/part-1-length-p4
deleted file mode 120000
index 75d3aaf..0000000
--- a/test/packets/part-1-length-p4
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p4
\ No newline at end of file
diff --git a/test/packets/part-1-length-p5 b/test/packets/part-1-length-p5
deleted file mode 120000
index 854fc1b..0000000
--- a/test/packets/part-1-length-p5
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p5
\ No newline at end of file
diff --git a/test/packets/part-1-length-p6 b/test/packets/part-1-length-p6
deleted file mode 120000
index 3fc7513..0000000
--- a/test/packets/part-1-length-p6
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p6
\ No newline at end of file
diff --git a/test/packets/part-1-length-p7 b/test/packets/part-1-length-p7
deleted file mode 120000
index c4fd783..0000000
--- a/test/packets/part-1-length-p7
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p7
\ No newline at end of file
diff --git a/test/packets/part-1-length-p8 b/test/packets/part-1-length-p8
deleted file mode 120000
index 46db87b..0000000
--- a/test/packets/part-1-length-p8
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p8
\ No newline at end of file
diff --git a/test/packets/part-1-length-p9 b/test/packets/part-1-length-p9
deleted file mode 120000
index d933075..0000000
--- a/test/packets/part-1-length-p9
+++ /dev/null
@@ -1 +0,0 @@
-part-1-p9
\ No newline at end of file
diff --git a/test/packets/part-1-p1 b/test/packets/part-1-p1
deleted file mode 100644
index 5a4579e..0000000
--- a/test/packets/part-1-p1
+++ /dev/null
@@ -1,2 +0,0 @@
-:_source	psyc://foo/~bar
-:_tar
\ No newline at end of file
diff --git a/test/packets/part-1-p2 b/test/packets/part-1-p2
deleted file mode 100644
index 82affb8..0000000
--- a/test/packets/part-1-p2
+++ /dev/null
@@ -1,2 +0,0 @@
-get	psyc://bar/~baz
-:_tag	sch1828
\ No newline at end of file
diff --git a/test/packets/part-1-p3 b/test/packets/part-1-p3
deleted file mode 100644
index 126300c..0000000
--- a/test/packets/part-1-p3
+++ /dev/null
@@ -1,3 +0,0 @@
-hu3r2cm
-
-:_foo	bar baz
\ No newline at end of file
diff --git a/test/packets/part-1-p4 b/test/packets/part-1-p4
deleted file mode 100644
index 3cd7e42..0000000
--- a/test/packets/part-1-p4
+++ /dev/null
@@ -1,2 +0,0 @@
-
-:_abc_def 1
\ No newline at end of file
diff --git a/test/packets/part-1-p5 b/test/packets/part-1-p5
deleted file mode 100644
index cb3b80c..0000000
--- a/test/packets/part-1-p5
+++ /dev/null
@@ -1 +0,0 @@
-1	foo
\ No newline at end of file
diff --git a/test/packets/part-1-p6 b/test/packets/part-1-p6
deleted file mode 100644
index 0acc380..0000000
--- a/test/packets/part-1-p6
+++ /dev/null
@@ -1,4 +0,0 @@
- bar
-baz
-:_foo_bar	yay
-_message
\ No newline at end of file
diff --git a/test/packets/part-1-p7 b/test/packets/part-1-p7
deleted file mode 100644
index a8dfc27..0000000
--- a/test/packets/part-1-p7
+++ /dev/null
@@ -1,2 +0,0 @@
-_foo_bar
-ohai
\ No newline at end of file
diff --git a/test/packets/part-1-p8 b/test/packets/part-1-p8
deleted file mode 100644
index 1651eb0..0000000
--- a/test/packets/part-1-p8
+++ /dev/null
@@ -1,2 +0,0 @@
- there!
-\o/
diff --git a/test/packets/part-1-p9 b/test/packets/part-1-p9
deleted file mode 100644
index 948cf94..0000000
--- a/test/packets/part-1-p9
+++ /dev/null
@@ -1 +0,0 @@
-|