diff --git a/test/server.cpp b/test/server.cpp index ee3421e6a..5e1d52e91 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -616,6 +616,16 @@ std::string maskVariableOPDSFeedData(std::string s) return s; } +#define OPDS_FEED_TAG \ + "\n" + +#define CATALOG_LINK_TAGS \ + " \n" \ + " \n" + #define CHARLES_RAY_CATALOG_ENTRY \ " \n" \ " urn:uuid:charlesray\n" \ @@ -667,12 +677,11 @@ TEST_F(LibraryServerTest, catalog_root_xml) const auto r = zfs1_->GET("/catalog/root.xml"); EXPECT_EQ(r->status, 200); EXPECT_EQ(maskVariableOPDSFeedData(r->body), - "\n" + OPDS_FEED_TAG " 12345678-90ab-cdef-1234-567890abcdef\n" " All zims\n" " YYYY-MM-DDThh:mm:ssZ\n" - " \n" - " \n" + CATALOG_LINK_TAGS CHARLES_RAY_CATALOG_ENTRY RAY_CHARLES_CATALOG_ENTRY "\n" @@ -702,15 +711,14 @@ TEST_F(LibraryServerTest, catalog_search_by_text) const auto r = zfs1_->GET("/catalog/search?q=ray%20charles"); EXPECT_EQ(r->status, 200); EXPECT_EQ(maskVariableOPDSFeedData(r->body), - "\n" + OPDS_FEED_TAG " 12345678-90ab-cdef-1234-567890abcdef\n" " Search result for ray charles\n" " YYYY-MM-DDThh:mm:ssZ\n" " 1\n" " 0\n" " 1\n" - " \n" - " \n" + CATALOG_LINK_TAGS RAY_CHARLES_CATALOG_ENTRY "\n" ); @@ -721,15 +729,14 @@ TEST_F(LibraryServerTest, catalog_search_by_tag) const auto r = zfs1_->GET("/catalog/search?tag=_category:jazz"); EXPECT_EQ(r->status, 200); EXPECT_EQ(maskVariableOPDSFeedData(r->body), - "\n" + OPDS_FEED_TAG " 12345678-90ab-cdef-1234-567890abcdef\n" " Search result for <Empty query>\n" " YYYY-MM-DDThh:mm:ssZ\n" " 1\n" " 0\n" " 1\n" - " \n" - " \n" + CATALOG_LINK_TAGS CHARLES_RAY_CATALOG_ENTRY "\n" );