Add test for SOLR stuff; memory based, no network.

diff --git a/test/Makefile.am b/test/Makefile.am
index 4751d2e..478f6f8 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,7 +3,8 @@
 
 check_PROGRAMS = test_xmalloc test_iconv test_nmem test_matchstr test_wrbuf \
  test_odr test_ccl test_log test_mutex \
 
 check_PROGRAMS = test_xmalloc test_iconv test_nmem test_matchstr test_wrbuf \
  test_odr test_ccl test_log test_mutex \

- test_soap1 test_soap2 test_odrstack test_log_thread test_xmlquery test_pquery \
+ test_soap1 test_soap2 test_solr test_odrstack test_log_thread \
+ test_xmlquery test_pquery \

  test_comstack test_filepath test_record_conv test_retrieval test_tpath \
  test_timing test_query_charset test_oid test_icu test_match_glob \
  test_rpn2cql test_rpn2solr test_json test_xml_include test_file_glob \
  test_comstack test_filepath test_record_conv test_retrieval test_tpath \
  test_timing test_query_charset test_oid test_icu test_match_glob \
  test_rpn2cql test_rpn2solr test_json test_xml_include test_file_glob \

@@ -68,6 +69,7 @@ test_log_SOURCES = test_log.c
 test_mutex_SOURCES = test_mutex.c
 test_soap1_SOURCES = test_soap1.c
 test_soap2_SOURCES = test_soap2.c
 test_mutex_SOURCES = test_mutex.c
 test_soap1_SOURCES = test_soap1.c
 test_soap2_SOURCES = test_soap2.c

+test_solr_SOURCES = test_solr.c

 test_log_thread_SOURCES = test_log_thread.c
 test_xmlquery_SOURCES = test_xmlquery.c
 test_pquery_SOURCES = test_pquery.c
 test_log_thread_SOURCES = test_log_thread.c
 test_xmlquery_SOURCES = test_xmlquery.c
 test_pquery_SOURCES = test_pquery.c

diff --git a/test/test_solr.c b/test/test_solr.c
new file mode 100644 (file)
index 0000000..b329024
--- /dev/null
+++ b/test/test_solr.c
@@ -0,0 +1,151 @@
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
+ * See the file LICENSE for details.
+ */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <yaz/srw.h>
+#if YAZ_HAVE_XML2
+#include <libxml/parser.h>
+#endif
+#include <yaz/test.h>
+#include <yaz/yaz-version.h>
+#include <yaz/pquery.h>
+
+#if YAZ_HAVE_XML2
+int compare_solr_req(ODR odr, Z_SRW_PDU *sr,
+                     const char *charset, const char *expect)
+{
+    int r;
+    Z_GDU *gdu = 0;
+    YAZ_CHECK(sr);
+
+    if (!sr)
+        return 0;
+
+    gdu = z_get_HTTP_Request_host_path(odr, "localhost", "Default");
+    YAZ_CHECK(gdu);
+    if (!gdu)
+        return 0;
+
+    yaz_solr_encode_request(gdu->u.HTTP_Request, sr, odr, charset);
+
+    r = z_GDU(odr, &gdu, 0, 0);
+    YAZ_CHECK(r);
+    if (r)
+    {
+        int len = 0;
+        char *buf = odr_getbuf(odr, &len, 0);
+        
+        if (buf)
+        {
+            if (len == strlen(expect) && !memcmp(buf, expect, len))
+            {
+                odr_reset(odr);
+                return 1;
+            }
+            yaz_log(YLOG_WARN, "Expect:\n%s\n", expect);
+            yaz_log(YLOG_WARN, "Got:\n%.*s\n", len, buf);
+         }
+    }
+    odr_reset(odr);
+    return 0;
+}
+#endif
+
+void tst(void)
+{
+#if YAZ_HAVE_XML2
+    ODR odr = odr_createmem(ODR_ENCODE);
+
+    {
+        Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
+                                        "1.2");
+        
+        YAZ_CHECK(compare_solr_req(
+                      odr, sr, 0,
+                      "GET Default/select? HTTP/1.1\r\n"
+                      "User-Agent: YAZ/" YAZ_VERSION "\r\n"
+                      "Host: localhost\r\n"
+                      "Content-Type: text/xml\r\n\r\n"));
+    }
+
+    {
+        Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
+                                        "1.2");
+        YAZ_CHECK(compare_solr_req(
+                      odr, sr, "utf-8",
+                      "GET Default/select? HTTP/1.1\r\n"
+                      "User-Agent: YAZ/" YAZ_VERSION "\r\n"
+                      "Host: localhost\r\n"
+                      "Content-Type: text/xml; charset=utf-8\r\n\r\n"));
+    }
+
+    {
+        Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
+                                        "1.2");
+        
+        sr->u.request->query_type = Z_SRW_query_type_cql;
+        sr->u.request->query.cql = "title:solr";
+        sr->u.request->startRecord = odr_intdup(odr, 3);
+        sr->u.request->maximumRecords = odr_intdup(odr, 10);
+
+        YAZ_CHECK(compare_solr_req(
+                      odr, sr, 0,
+                      "GET Default/select?q=title%3Asolr&start=2&rows=10"
+                      " HTTP/1.1\r\n"
+                      "User-Agent: YAZ/" YAZ_VERSION "\r\n"
+                      "Host: localhost\r\n"
+                      "Content-Type: text/xml\r\n\r\n"));
+    }
+
+    {
+        Z_SRW_PDU *sr = yaz_srw_get_pdu(odr, Z_SRW_searchRetrieve_request,
+                                        "1.2");
+        
+        sr->u.request->query_type = Z_SRW_query_type_cql;
+        sr->u.request->query.cql = "title:solr";
+        sr->u.request->startRecord = odr_intdup(odr, 3);
+        sr->u.request->maximumRecords = odr_intdup(odr, 10);
+        sr->u.request->facetList = yaz_pqf_parse_facet_list(
+            odr, "@attr 1=date @attr 2=0, @attr 1=title @attr 3=17");
+
+        YAZ_CHECK(compare_solr_req(
+                      odr, sr, 0,
+                      "GET Default/select?q=title%3Asolr&start=2&rows=10"
+                      "&facet=true&facet.mincount=1&facet.field=date"
+                      "&facet.field=title_exact&f.title_exact.facet.limit=17"
+                      " HTTP/1.1\r\n"
+                      "User-Agent: YAZ/" YAZ_VERSION "\r\n"
+                      "Host: localhost\r\n"
+                      "Content-Type: text/xml\r\n\r\n"));
+    }
+
+    odr_destroy(odr);
+/* YAZ_HAVE_XML2 */
+#endif
+}
+
+int main(int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+#if YAZ_HAVE_XML2
+    LIBXML_TEST_VERSION;
+#endif
+    tst();
+    YAZ_CHECK_TERM;
+}
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+