diff options
Diffstat (limited to 'test/core/model')
| -rw-r--r-- | test/core/model/DocumentTest.cpp | 2 | ||||
| -rw-r--r-- | test/core/model/DomainTest.cpp | 8 | ||||
| -rw-r--r-- | test/core/model/TestAdvanced.hpp | 6 | ||||
| -rw-r--r-- | test/core/model/TestDomain.hpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp index a09068d..563f1b4 100644 --- a/test/core/model/DocumentTest.cpp +++ b/test/core/model/DocumentTest.cpp @@ -116,7 +116,7 @@ TEST(Document, validate) Manager mgr{1}; Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)}; Rooted<Domain> domain{new Domain(mgr, sys, "trivial")}; - Cardinality single; + Variant::cardinalityType single; single.merge({1}); // Set up the "root" StructuredClass. Rooted<StructuredClass> rootClass{new StructuredClass( diff --git a/test/core/model/DomainTest.cpp b/test/core/model/DomainTest.cpp index fc71f91..8bf1a47 100644 --- a/test/core/model/DomainTest.cpp +++ b/test/core/model/DomainTest.cpp @@ -151,8 +151,8 @@ TEST(Descriptor, pathToAdvanced) Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)}; // Construct the domain Rooted<Domain> domain{new Domain(mgr, sys, "nasty")}; - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); // Let's create the classes that we need first Rooted<StructuredClass> A{new StructuredClass( @@ -224,8 +224,8 @@ TEST(StructuredClass, isSubclassOf) Manager mgr{1}; Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)}; Rooted<Domain> domain{new Domain(mgr, sys, "inheritance")}; - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); Rooted<StructuredClass> A{new StructuredClass( mgr, "A", domain, any, {nullptr}, {nullptr}, false, true)}; // first branch diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 6111170..035ee8e 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -52,7 +52,7 @@ static Rooted<Domain> constructHeadingDomain(Manager &mgr, // set up domain node. Rooted<Domain> domain{new Domain(mgr, sys, "headings")}; // set up cardinality (every section may have at most one heading). - Cardinality card; + Variant::cardinalityType card; card.merge({0, 1}); // set up heading StructuredClass. Rooted<StructuredClass> heading{new StructuredClass( @@ -83,8 +83,8 @@ static Rooted<Domain> constructListDomain(Manager &mgr, // set up domain node. Rooted<Domain> domain{new Domain(mgr, sys, "list")}; // set up cardinality - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); // get book.paragraph Rooted<StructuredClass> p = resolveDescriptor(bookDomain, "paragraph"); // set up item StructuredClass; diff --git a/test/core/model/TestDomain.hpp b/test/core/model/TestDomain.hpp index 35f1ce1..a36f593 100644 --- a/test/core/model/TestDomain.hpp +++ b/test/core/model/TestDomain.hpp @@ -34,10 +34,10 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, // Start with the Domain itself. Rooted<Domain> domain{new Domain(mgr, sys, "book")}; // Set up the cardinalities we'll need. - Cardinality single; + Variant::cardinalityType single; single.merge({1}); - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); // Set up the "book" node. Rooted<StructuredClass> book{new StructuredClass( |