Rename method

25 files changed, 41 insertions, 41 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Location.java b/container-search/src/main/java/com/yahoo/prelude/Location.java
index 10d63051cbe..547541ecfcd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Location.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Location.java
@@ -17,7 +17,7 @@ public class Location {
     // 1 or 2
     private int dimensions = 0;
 
-    // line elements and rectangles
+    // line labels and rectangles
     private int x1 = 0;
     private int y1 = 0;
     private int x2 = 1;
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
index 638376c791d..7a4014b1912 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
@@ -245,7 +245,7 @@ public class HitField {
         return tokenizedContent;
     }
     /**
-     * Return an iterator for the tokens, delimiters and markup elements
+     * Return an iterator for the tokens, delimiters and markup labels
      * of the field.
      */
     public ListIterator<FieldPart> listIterator() {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/package-info.java b/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
index 95dbd62849f..4fa5a4e6750 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/package-info.java
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
- * The query model representing a boolean combination of selection criterions, where elements may be
+ * The query model representing a boolean combination of selection criterions, where labels may be
  * simple criterions, nested boolean operators, or annotated pieces of natural language text.
  */
 @ExportPackage
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
index cb540a1f982..0c9c1c6b208 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
@@ -68,7 +68,7 @@ public class AllParser extends SimpleParser {
         return simplifyUnnecessaryComposites(topLevel);
     }
 
-    // Simplify if there are unnecessary composites due to single elements
+    // Simplify if there are unnecessary composites due to single labels
     protected final Item simplifyUnnecessaryComposites(Item item) {
         if (item == null) return null;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
index bf673083596..7783a42fbce 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java
@@ -25,7 +25,7 @@ public class WebParser extends AllParser {
     }
 
     protected @Override Item parseItemsBody() {
-        // Algorithm: Collect positive, negative, and'ed and or'ed elements, then combine.
+        // Algorithm: Collect positive, negative, and'ed and or'ed labels, then combine.
         AndItem and=null;
         OrItem or=null;
         NotItem not=null; // Store negatives here as we go
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
index 86fdee2bad9..f4932d8ae2f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java
@@ -526,7 +526,7 @@ public class PhraseMatcher {
 
             public Item next() {
                 if (!hasNext())
-                    throw new NoSuchElementException(this + " has no more elements");
+                    throw new NoSuchElementException(this + " has no more labels");
 
                 currentIndex++;
                 if ((phrase.matched instanceof MatchedWord))
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
index 0b0ae0918aa..da42d398e78 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
@@ -120,7 +120,7 @@ public class Evaluation {
     }
 
 
-    /** Returns the current item, or null if there is no more elements */
+    /** Returns the current item, or null if there is no more labels */
     public FlattenedItem currentItem() {
         if ( (currentIndex>=flattenedItems.size()) || (currentIndex<0)) return null; //PGA
         return flattenedItems.get(currentIndex);
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
index ba6bf821197..95da7e8e21d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java
@@ -120,7 +120,7 @@ public class RuleEvaluation {
 
     /**
      * Returns the current term item to look at,
-     * or null if there are no more elements
+     * or null if there are no more labels
      */
     public FlattenedItem currentItem() {
         if (position>=items.size()) return null;
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
index f54d92cdbf5..92dd0c67cbe 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
@@ -2,7 +2,7 @@
 package com.yahoo.search.grouping.request;
 
 /**
- * This class represents an count-aggregator in a {@link GroupingExpression}. It evaluates to the number of elements
+ * This class represents an count-aggregator in a {@link GroupingExpression}. It evaluates to the number of labels
  * there are in the input.
  *
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
index d445007a039..7a30883e7cf 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
 
 /**
  * This class represents a size-function in a {@link GroupingExpression}. It evaluates to a number that equals the
- * number of elements in the result of the argument (e.g. the number of elements in an array).
+ * number of labels in the result of the argument (e.g. the number of labels in an array).
  *
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  */
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
index 8c421feae47..21d9d354fc1 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
@@ -13,7 +13,7 @@ import java.util.Set;
 
 /**
  * A page template represents a particular way to organize a return page. It is a recursive structure of
- * page template elements.
+ * page template labels.
  *
  * @author bratseth
  */
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
index 451efb851d5..48c681cf093 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
@@ -29,7 +29,7 @@ public class PageTemplateXMLReader {
     /** The registry being constructed */
     private PageTemplateRegistry registry;
 
-    /** XML elements by page id - available after phase 1. Needed for includes. */
+    /** XML labels by page id - available after phase 1. Needed for includes. */
     private Map<ComponentId, Element> pageElementsByPageId=new LinkedHashMap<>();
 
     /**
@@ -167,7 +167,7 @@ public class PageTemplateXMLReader {
         page.freeze();
     }
 
-    /** Fills a section with attributes and sub-elements from a "section" or "page" element */
+    /** Fills a section with attributes and sub-labels from a "section" or "page" element */
     private Section readSection(Element sectionElement,Section section) {
         section.setLayout(Layout.fromString(sectionElement.getAttribute("layout")));
         section.setRegion(sectionElement.getAttribute("region"));
@@ -179,7 +179,7 @@ public class PageTemplateXMLReader {
         return section;
     }
 
-    /** Returns all page elements found under the given node */
+    /** Returns all page labels found under the given node */
     private List<PageElement> readPageElements(Element parent) {
         List<PageElement> pageElements=new ArrayList<>();
         for (Element child : XML.getChildren(parent)) {
@@ -196,7 +196,7 @@ public class PageTemplateXMLReader {
             pageElements.add(pageElement);
     }
 
-    /** Reads the direct descendant elements of an include */
+    /** Reads the direct descendant labels of an include */
     private List<PageElement> readInclude(Element element) {
         PageTemplate included=registry.getComponent(element.getAttribute("idref"));
         if (included==null)
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
index 6415dad37ec..5827dd9a402 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
@@ -44,7 +44,7 @@ public abstract class Resolver extends AbstractComponent {
      * on each choice found in that temnplate. This provides a simple API to resolvers which make each choice
      * independently.
      *
-     * @param pageTemplate the choice of page templates to resolve - a choice containing singleton lists of PageTemplate elements
+     * @param pageTemplate the choice of page templates to resolve - a choice containing singleton lists of PageTemplate labels
      * @param query the query, from which information useful for correct resolution can be found
      * @param result the result, from which further information useful for correct resolution can be found
      * @return the resolution of the choices contained in the given page template
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
index 3e956d510e7..6147bbabe6a 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
@@ -4,7 +4,7 @@ package com.yahoo.search.pagetemplates.model;
 import java.util.*;
 
 /**
- * A choice between some alternative lists of page elements.
+ * A choice between some alternative lists of page labels.
  *
  * @author bratseth
  */
@@ -46,7 +46,7 @@ public final class Choice extends AbstractChoice {
 
     /**
      * Returns the alternatives of this as a live reference to the alternatives of this.
-     * The list and elements may be modified unless this is frozen. This is never null.
+     * The list and labels may be modified unless this is frozen. This is never null.
      */
     public List<List<PageElement>> alternatives() { return alternatives; }
 
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
index 67f67cb8538..c87538ce863 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
@@ -24,10 +24,10 @@ public class Section extends FreezableClass implements PageElement {
 
     private String region;
 
-    /** The elements of this - sources, subsections etc. and/or choices of the same */
+    /** The labels of this - sources, subsections etc. and/or choices of the same */
     private List<PageElement> elements=new ArrayList<>();
 
-    /** Filtered versions of elements pre-calculated at freeze time */
+    /** Filtered versions of labels pre-calculated at freeze time */
     private List<PageElement> sections, sources, renderers;
 
     private int max=-1;
@@ -80,25 +80,25 @@ public class Section extends FreezableClass implements PageElement {
     }
 
     /**
-     * Returns the elements of this - sources, subsections and presentations and/or choices of these,
+     * Returns the labels of this - sources, subsections and presentations and/or choices of these,
      * as a live reference which can be modified to change the content of this (unless this is frozen).
      * <p>
-     * All elements are kept in a single list to allow multiple elements of each type to be nested within separate
-     * choices, and to maintain the internal order of elements of various types, which is sometimes significant.
-     * To extract a certain kind of elements (say, sources), the element list must be traversed to collect
-     * all source elements as well as all choices of sources.
+     * All labels are kept in a single list to allow multiple labels of each type to be nested within separate
+     * choices, and to maintain the internal order of labels of various types, which is sometimes significant.
+     * To extract a certain kind of labels (say, sources), the element list must be traversed to collect
+     * all source labels as well as all choices of sources.
      * <p>
      * This list is never null but may be empty.
      */
     public List<PageElement> elements() { return elements; }
 
     /**
-     * Convenience method which returns the elements <b>and choices</b> of the given type in elements as a
-     * read-only list. Not that as this returns both concrete elements and choices betwen them,
+     * Convenience method which returns the labels <b>and choices</b> of the given type in labels as a
+     * read-only list. Not that as this returns both concrete labels and choices betwen them,
      * the list element cannot be case to the given class - this must be used in conjunction
      * with a resolve which contains the resolution to the choices.
      *
-     * @param pageTemplateModelElementClass type to returns elements and choices of, a subtype of PageElement
+     * @param pageTemplateModelElementClass type to returns labels and choices of, a subtype of PageElement
      */
     public List<PageElement> elements(@SuppressWarnings("rawtypes") Class pageTemplateModelElementClass) {
         if (isFrozen()) { // Use precalculated lists
@@ -133,7 +133,7 @@ public class Section extends FreezableClass implements PageElement {
         this.order=order;
     }
 
-    /** Returns max number of (immediate) elements/sections permissible within this, -1 means unrestricted. Default: -1. */
+    /** Returns max number of (immediate) labels/sections permissible within this, -1 means unrestricted. Default: -1. */
     public int getMax() { return max; }
 
     public void setMax(int max) {
@@ -141,7 +141,7 @@ public class Section extends FreezableClass implements PageElement {
         this.max=max;
     }
 
-    /** Returns min number of (immediate) elements/sections desired within this, -1 means unrestricted. Default: -1. */
+    /** Returns min number of (immediate) labels/sections desired within this, -1 means unrestricted. Default: -1. */
     public int getMin() { return min; }
 
     public void setMin(int min) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
index 78fa24973d4..f7829e4cc7e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
@@ -87,7 +87,7 @@ public class DimensionBinding {
     /**
      * Returns the values for the dimensions of this. This value is undefined if this isEmpty()
      * This array is always of the same length as the
-     * length of the dimension list - missing elements are represented as nulls.
+     * length of the dimension list - missing labels are represented as nulls.
      * This is never null but may be empty.
      */
     public DimensionValues getValues() { return values; }
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
index d0d18d7ba85..e58f6edb8a0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * A string which contains one or more elements of the form %{name},
+ * A string which contains one or more labels of the form %{name},
  * where these occurrences are to be replaced by a query profile lookup on name.
  * <p>
  * This objects does the analysis on creation and provides a (reasonably) fast method of
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
index 808d4f43682..74875a459b7 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
@@ -79,7 +79,7 @@ public class ItemInitializer {
         TypeCheck.ensureInstanceOf(connectivity, List.class);
         List<?> connectivityList = (List<?>) connectivity;
         if (connectivityList.size() != 2) {
-            throw new IllegalArgumentException("Expected two elements for connectivity, got " + connectivityList.size());
+            throw new IllegalArgumentException("Expected two labels for connectivity, got " + connectivityList.size());
         }
 
         Object id = connectivityList.get(0);
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index 7df859c6070..c2c0074a8ba 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -65,7 +65,7 @@ import com.yahoo.yolean.trace.TraceVisitor;
  *
  * @author Steinar Knutsen
  */
-// NOTE: The JSON format is a public API. If new elements are added be sure to update the reference doc.
+// NOTE: The JSON format is a public API. If new labels are added be sure to update the reference doc.
 public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
 
     private static final CompoundName DEBUG_RENDERING_KEY = new CompoundName("renderer.json.debug");
diff --git a/container-search/src/main/java/com/yahoo/search/result/Relevance.java b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
index df79b64585e..147955f1312 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Relevance.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
@@ -32,7 +32,7 @@ public class Relevance implements Comparable<Relevance> {
     /**
      * Set score value to this value. This should ideally be a
      * normalized value between 0 and 1, but that is not enforced.
-     * NaN is also a legal value, for elements where it makes no sense to assign a particular value.
+     * NaN is also a legal value, for labels where it makes no sense to assign a particular value.
      */
     public void setScore(double score) { this.score = score; }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java b/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
index 86e2cbf01ff..e65ec2690d7 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/JavaListTypeChecker.java
@@ -20,8 +20,8 @@ class JavaListTypeChecker extends OperatorTypeChecker {
         Preconditions.checkArgument(argument instanceof List, "Argument %s of %s must be a List<%s>", idx, parent, elementType.getName(), argument.getClass().getName());
         List<?> lst = (List<?>) argument;
         for (Object elt : lst) {
-            Preconditions.checkNotNull(elt, "Argument %s of %s List elements may not be null", idx, parent);
-            Preconditions.checkArgument(elementType.isInstance(elt), "Argument %s of %s List elements must be %s (is %s)", idx, parent, elementType.getName(), elt.getClass().getName());
+            Preconditions.checkNotNull(elt, "Argument %s of %s List labels may not be null", idx, parent);
+            Preconditions.checkArgument(elementType.isInstance(elt), "Argument %s of %s List labels must be %s (is %s)", idx, parent, elementType.getName(), elt.getClass().getName());
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
index d1b65ee258b..6ac3b963e7e 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
@@ -79,7 +79,7 @@ final class OperatorNode<T extends Operator> {
     }
 
     public Object[] getArguments() {
-        // this is only called by a test right now, but ImmutableList.copyOf won't tolerate null elements
+        // this is only called by a test right now, but ImmutableList.copyOf won't tolerate null labels
         if (args.length == 0) {
             return args;
         }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
index 6c061cdce47..465bc5158d2 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
@@ -209,7 +209,7 @@ public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
         Set<String> sourceNames=new HashSet<>();
         for (Source source : page.getSources())
             sourceNames.add(source.getName());
-        assertEquals("Expected " + expectedSourceNames.length + " elements in " + sourceNames,
+        assertEquals("Expected " + expectedSourceNames.length + " labels in " + sourceNames,
                      expectedSourceNames.length,sourceNames.size());
         for (String expectedSourceName : expectedSourceNames)
             assertTrue("Sources did not include '" + expectedSourceName+ "'",sourceNames.contains(expectedSourceName));
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
index cca4a2833d0..cd8fddf057f 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java
@@ -71,7 +71,7 @@ public class QueryProfileListPropertiesMicroBenchmark {
             Map<String,Object> properties = query.properties().listProperties(propertyPrefix);
             int expectedSize = 10 + (propertyPrefix.isEmpty() ? 3 : 0); // 3 extra properties on the root
             if ( properties.size() != expectedSize )
-                throw new RuntimeException("Expected a map of 10 elements, but got " + expectedSize + ": \n" + toString(properties));
+                throw new RuntimeException("Expected a map of 10 labels, but got " + expectedSize + ": \n" + toString(properties));
         }
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
index 23316a58877..e3b8e88225d 100644
--- a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java
@@ -52,7 +52,7 @@ public class CacheControlSearcherTestCase extends TestCase {
      */
     private void assertCacheHeaders(String[] values, List<String> cacheheaders) {
         assertNotNull("No headers to test for (was null)", values);
-        assertTrue("No headers to test for (no elements in array)", values.length > 0);
+        assertTrue("No headers to test for (no labels in array)", values.length > 0);
         assertNotNull("No cache headers set in response", cacheheaders);
         assertEquals(values.length, cacheheaders.size());
         for (String header : values) {