fib_matching: remove testing of Selectors
Change-Id: I6d9e787ec25d60e82d1dcd35bb9b734f0778d65b
Refs: #4660
diff --git a/test_fib_matching/fib-matching-test.sh b/test_fib_matching/fib-matching-test.sh
index eb0dc9e..d313d04 100755
--- a/test_fib_matching/fib-matching-test.sh
+++ b/test_fib_matching/fib-matching-test.sh
@@ -27,8 +27,8 @@
ndn-traffic-server $workdir/test-traffic-server-4.conf &> $workdir/logs/server-4.log &
sleep 0.1
-# A: Request / with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 1 (Prefix=/, MustBeFresh=true, ExpectedContent=Z, MaxSuffixComponents=2)..."
+# A: Request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+echo "Starting Traffic Client 1 (Prefix=/F, MustBeFresh=true, ExpectedContent=Z)..."
ndn-traffic -c 1 $workdir/test-traffic-client-1.conf &> $workdir/logs/client-1.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -41,8 +41,8 @@
# Sleep for 100ms
sleep 0.1
-# A: Request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 2 (Prefix=/F, MustBeFresh=true, ExpectedContent=Z)..."
+# A: Request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A"
+echo "Starting Traffic Client 2 (Prefix=/A, MustBeFresh=true, ExpectedContent=A)..."
ndn-traffic -c 1 $workdir/test-traffic-client-2.conf &> $workdir/logs/client-2.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -50,13 +50,13 @@
clean_up
exit 1
fi
-echo "Traffic Client 2 received Data with Content=Z"
+echo "Traffic Client 2 received Data with Content=A"
# Sleep for 100ms
sleep 0.1
-# A: Request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A"
-echo "Starting Traffic Client 3 (Prefix=/A, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+echo "Starting Traffic Client 3 (Prefix=/a, MustBeFresh=true, ExpectedContent=Z)..."
ndn-traffic -c 1 $workdir/test-traffic-client-3.conf &> $workdir/logs/client-3.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -64,13 +64,13 @@
clean_up
exit 1
fi
-echo "Traffic Client 3 received Data with Content=A"
+echo "Traffic Client 3 received Data with Content=Z"
# Sleep for 100ms
sleep 0.1
-# A: Request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 4 (Prefix=/a, MustBeFresh=true, ExpectedContent=Z)..."
+# A: Request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+echo "Starting Traffic Client 4 (Prefix=/A/B, MustBeFresh=true, ExpectedContent=A)..."
ndn-traffic -c 1 $workdir/test-traffic-client-4.conf &> $workdir/logs/client-4.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -78,13 +78,13 @@
clean_up
exit 1
fi
-echo "Traffic Client 4 received Data with Content=Z"
+echo "Traffic Client 4 received Data with Content=A"
# Sleep for 100ms
sleep 0.1
-# A: Request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
-echo "Starting Traffic Client 5 (Prefix=/A/B, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+echo "Starting Traffic Client 5 (Prefix=/A/B/G, MustBeFresh=true, ExpectedContent=A)..."
ndn-traffic -c 1 $workdir/test-traffic-client-5.conf &> $workdir/logs/client-5.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -97,8 +97,8 @@
# Sleep for 100ms
sleep 0.1
-# A: Request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
-echo "Starting Traffic Client 6 (Prefix=/A/B/G, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
+echo "Starting Traffic Client 6 (Prefix=/A/B/C, MustBeFresh=true, ExpectedContent=C)..."
ndn-traffic -c 1 $workdir/test-traffic-client-6.conf &> $workdir/logs/client-6.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -106,13 +106,14 @@
clean_up
exit 1
fi
-echo "Traffic Client 6 received Data with Content=A"
+echo "Traffic Client 6 received Data with Content=C"
# Sleep for 100ms
sleep 0.1
-# A: Request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
-echo "Starting Traffic Client 7 (Prefix=/A/B/C, MustBeFresh=true, ExpectedContent=C)..."
+# A: Request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received
+# content is not "C".
+echo "Starting Traffic Client 7 (Prefix=/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z, MustBeFresh=true, ExpectedContent=C)..."
ndn-traffic -c 1 $workdir/test-traffic-client-7.conf &> $workdir/logs/client-7.log
outcode=$?
if [[ $outcode -ne 0 ]]; then
@@ -122,48 +123,4 @@
fi
echo "Traffic Client 7 received Data with Content=C"
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received
-# content is not "C".
-echo "Starting Traffic Client 8 (Prefix=/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z, MustBeFresh=true, ExpectedContent=C)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-8.conf &> $workdir/logs/client-8.log
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
- echo "Received non-zero exit code from Traffic Client 8. Actual: $outcode"
- clean_up
- exit 1
-fi
-echo "Traffic Client 8 received Data with Content=C"
-
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /D with MustBeFresh=true and Exclude=[...,D]. Fail if unanswered or if received content
-# is not "Z".
-echo "Starting Traffic Client 9 (Prefix=/D, MustBeFresh=true, ExcludeRange=...,D, ExpectedContent=Z)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-9.conf &> $workdir/logs/client-9.log
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
- echo "Received non-zero exit code from Traffic Client 9. Actual: $outcode"
- clean_up
- exit 1
-fi
-echo "Traffic Client 9 received Data with Content=Z"
-
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /D with MustBeFresh=true and Exclude=[...,E]. Fail if unanswered or if received content
-# is not "Z".
-echo "Starting Traffic Client 10 (Prefix=/D MustBeFresh=true, ExcludeRange=...,E, ExpectedContent=Z)..."
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
- echo "Received non-zero exit code from Traffic Client 10. Actual: $outcode"
- clean_up
- exit 1
-fi
-echo "Traffic Client 10 received Data with Content=Z"
-
clean_up