Use schema::DataType

4 files changed, 140 insertions, 187 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
index 6e6df7cc5e3..2c8301e259f 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
@@ -485,8 +485,8 @@ TEST_F("require that history can be wiped", Fixture)
     f.addAttribute("a3");
     f._m.flushAll(10);
     Schema hs;
-    hs.addAttributeField(Schema::AttributeField("a1", Schema::INT32));
-    hs.addAttributeField(Schema::AttributeField("a3", Schema::INT32));
+    hs.addAttributeField(Schema::AttributeField("a1", schema::INT32));
+    hs.addAttributeField(Schema::AttributeField("a3", schema::INT32));
     f._m.wipeHistory(hs);
     FastOS_StatInfo si;
     EXPECT_TRUE(!FastOS_File::Stat(vespalib::string(test_dir + "/a1").c_str(), &si));
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index f00776444e6..3493ecb4e07 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -142,10 +142,10 @@ struct Fixture
 TEST_F("require that attribute adapter handles put", Fixture)
 {
     Schema s;
-    s.addAttributeField(Schema::AttributeField("a1", Schema::INT32, Schema::SINGLE));
-    s.addAttributeField(Schema::AttributeField("a2", Schema::INT32, Schema::ARRAY));
-    s.addAttributeField(Schema::AttributeField("a3", Schema::FLOAT, Schema::SINGLE));
-    s.addAttributeField(Schema::AttributeField("a4", Schema::STRING, Schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a1", schema::INT32, schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a2", schema::INT32, schema::ARRAY));
+    s.addAttributeField(Schema::AttributeField("a3", schema::FLOAT, schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a4", schema::STRING, schema::SINGLE));
 
     DocBuilder idb(s);
 
@@ -236,8 +236,7 @@ TEST_F("require that attribute adapter handles put", Fixture)
 TEST_F("require that attribute adapter handles predicate put", Fixture)
 {
     Schema s;
-    s.addAttributeField(
-            Schema::AttributeField("a1", Schema::BOOLEANTREE, Schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a1", schema::BOOLEANTREE, schema::SINGLE));
     DocBuilder idb(s);
 
     proton::AttributeManager & am = *f._m;
@@ -285,8 +284,8 @@ TEST_F("require that attribute adapter handles remove", Fixture)
     AttributeVector::SP a1 = f.addAttribute("a1");
     AttributeVector::SP a2 = f.addAttribute("a2");
     Schema s;
-    s.addAttributeField(Schema::AttributeField("a1", Schema::INT32, Schema::SINGLE));
-    s.addAttributeField(Schema::AttributeField("a2", Schema::INT32, Schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a1", schema::INT32, schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a2", schema::INT32, schema::SINGLE));
 
     DocBuilder idb(s);
 
@@ -323,7 +322,7 @@ TEST_F("require that visibilitydelay is honoured", Fixture)
                                              AVConfig(AVBasicType::STRING),
                                              createSerialNum);
     Schema s;
-    s.addAttributeField(Schema::AttributeField("a1", Schema::STRING, Schema::SINGLE));
+    s.addAttributeField(Schema::AttributeField("a1", schema::STRING, schema::SINGLE));
     DocBuilder idb(s);
     EXPECT_EQUAL(1u, a1->getNumDocs());
     EXPECT_EQUAL(0u, a1->getStatus().getLastSyncToken());
@@ -373,7 +372,7 @@ TEST_F("require that attribute adapter handles predicate remove", Fixture)
                                              createSerialNum);
     Schema s;
     s.addAttributeField(
-            Schema::AttributeField("a1", Schema::BOOLEANTREE, Schema::SINGLE));
+            Schema::AttributeField("a1", schema::BOOLEANTREE, schema::SINGLE));
 
     DocBuilder idb(s);
     PredicateSlimeBuilder builder;
@@ -399,12 +398,8 @@ TEST_F("require that attribute adapter handles update", Fixture)
     fillAttribute(a2, 1, 20, 1);
 
     Schema schema;
-    schema.addAttributeField(Schema::AttributeField(
-                    "a1", Schema::INT32,
-                    Schema::SINGLE));
-    schema.addAttributeField(Schema::AttributeField(
-                    "a2", Schema::INT32,
-                    Schema::SINGLE));
+    schema.addAttributeField(Schema::AttributeField("a1", schema::INT32, schema::SINGLE));
+    schema.addAttributeField(Schema::AttributeField("a2", schema::INT32, schema::SINGLE));
     DocBuilder idb(schema);
     const document::DocumentType &dt(idb.getDocumentType());
     DocumentUpdate upd(dt, DocumentId("doc::1"));
@@ -441,9 +436,7 @@ TEST_F("require that attribute adapter handles predicate update", Fixture)
                                              AVConfig(AVBasicType::PREDICATE),
                                              createSerialNum);
     Schema schema;
-    schema.addAttributeField(Schema::AttributeField(
-                    "a1", Schema::BOOLEANTREE,
-                    Schema::SINGLE));
+    schema.addAttributeField(Schema::AttributeField("a1", schema::BOOLEANTREE, schema::SINGLE));
 
     DocBuilder idb(schema);
     PredicateSlimeBuilder builder;
@@ -587,8 +580,7 @@ createTensorAttribute(Fixture &f) {
 Schema
 createTensorSchema() {
     Schema schema;
-    schema.addAttributeField(Schema::AttributeField("a1", Schema::TENSOR,
-                                               Schema::SINGLE));
+    schema.addAttributeField(Schema::AttributeField("a1", schema::TENSOR, schema::SINGLE));
     return schema;
 }
 
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index b0f64f4198f..9c490988e78 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -421,18 +421,18 @@ void
 Test::requireThatAdapterHandlesAllFieldTypes()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", Schema::INT8));
-    s.addSummaryField(Schema::SummaryField("b", Schema::INT16));
-    s.addSummaryField(Schema::SummaryField("c", Schema::INT32));
-    s.addSummaryField(Schema::SummaryField("d", Schema::INT64));
-    s.addSummaryField(Schema::SummaryField("e", Schema::FLOAT));
-    s.addSummaryField(Schema::SummaryField("f", Schema::DOUBLE));
-    s.addSummaryField(Schema::SummaryField("g", Schema::STRING));
-    s.addSummaryField(Schema::SummaryField("h", Schema::STRING));
-    s.addSummaryField(Schema::SummaryField("i", Schema::RAW));
-    s.addSummaryField(Schema::SummaryField("j", Schema::RAW));
-    s.addSummaryField(Schema::SummaryField("k", Schema::STRING));
-    s.addSummaryField(Schema::SummaryField("l", Schema::STRING));
+    s.addSummaryField(Schema::SummaryField("a", schema::INT8));
+    s.addSummaryField(Schema::SummaryField("b", schema::INT16));
+    s.addSummaryField(Schema::SummaryField("c", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("d", schema::INT64));
+    s.addSummaryField(Schema::SummaryField("e", schema::FLOAT));
+    s.addSummaryField(Schema::SummaryField("f", schema::DOUBLE));
+    s.addSummaryField(Schema::SummaryField("g", schema::STRING));
+    s.addSummaryField(Schema::SummaryField("h", schema::STRING));
+    s.addSummaryField(Schema::SummaryField("i", schema::RAW));
+    s.addSummaryField(Schema::SummaryField("j", schema::RAW));
+    s.addSummaryField(Schema::SummaryField("k", schema::STRING));
+    s.addSummaryField(Schema::SummaryField("l", schema::STRING));
 
     BuildContext bc(s);
     bc._bld.startDocument("doc::0");
@@ -481,7 +481,7 @@ void
 Test::requireThatAdapterHandlesMultipleDocuments()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", Schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
 
     BuildContext bc(s);
     bc._bld.startDocument("doc::0").
@@ -523,8 +523,7 @@ void
 Test::requireThatAdapterHandlesDocumentIdField()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("documentid",
-                              Schema::STRING));
+    s.addSummaryField(Schema::SummaryField("documentid", schema::STRING));
     BuildContext bc(s);
     bc._bld.startDocument("doc::0").
         startSummaryField("documentid").
@@ -551,7 +550,7 @@ void
 Test::requireThatDocsumRequestIsProcessed()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", Schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -609,8 +608,8 @@ void
 Test::requireThatRewritersAreUsed()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("aa", Schema::INT32));
-    s.addSummaryField(Schema::SummaryField("ab", Schema::INT32));
+    s.addSummaryField(Schema::SummaryField("aa", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("ab", schema::INT32));
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -649,25 +648,16 @@ void
 Test::requireThatAttributesAreUsed()
 {
     Schema s;
-    addField(s, "ba",
-             Schema::INT32, Schema::SINGLE);
-    addField(s, "bb",
-             Schema::FLOAT, Schema::SINGLE);
-    addField(s, "bc",
-             Schema::STRING, Schema::SINGLE);
-    addField(s, "bd",
-             Schema::INT32, Schema::ARRAY);
-    addField(s, "be",
-             Schema::FLOAT, Schema::ARRAY);
-    addField(s, "bf",
-             Schema::STRING, Schema::ARRAY);
-    addField(s, "bg",
-             Schema::INT32, Schema::WEIGHTEDSET);
-    addField(s, "bh",
-             Schema::FLOAT, Schema::WEIGHTEDSET);
-    addField(s, "bi",
-             Schema::STRING, Schema::WEIGHTEDSET);
-    addField(s, "bj", Schema::TENSOR, Schema::SINGLE);
+    addField(s, "ba", schema::INT32, schema::SINGLE);
+    addField(s, "bb", schema::FLOAT, schema::SINGLE);
+    addField(s, "bc", schema::STRING, schema::SINGLE);
+    addField(s, "bd", schema::INT32, schema::ARRAY);
+    addField(s, "be", schema::FLOAT, schema::ARRAY);
+    addField(s, "bf", schema::STRING, schema::ARRAY);
+    addField(s, "bg", schema::INT32, schema::WEIGHTEDSET);
+    addField(s, "bh", schema::FLOAT, schema::WEIGHTEDSET);
+    addField(s, "bi", schema::STRING, schema::WEIGHTEDSET);
+    addField(s, "bj", schema::TENSOR, schema::SINGLE);
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -819,9 +809,7 @@ void
 Test::requireThatSummaryAdapterHandlesPutAndRemove()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("f1",
-                              Schema::STRING,
-                              Schema::SINGLE));
+    s.addSummaryField(Schema::SummaryField("f1", schema::STRING, schema::SINGLE));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::1").
@@ -855,18 +843,10 @@ void
 Test::requireThatAnnotationsAreUsed()
 {
     Schema s;
-    s.addIndexField(Schema::IndexField("g",
-                                       Schema::STRING,
-                                       Schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("g",
-                              Schema::STRING,
-                              Schema::SINGLE));
-    s.addIndexField(Schema::IndexField("dynamicstring",
-                                       Schema::STRING,
-                                       Schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("dynamicstring",
-                              Schema::STRING,
-                              Schema::SINGLE));
+    s.addIndexField(Schema::IndexField("g", schema::STRING, schema::SINGLE));
+    s.addSummaryField(Schema::SummaryField("g", schema::STRING, schema::SINGLE));
+    s.addIndexField(Schema::IndexField("dynamicstring", schema::STRING, schema::SINGLE));
+    s.addSummaryField(Schema::SummaryField("dynamicstring", schema::STRING, schema::SINGLE));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::0").
@@ -916,24 +896,12 @@ void
 Test::requireThatUrisAreUsed()
 {
     Schema s;
-    s.addUriIndexFields(Schema::IndexField("urisingle",
-                                Schema::STRING,
-                                Schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("urisingle",
-                              Schema::STRING,
-                              Schema::SINGLE));
-    s.addUriIndexFields(Schema::IndexField("uriarray",
-                                Schema::STRING,
-                                Schema::ARRAY));
-    s.addSummaryField(Schema::SummaryField("uriarray",
-                              Schema::STRING,
-                              Schema::ARRAY));
-    s.addUriIndexFields(Schema::IndexField("uriwset",
-                                Schema::STRING,
-                                Schema::WEIGHTEDSET));
-    s.addSummaryField(Schema::SummaryField("uriwset",
-                              Schema::STRING,
-                              Schema::WEIGHTEDSET));
+    s.addUriIndexFields(Schema::IndexField("urisingle", schema::STRING, schema::SINGLE));
+    s.addSummaryField(Schema::SummaryField("urisingle", schema::STRING, schema::SINGLE));
+    s.addUriIndexFields(Schema::IndexField("uriarray", schema::STRING, schema::ARRAY));
+    s.addSummaryField(Schema::SummaryField("uriarray", schema::STRING, schema::ARRAY));
+    s.addUriIndexFields(Schema::IndexField("uriwset", schema::STRING, schema::WEIGHTEDSET));
+    s.addSummaryField(Schema::SummaryField("uriwset", schema::STRING, schema::WEIGHTEDSET));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::0").
@@ -1153,14 +1121,9 @@ void
 Test::requireThatRawFieldsWorks()
 {
     Schema s;
-    s.addSummaryField(Schema::AttributeField("i",
-                                Schema::RAW));
-    s.addSummaryField(Schema::AttributeField("araw",
-                                Schema::RAW,
-                                Schema::ARRAY));
-    s.addSummaryField(Schema::AttributeField("wraw",
-                              Schema::RAW,
-                              Schema::WEIGHTEDSET));
+    s.addSummaryField(Schema::AttributeField("i", schema::RAW));
+    s.addSummaryField(Schema::AttributeField("araw", schema::RAW, schema::ARRAY));
+    s.addSummaryField(Schema::AttributeField("wraw", schema::RAW, schema::WEIGHTEDSET));
 
     std::vector<char> binaryBlob;
     binaryBlob.push_back('\0');
@@ -1238,7 +1201,7 @@ void
 Test::requireThatFieldCacheRepoCanReturnDefaultFieldCache()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", Schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
     BuildContext bc(s);
     FieldCacheRepo::UP repo = bc.createFieldCacheRepo(getResultConfig());
     FieldCache::CSP cache = repo->getFieldCache("");
diff --git a/searchcore/src/tests/proton/documentdb/configvalidator/configvalidator_test.cpp b/searchcore/src/tests/proton/documentdb/configvalidator/configvalidator_test.cpp
index 7957600195d..70045537894 100644
--- a/searchcore/src/tests/proton/documentdb/configvalidator/configvalidator_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configvalidator/configvalidator_test.cpp
@@ -1,7 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("configvalidator_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchcore/proton/server/configvalidator.h>
 
@@ -36,7 +34,7 @@ struct SchemaBuilder
     Schema _schema;
     SchemaBuilder() : _schema() {}
     SchemaBuilder &add(const vespalib::string &name, FType ftype,
-                       Schema::DataType dtype, Schema::CollectionType ctype = Schema::SINGLE) {
+                       schema::DataType dtype, schema::CollectionType ctype = schema::SINGLE) {
         switch (ftype) {
         case INDEX:
             _schema.addIndexField(IField(name, dtype, ctype));
@@ -61,15 +59,15 @@ create(FType ftype, Schema::DataType dtype, Schema::CollectionType ctype)
 }
 
 Schema
-created(FType ftype, Schema::DataType dtype)
+created(FType ftype, schema::DataType dtype)
 {
-    return create(ftype, dtype, Schema::SINGLE);
+    return create(ftype, dtype, schema::SINGLE);
 }
 
 Schema
-createc(FType ftype, Schema::CollectionType ctype)
+createc(FType ftype, schema::CollectionType ctype)
 {
-    return create(ftype, Schema::STRING, ctype);
+    return create(ftype, schema::STRING, ctype);
 }
 
 ConfigValidator::ResultType
@@ -93,13 +91,13 @@ void
 requireThatChangedDataTypeIsDiscovered(FType ftype)
 {
     EXPECT_EQUAL(DTC,
-                 checkSchema(created(ftype, Schema::INT32),
-                         created(ftype, Schema::STRING),
+                 checkSchema(created(ftype, schema::INT32),
+                         created(ftype, schema::STRING),
                          Schema()));
     EXPECT_EQUAL(DTC,
-                 checkSchema(created(ftype, Schema::INT32),
+                 checkSchema(created(ftype, schema::INT32),
                          Schema(),
-                         created(ftype, Schema::STRING)));
+                         created(ftype, schema::STRING)));
 }
 
 TEST("require that changed data type is discovered")
@@ -113,13 +111,13 @@ void
 requireThatChangedCollectionTypeIsDiscovered(FType ftype)
 {
     EXPECT_EQUAL(CTC,
-                 checkSchema(createc(ftype, Schema::ARRAY),
-                         createc(ftype, Schema::SINGLE),
+                 checkSchema(createc(ftype, schema::ARRAY),
+                         createc(ftype, schema::SINGLE),
                          Schema()));
     EXPECT_EQUAL(CTC,
-                 checkSchema(createc(ftype, Schema::ARRAY),
+                 checkSchema(createc(ftype, schema::ARRAY),
                          Schema(),
-                         createc(ftype, Schema::SINGLE)));
+                         createc(ftype, schema::SINGLE)));
 }
 
 TEST("require that changed collection type is discovered")
@@ -131,15 +129,15 @@ TEST("require that changed collection type is discovered")
 
 TEST("require that changed index aspect is discovered")
 {
-    Schema s1 = created(SUMMARY, Schema::STRING);
-    s1.addIndexField(IField("f1", Schema::STRING));
-    Schema s2 = created(SUMMARY, Schema::STRING);
-    Schema s2h = created(INDEX, Schema::STRING);
-
-    Schema s3 = created(ATTRIBUTE, Schema::STRING);
-    s3.addIndexField(IField("f1", Schema::STRING));
-    Schema s4 = created(ATTRIBUTE, Schema::STRING);
-    Schema s4h = created(INDEX, Schema::STRING);
+    Schema s1 = created(SUMMARY, schema::STRING);
+    s1.addIndexField(IField("f1", schema::STRING));
+    Schema s2 = created(SUMMARY, schema::STRING);
+    Schema s2h = created(INDEX, schema::STRING);
+
+    Schema s3 = created(ATTRIBUTE, schema::STRING);
+    s3.addIndexField(IField("f1", schema::STRING));
+    Schema s4 = created(ATTRIBUTE, schema::STRING);
+    Schema s4h = created(INDEX, schema::STRING);
     { // remove as index field
         EXPECT_EQUAL(IAR, checkSchema(s2, s1, Schema()));
         EXPECT_EQUAL(IAR, checkSchema(s2, Schema(), s1));
@@ -163,21 +161,21 @@ TEST("require that changed index aspect is discovered")
 
 TEST("require that changed attribute aspect is discovered")
 {
-    Schema s1 = created(SUMMARY, Schema::STRING);
-    s1.addAttributeField(AField("f1", Schema::STRING));
-    Schema s2 = created(SUMMARY, Schema::STRING);
-    Schema s2h = created(ATTRIBUTE, Schema::STRING);
-
-    Schema s3 = created(INDEX, Schema::STRING);
-    s3.addAttributeField(AField("f1", Schema::STRING));
-    Schema s4 = created(INDEX, Schema::STRING);
-    Schema s4h = created(ATTRIBUTE, Schema::STRING);
-
-    Schema s5 = created(INDEX, Schema::STRING);
-    s5.addSummaryField(SField("f1", Schema::STRING));
-    s5.addAttributeField(AField("f1", Schema::STRING));
-    Schema s6 = created(INDEX, Schema::STRING);
-    s6.addSummaryField(SField("f1", Schema::STRING));
+    Schema s1 = created(SUMMARY, schema::STRING);
+    s1.addAttributeField(AField("f1", schema::STRING));
+    Schema s2 = created(SUMMARY, schema::STRING);
+    Schema s2h = created(ATTRIBUTE, schema::STRING);
+
+    Schema s3 = created(INDEX, schema::STRING);
+    s3.addAttributeField(AField("f1", schema::STRING));
+    Schema s4 = created(INDEX, schema::STRING);
+    Schema s4h = created(ATTRIBUTE, schema::STRING);
+
+    Schema s5 = created(INDEX, schema::STRING);
+    s5.addSummaryField(SField("f1", schema::STRING));
+    s5.addAttributeField(AField("f1", schema::STRING));
+    Schema s6 = created(INDEX, schema::STRING);
+    s6.addSummaryField(SField("f1", schema::STRING));
     { // remove as attribute field
         EXPECT_EQUAL(AAR, checkSchema(s2, s1, Schema()));
         EXPECT_EQUAL(AAR, checkSchema(s2, Schema(), s1));
@@ -203,15 +201,15 @@ TEST("require that changed attribute aspect is discovered")
 
 TEST("require that changed summary aspect is allowed")
 {
-    Schema s1 = created(INDEX, Schema::STRING);
-    s1.addSummaryField(SField("f1", Schema::STRING));
-    Schema s2 = created(INDEX, Schema::STRING);
-    Schema s2h = created(SUMMARY, Schema::STRING);
-
-    Schema s3 = created(ATTRIBUTE, Schema::STRING);
-    s3.addSummaryField(SField("f1", Schema::STRING));
-    Schema s4 = created(ATTRIBUTE, Schema::STRING);
-    Schema s4h = created(SUMMARY, Schema::STRING);
+    Schema s1 = created(INDEX, schema::STRING);
+    s1.addSummaryField(SField("f1", schema::STRING));
+    Schema s2 = created(INDEX, schema::STRING);
+    Schema s2h = created(SUMMARY, schema::STRING);
+
+    Schema s3 = created(ATTRIBUTE, schema::STRING);
+    s3.addSummaryField(SField("f1", schema::STRING));
+    Schema s4 = created(ATTRIBUTE, schema::STRING);
+    Schema s4h = created(SUMMARY, schema::STRING);
     { // remove as summary field
         EXPECT_EQUAL(OK, checkSchema(s2, s1, Schema()));
         EXPECT_EQUAL(IAA, checkSchema(s2, Schema(), s1));
@@ -231,16 +229,16 @@ TEST("require that changed summary aspect is allowed")
 TEST("require that fields can be added and removed")
 {
     Schema e;
-    Schema s1 = created(INDEX, Schema::STRING);
-    Schema s2 = created(ATTRIBUTE, Schema::STRING);
-    Schema s3 = created(SUMMARY, Schema::STRING);
-    Schema s4 = created(SUMMARY, Schema::STRING);
-    s4.addIndexField(IField("f1", Schema::STRING));
-    Schema s5 = created(SUMMARY, Schema::STRING);
-    s5.addAttributeField(AField("f1", Schema::STRING));
-    Schema s6 = created(SUMMARY, Schema::STRING);
-    s6.addIndexField(IField("f1", Schema::STRING));
-    s6.addAttributeField(AField("f1", Schema::STRING));
+    Schema s1 = created(INDEX, schema::STRING);
+    Schema s2 = created(ATTRIBUTE, schema::STRING);
+    Schema s3 = created(SUMMARY, schema::STRING);
+    Schema s4 = created(SUMMARY, schema::STRING);
+    s4.addIndexField(IField("f1", schema::STRING));
+    Schema s5 = created(SUMMARY, schema::STRING);
+    s5.addAttributeField(AField("f1", schema::STRING));
+    Schema s6 = created(SUMMARY, schema::STRING);
+    s6.addIndexField(IField("f1", schema::STRING));
+    s6.addAttributeField(AField("f1", schema::STRING));
     { // addition of field
         EXPECT_EQUAL(OK, checkSchema(s1, e, e));
         EXPECT_EQUAL(OK, checkSchema(s2, e, e));
@@ -267,53 +265,53 @@ TEST("require that fields can be added and removed")
 
 TEST("require that data type changed precedes collection type changed")
 {
-    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::INDEX, Schema::STRING).schema();
-    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, Schema::INT32).
-            add("f2", FType::INDEX, Schema::STRING, Schema::ARRAY).schema();
+    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f2", FType::INDEX, schema::STRING).schema();
+    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, schema::INT32).
+            add("f2", FType::INDEX, schema::STRING, schema::ARRAY).schema();
     EXPECT_EQUAL(DTC, checkSchema(news, olds, Schema()));
 }
 
 TEST("require that collection type change precedes index aspect added")
 {
-    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).schema();
-    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING, Schema::ARRAY).
-            add("f2", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::INDEX, Schema::STRING).schema();
+    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).schema();
+    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING, schema::ARRAY).
+            add("f2", FType::SUMMARY, schema::STRING).
+            add("f2", FType::INDEX, schema::STRING).schema();
     EXPECT_EQUAL(CTC, checkSchema(news, olds, Schema()));
 }
 
 TEST("require that index aspect added precedes index aspect removed")
 {
-    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::INDEX, Schema::STRING).schema();
-    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f1", FType::INDEX, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).schema();
+    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).
+            add("f2", FType::INDEX, schema::STRING).schema();
+    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f1", FType::INDEX, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).schema();
     EXPECT_EQUAL(IAA, checkSchema(news, olds, Schema()));
 }
 
 TEST("require that index aspect removed precedes attribute aspect removed")
 {
-    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f1", FType::INDEX, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::ATTRIBUTE, Schema::STRING).schema();
-    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).schema();
+    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f1", FType::INDEX, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).
+            add("f2", FType::ATTRIBUTE, schema::STRING).schema();
+    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).schema();
     EXPECT_EQUAL(IAR, checkSchema(news, olds, Schema()));
 }
 
 TEST("require that attribute aspect removed precedes attribute aspect added")
 {
-    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f1", FType::ATTRIBUTE, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).schema();
-    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::SUMMARY, Schema::STRING).
-            add("f2", FType::ATTRIBUTE, Schema::STRING).schema();
+    Schema olds = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f1", FType::ATTRIBUTE, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).schema();
+    Schema news = SchemaBuilder().add("f1", FType::SUMMARY, schema::STRING).
+            add("f2", FType::SUMMARY, schema::STRING).
+            add("f2", FType::ATTRIBUTE, schema::STRING).schema();
     EXPECT_EQUAL(AAR, checkSchema(news, olds, Schema()));
 }