X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=test%2Ftest_solr.c;h=e075ee1c29f5383d0b69efadb16481ebdb2d0b17;hb=808b7f27ef276184df827786afa01f8f313aa4f6;hp=a2bfc06ef9550500c9d7dc2bb3a77da291e07dc2;hpb=1f966d166ff89011da3e8ca2fa143f017921ec57;p=yaz-moved-to-github.git
diff --git a/test/test_solr.c b/test/test_solr.c
index a2bfc06..e075ee1 100644
--- a/test/test_solr.c
+++ b/test/test_solr.c
@@ -153,6 +153,7 @@ int check_response(ODR o, const char *content, Z_SRW_searchRetrieveResponse **p)
odr_setbuf(o, http_response, strlen(http_response), 0);
+ *p = 0;
r = z_GDU(o, &gdu, 0, 0);
if (!r || gdu->which != Z_GDU_HTTP_Response)
return 0;
@@ -181,14 +182,16 @@ void tst_decoding(void)
"0"
"\n"
"\n", &response));
- YAZ_CHECK_EQ(*response->numberOfRecords, 91);
- YAZ_CHECK_EQ(response->num_records, 0);
- YAZ_CHECK(response->records == 0);
- YAZ_CHECK_EQ(response->num_diagnostics, 0);
- YAZ_CHECK(response->diagnostics == 0);
- YAZ_CHECK(response->nextRecordPosition == 0);
- YAZ_CHECK(response->facetList == 0);
-
+ if (response)
+ {
+ YAZ_CHECK_EQ(*response->numberOfRecords, 91);
+ YAZ_CHECK_EQ(response->num_records, 0);
+ YAZ_CHECK(response->records == 0);
+ YAZ_CHECK_EQ(response->num_diagnostics, 0);
+ YAZ_CHECK(response->diagnostics == 0);
+ YAZ_CHECK(response->nextRecordPosition == 0);
+ YAZ_CHECK(response->facetList == 0);
+ }
odr_reset(odr);
YAZ_CHECK(
@@ -237,12 +240,15 @@ void tst_decoding(void)
"44"
"3"
"", &response));
+ if (response)
+ {
#if HAVE_LONG_LONG
- YAZ_CHECK(*response->numberOfRecords == 91000000000LL);
+ YAZ_CHECK(*response->numberOfRecords == 91000000000LL);
#endif
- YAZ_CHECK_EQ(response->num_records, 1);
- YAZ_CHECK(response->records);
- if (response->records)
+ YAZ_CHECK_EQ(response->num_records, 1);
+ YAZ_CHECK(response->records);
+ }
+ if (response && response->records)
{
const char *doc =
"Alenius, Hans,"
@@ -278,12 +284,14 @@ void tst_decoding(void)
YAZ_CHECK(record->recordData_len == strlen(doc) &&
!memcmp(record->recordData_buf, doc, record->recordData_len));
}
- YAZ_CHECK_EQ(response->num_diagnostics, 0);
- YAZ_CHECK(response->diagnostics == 0);
- YAZ_CHECK(response->nextRecordPosition == 0);
-
- YAZ_CHECK(response->facetList);
- if (response->facetList)
+ if (response)
+ {
+ YAZ_CHECK_EQ(response->num_diagnostics, 0);
+ YAZ_CHECK(response->diagnostics == 0);
+ YAZ_CHECK(response->nextRecordPosition == 0);
+ YAZ_CHECK(response->facetList);
+ }
+ if (response && response->facetList)
{
Z_FacetList *facetList = response->facetList;
@@ -376,7 +384,7 @@ int main(int argc, char **argv)
#if YAZ_HAVE_XML2
LIBXML_TEST_VERSION;
#endif
- tst_encoding();
+// tst_encoding();
tst_decoding();
tst_yaz_700();
YAZ_CHECK_TERM;