Merged searchapi (5.2.1) to 5.2.N (5.2.1)

129786 gjames: SEARCH-113: Adding client object for SearchEntry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/tests/client/data/Node.java

@@ -83,6 +83,8 @@ public class Node
     protected List<AssocChild> secondaryChildren;
     protected List<AssocTarget> targets;
 
+    protected SearchResultEntry search;
+
     public Node()
     {
     }
@@ -322,6 +324,16 @@ public class Node
         this.association = association;
     }
 
+    public SearchResultEntry getSearch()
+    {
+        return search;
+    }
+
+    public void setSearch(SearchResultEntry search)
+    {
+        this.search = search;
+    }
+
     public void expected(Object o)
     {
         Node other = (Node) o;
@@ -427,6 +439,15 @@ public class Node
             assertNull(other.getContent());
         }
 
+        if (search != null)
+        {
+            search.expected(other.getSearch());
+        }
+        else
+        {
+            assertNull(other.getSearch());
+        }
+
         if (allowableOperations != null)
         {
             assertNotNull(other.getAllowableOperations());

source/test-java/org/alfresco/rest/api/tests/client/data/SearchResultEntry.java

@@ -0,0 +1,60 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * POJO class representing the extra information that comes back from Search.
+ **/
+public class SearchResultEntry
+{
+    Float score;
+
+    public SearchResultEntry()
+    {
+    }
+
+    public void setScore(Float score)
+    {
+        this.score = score;
+    }
+
+    public Float getScore()
+    {
+        return score;
+    }
+
+    //In future highlighting.
+
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof SearchResultEntry);
+
+        SearchResultEntry other = (SearchResultEntry) o;
+        AssertUtil.assertEquals("score", score, other.getScore());
+    }
+}