Changeset 291

Timestamp:

06/03/10 11:50:20 (20 months ago)

Author:

ol

Message:

Rationalize unit test numbers

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• test/unit_test (modified) (3 diffs)

trunk/Makefile.in

@@ -72 +72 @@
         @test/unit_test test/wfs/cite_wfs_1_1_0-sf0 3
 
-test-exception:
+test-http:
         @test/unit_test test/wfs/cite_wfs_1_1_0-sf0 4
 
-test-stderr:
+test-exception:
         @test/unit_test test/wfs/cite_wfs_1_1_0-sf0 5
 
-test-http:
+test-stderr:
         @test/unit_test test/wfs/cite_wfs_1_1_0-sf0 6
 

trunk/test/unit_test

@@ -71 +71 @@
     ./tinyows
 
+# http mode
+elif [ $mode -eq 4 ]; then
+    echo $unit_id
+    if [ ! $TINYOWS_CONFIG_FILE ]; then
+        TINYOWS_CONFIG_FILE=/usr/local/tinyows/config.xml
+    fi
+    IP=`grep online_resource $TINYOWS_CONFIG_FILE | sed -e 's/.*online_resource="//' -e 's/".*//'`
+    curl -i -H "Content-Type: text/xml" --data @$unit_id $IP
+
 # Exception mode
-elif [ $mode -eq 4 ]; then
+elif [ $mode -eq 5 ]; then
     ows_ret=`./tinyows 2> /dev/null | grep ExceptionText`
     if [ "$ows_ret" ]; then
@@ -80 +89 @@
 
 # stderr mode
-elif [ $mode -eq 5 ]; then
+elif [ $mode -eq 6 ]; then
     ./tinyows > /dev/null 2> $file_tmp
     ows_ret=`cat $file_tmp`
@@ -88 +97 @@
     rm -f $file_tmp
 
-# curl mode
-elif [ $mode -eq 6 ]; then
-    echo $unit_id
-    if [ ! $TINYOWS_CONFIG_FILE ]; then
-        TINYOWS_CONFIG_FILE=/usr/local/tinyows/config.xml
-    fi
-    IP=`grep online_resource $TINYOWS_CONFIG_FILE | sed -e 's/.*online_resource="//' -e 's/".*//'`
-    curl -i -H "Content-Type: text/xml" --data @$unit_id $IP
 fi