From accb9c8fc434caa236a4a3fd6c521af1b5ac0091 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 11 Feb 2010 11:15:51 +0100
Subject: [PATCH] Add test case for bug #3260 (settings mixed)

---
 test/test_settings_2.res |    2 +-
 test/test_settings_3.res |    2 +-
 test/test_settings_4.res |   17 +----------------
 test/test_settings_5.res |    2 ++
 test/test_settings_6.res |    2 ++
 test/test_settings_7.res |   17 +++++++++++++++++
 test/test_settings_8.res |   17 +++++++++++++++++
 test/test_settings_urls  |    6 +++++-
 8 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 test/test_settings_5.res
 create mode 100644 test/test_settings_6.res
 create mode 100644 test/test_settings_7.res
 create mode 100644 test/test_settings_8.res

diff --git a/test/test_settings_2.res b/test/test_settings_2.res
index 42534e3..2b3989e 100644
--- a/test/test_settings_2.res
+++ b/test/test_settings_2.res
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<settings><status>OK</status></settings>
\ No newline at end of file
+<init><status>OK</status><session>2</session><protocol>1</protocol></init>
\ No newline at end of file
diff --git a/test/test_settings_3.res b/test/test_settings_3.res
index ab63fe6..42534e3 100644
--- a/test/test_settings_3.res
+++ b/test/test_settings_3.res
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<search><status>OK</status></search>
\ No newline at end of file
+<settings><status>OK</status></settings>
\ No newline at end of file
diff --git a/test/test_settings_4.res b/test/test_settings_4.res
index fd09de2..ab63fe6 100644
--- a/test/test_settings_4.res
+++ b/test/test_settings_4.res
@@ -1,17 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bytarget><status>OK</status>
-<target><id>z3950.indexdata.com/marc</id>
-<name>Target name</name>
-<hits>0</hits>
-<diagnostic>114</diagnostic>
-<records>0</records>
-<state>Client_Idle</state>
-<settings>
-<set name="pz:elements" value="F"/>
-<set name="pz:requestsyntax" value="marc21"/>
-<set name="pz:cclmap:term" value="u=host_wildcard"/>
-<set name="pz:id" value="z3950.indexdata.com/marc"/>
-<set name="pz:name" value="Target name"/>
-<set name="category" value="1"/>
-</settings>
-</target></bytarget>
\ No newline at end of file
+<search><status>OK</status></search>
\ No newline at end of file
diff --git a/test/test_settings_5.res b/test/test_settings_5.res
new file mode 100644
index 0000000..42534e3
--- /dev/null
+++ b/test/test_settings_5.res
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings><status>OK</status></settings>
\ No newline at end of file
diff --git a/test/test_settings_6.res b/test/test_settings_6.res
new file mode 100644
index 0000000..ab63fe6
--- /dev/null
+++ b/test/test_settings_6.res
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<search><status>OK</status></search>
\ No newline at end of file
diff --git a/test/test_settings_7.res b/test/test_settings_7.res
new file mode 100644
index 0000000..fd09de2
--- /dev/null
+++ b/test/test_settings_7.res
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bytarget><status>OK</status>
+<target><id>z3950.indexdata.com/marc</id>
+<name>Target name</name>
+<hits>0</hits>
+<diagnostic>114</diagnostic>
+<records>0</records>
+<state>Client_Idle</state>
+<settings>
+<set name="pz:elements" value="F"/>
+<set name="pz:requestsyntax" value="marc21"/>
+<set name="pz:cclmap:term" value="u=host_wildcard"/>
+<set name="pz:id" value="z3950.indexdata.com/marc"/>
+<set name="pz:name" value="Target name"/>
+<set name="category" value="1"/>
+</settings>
+</target></bytarget>
\ No newline at end of file
diff --git a/test/test_settings_8.res b/test/test_settings_8.res
new file mode 100644
index 0000000..31008db
--- /dev/null
+++ b/test/test_settings_8.res
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bytarget><status>OK</status>
+<target><id>z3950.indexdata.com/marc</id>
+<name>Target name</name>
+<hits>0</hits>
+<diagnostic>0</diagnostic>
+<records>0</records>
+<state>Client_Idle</state>
+<settings>
+<set name="pz:elements" value="F"/><set name="pz:elements" value="F"/>
+<set name="pz:requestsyntax" value="marc21"/>
+<set name="pz:cclmap:term" value="u=1016"/><set name="pz:cclmap:term" value="u=host_wildcard"/>
+<set name="pz:id" value="z3950.indexdata.com/marc"/>
+<set name="pz:name" value="Target name"/>
+<set name="category" value="1"/>
+</settings>
+</target></bytarget>
\ No newline at end of file
diff --git a/test/test_settings_urls b/test/test_settings_urls
index 32e1cda..5f7a967 100644
--- a/test/test_settings_urls
+++ b/test/test_settings_urls
@@ -1,4 +1,8 @@
-http://localhost:9763/search.pz2?session=1&command=init
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1
 http://localhost:9763/search.pz2?session=1&command=search&query=water
+http://localhost:9763/search.pz2?session=2&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
+http://localhost:9763/search.pz2?session=2&command=search&query=water
 2 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
+http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
-- 
1.7.10.4