From 72be188cb3ba62a36781f7652b7375116aa5269a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 20 Nov 2013 10:46:45 +0100 Subject: [PATCH] Enable Solr tests again PAZ-894 Also some tests results due to other order of records within cluster PAZ-902. --- test/Makefile.am | 3 ++- test/test_limit_limitmap_4.res | 4 +-- test/test_solr_13.res | 40 +++++++++++++-------------- test/test_solr_18.res | 58 ++++++++++++++++++++-------------------- test/test_solr_25.res | 40 +++++++++++++-------------- test/test_solr_4.res | 40 +++++++++++++-------------- test/test_solr_9.res | 40 +++++++++++++-------------- test/test_sort_4.res | 34 +++++++++++------------ test/test_sort_8.res | 34 +++++++++++------------ test/test_termlist_block_4.res | 4 +-- 10 files changed, 149 insertions(+), 148 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 3efb269..607b06d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,8 @@ solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh test_sort.sh check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \ test_settings.sh test_turbomarcxml.sh test_facets.sh \ - test_url.sh test_filter.sh test_tmarc.sh test_sru.sh + test_url.sh test_filter.sh test_tmarc.sh test_sru.sh \ + $(solr_tests) EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \ z3950_indexdata_com_marc.xml \ diff --git a/test/test_limit_limitmap_4.res b/test/test_limit_limitmap_4.res index 053919b..ec128c4 100644 --- a/test/test_limit_limitmap_4.res +++ b/test/test_limit_limitmap_4.res @@ -9,13 +9,13 @@ How to program a computer Jack Collins + name="ztest-db1" checksum="1300880726"> How to program a computer Jack Collins XXXXXXXXXX + name="ztest-db1" checksum="2047776311"> How to program a computer Jack Collins XXXXXXXXXX diff --git a/test/test_solr_13.res b/test/test_solr_13.res index f44540c..550453a 100644 --- a/test/test_solr_13.res +++ b/test/test_solr_13.res @@ -27,16 +27,16 @@ Baker, M. N book + name="LOC Solr Test" checksum="1261468432"> Potable water and methods of detecting impurities - 1906 + 1899 Baker, M. N book + name="LOC Solr Test" checksum="1810338543"> Potable water and methods of detecting impurities - 1899 + 1906 Baker, M. N book @@ -140,14 +140,6 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 - Cover title - "July 2000." - book - - Water quality assessment of the State Water Project, 1996-97 1999 @@ -155,6 +147,14 @@ "September 1999." book + + Water quality assessment of the State Water Project, 1998-99 + 2000 + Cover title + "July 2000." + book + 2 22614 content: title water quality assessment of the state water project medium book @@ -202,14 +202,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -218,6 +210,14 @@ With reference to India book + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 2 20411 content: title water in press medium book diff --git a/test/test_solr_18.res b/test/test_solr_18.res index 472432a..b4da0b5 100644 --- a/test/test_solr_18.res +++ b/test/test_solr_18.res @@ -27,16 +27,16 @@ Baker, M. N book + name="LOC Solr Test" checksum="1261468432"> Potable water and methods of detecting impurities - 1906 + 1899 Baker, M. N book + name="LOC Solr Test" checksum="1810338543"> Potable water and methods of detecting impurities - 1899 + 1906 Baker, M. N book @@ -140,14 +140,6 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 - Cover title - "July 2000." - book - - Water quality assessment of the State Water Project, 1996-97 1999 @@ -155,6 +147,14 @@ "September 1999." book + + Water quality assessment of the State Water Project, 1998-99 + 2000 + Cover title + "July 2000." + book + 2 22729 content: title water quality assessment of the state water project medium book @@ -202,14 +202,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -218,6 +210,14 @@ With reference to India book + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 2 20514 content: title water in press medium book @@ -230,20 +230,20 @@ Original imprint 1901, corrected to 1900 book + name="LOC Solr Test" checksum="707691898"> Water-power an outline of the development and application of the energy of flowing water - 1901 + 1900 Frizell, Joseph P + Original imprint 1901, corrected to 1900 book + name="LOC Solr Test" checksum="2322304367"> Water-power an outline of the development and application of the energy of flowing water - 1900 + 1901 Frizell, Joseph P - Original imprint 1901, corrected to 1900 book 2 @@ -257,18 +257,18 @@ Folwell, Amory Prescott book + name="LOC Solr Test" checksum="1000579097"> Water-supply engineering The designing, construction, and maintenance of water-supply systems, both city and irrigation - 1909 + 1903 Folwell, Amory Prescott book + name="LOC Solr Test" checksum="3196059541"> Water-supply engineering The designing, construction, and maintenance of water-supply systems, both city and irrigation - 1903 + 1909 Folwell, Amory Prescott book diff --git a/test/test_solr_25.res b/test/test_solr_25.res index f44540c..550453a 100644 --- a/test/test_solr_25.res +++ b/test/test_solr_25.res @@ -27,16 +27,16 @@ Baker, M. N book + name="LOC Solr Test" checksum="1261468432"> Potable water and methods of detecting impurities - 1906 + 1899 Baker, M. N book + name="LOC Solr Test" checksum="1810338543"> Potable water and methods of detecting impurities - 1899 + 1906 Baker, M. N book @@ -140,14 +140,6 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 - Cover title - "July 2000." - book - - Water quality assessment of the State Water Project, 1996-97 1999 @@ -155,6 +147,14 @@ "September 1999." book + + Water quality assessment of the State Water Project, 1998-99 + 2000 + Cover title + "July 2000." + book + 2 22614 content: title water quality assessment of the state water project medium book @@ -202,14 +202,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -218,6 +210,14 @@ With reference to India book + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 2 20411 content: title water in press medium book diff --git a/test/test_solr_4.res b/test/test_solr_4.res index f44540c..550453a 100644 --- a/test/test_solr_4.res +++ b/test/test_solr_4.res @@ -27,16 +27,16 @@ Baker, M. N book + name="LOC Solr Test" checksum="1261468432"> Potable water and methods of detecting impurities - 1906 + 1899 Baker, M. N book + name="LOC Solr Test" checksum="1810338543"> Potable water and methods of detecting impurities - 1899 + 1906 Baker, M. N book @@ -140,14 +140,6 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 - Cover title - "July 2000." - book - - Water quality assessment of the State Water Project, 1996-97 1999 @@ -155,6 +147,14 @@ "September 1999." book + + Water quality assessment of the State Water Project, 1998-99 + 2000 + Cover title + "July 2000." + book + 2 22614 content: title water quality assessment of the state water project medium book @@ -202,14 +202,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -218,6 +210,14 @@ With reference to India book + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 2 20411 content: title water in press medium book diff --git a/test/test_solr_9.res b/test/test_solr_9.res index f44540c..550453a 100644 --- a/test/test_solr_9.res +++ b/test/test_solr_9.res @@ -27,16 +27,16 @@ Baker, M. N book + name="LOC Solr Test" checksum="1261468432"> Potable water and methods of detecting impurities - 1906 + 1899 Baker, M. N book + name="LOC Solr Test" checksum="1810338543"> Potable water and methods of detecting impurities - 1899 + 1906 Baker, M. N book @@ -140,14 +140,6 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 - Cover title - "July 2000." - book - - Water quality assessment of the State Water Project, 1996-97 1999 @@ -155,6 +147,14 @@ "September 1999." book + + Water quality assessment of the State Water Project, 1998-99 + 2000 + Cover title + "July 2000." + book + 2 22614 content: title water quality assessment of the state water project medium book @@ -202,14 +202,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -218,6 +210,14 @@ With reference to India book + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 2 20411 content: title water in press medium book diff --git a/test/test_sort_4.res b/test/test_sort_4.res index 85ef392..44bbc1f 100644 --- a/test/test_sort_4.res +++ b/test/test_sort_4.res @@ -216,20 +216,20 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 + name="LOC Solr Test" checksum="3749836075"> + Water quality assessment of the State Water Project, 1996-97 + 1999 Cover title - "July 2000." + "September 1999." book 2.0165553 - Water quality assessment of the State Water Project, 1996-97 - 1999 + name="LOC Solr Test" checksum="1069481248"> + Water quality assessment of the State Water Project, 1998-99 + 2000 Cover title - "September 1999." + "July 2000." book 2.0165553 @@ -331,15 +331,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - 1.6871711 - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -349,6 +340,15 @@ book 1.9281956 + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 1.6871711 + 2 content: title water in press medium book diff --git a/test/test_sort_8.res b/test/test_sort_8.res index 85ef392..44bbc1f 100644 --- a/test/test_sort_8.res +++ b/test/test_sort_8.res @@ -216,20 +216,20 @@ "September 1999." book - Water quality assessment of the State Water Project, 1998-99 - 2000 + name="LOC Solr Test" checksum="3749836075"> + Water quality assessment of the State Water Project, 1996-97 + 1999 Cover title - "July 2000." + "September 1999." book 2.0165553 - Water quality assessment of the State Water Project, 1996-97 - 1999 + name="LOC Solr Test" checksum="1069481248"> + Water quality assessment of the State Water Project, 1998-99 + 2000 Cover title - "September 1999." + "July 2000." book 2.0165553 @@ -331,15 +331,6 @@ With reference to India book - Water, in press, 1998 - an index to news items on water resources selected from leading news papers - 1999 - Includes index - book - 1.6871711 - - Water in press, 1997 an index of news items on water resources selected from leading news papers @@ -349,6 +340,15 @@ book 1.9281956 + + Water, in press, 1998 + an index to news items on water resources selected from leading news papers + 1999 + Includes index + book + 1.6871711 + 2 content: title water in press medium book diff --git a/test/test_termlist_block_4.res b/test/test_termlist_block_4.res index 0613a8e..50ed7cd 100644 --- a/test/test_termlist_block_4.res +++ b/test/test_termlist_block_4.res @@ -23,12 +23,12 @@ How to program a computer Jack Collins + name="db1" checksum="75373906"> How to program a computer Jack Collins + name="db1" checksum="4195168235"> How to program a computer Jack Collins -- 1.7.10.4