diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-05 20:51:14 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-05 20:51:14 +0100 |
| commit | 0778a9446dc3475b887d20515165a4dc63ed0cd0 (patch) | |
| tree | bbd6dc700feb72c5f5f35a204bed083080afa35a /test/core/common | |
| parent | 15dd9d1aa1e0cfe8b31364fb42985ee8d5c5fc9d (diff) | |
Replaced the term "aggregation" with "composition"
Diffstat (limited to 'test/core/common')
| -rw-r--r-- | test/core/common/RttiTest.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/test/core/common/RttiTest.cpp b/test/core/common/RttiTest.cpp index 1154fb5..e5d7571 100644 --- a/test/core/common/RttiTest.cpp +++ b/test/core/common/RttiTest.cpp @@ -81,42 +81,42 @@ TEST(Rtti, isa) ASSERT_TRUE(Type4.isa(Type4)); } -TEST(Rtti, aggregatedOf) +TEST(Rtti, composedOf) { std::vector<const RttiBase *> types{&Type1, &Type2, &Type3, &Type4}; for (auto t : types) { - ASSERT_FALSE(t->aggregatedOf(Type1)); - ASSERT_FALSE(t->aggregatedOf(Type2)); - ASSERT_FALSE(t->aggregatedOf(Type3)); - ASSERT_FALSE(t->aggregatedOf(Type4)); - ASSERT_FALSE(t->aggregatedOf(Type5)); - ASSERT_FALSE(t->aggregatedOf(Type6)); - ASSERT_FALSE(t->aggregatedOf(Type7)); + ASSERT_FALSE(t->composedOf(Type1)); + ASSERT_FALSE(t->composedOf(Type2)); + ASSERT_FALSE(t->composedOf(Type3)); + ASSERT_FALSE(t->composedOf(Type4)); + ASSERT_FALSE(t->composedOf(Type5)); + ASSERT_FALSE(t->composedOf(Type6)); + ASSERT_FALSE(t->composedOf(Type7)); } - ASSERT_TRUE(Type5.aggregatedOf(Type1)); - ASSERT_FALSE(Type5.aggregatedOf(Type2)); - ASSERT_FALSE(Type5.aggregatedOf(Type3)); - ASSERT_FALSE(Type5.aggregatedOf(Type4)); - ASSERT_FALSE(Type5.aggregatedOf(Type5)); - ASSERT_TRUE(Type5.aggregatedOf(Type6)); - ASSERT_TRUE(Type5.aggregatedOf(Type7)); - - ASSERT_TRUE(Type6.aggregatedOf(Type1)); - ASSERT_FALSE(Type6.aggregatedOf(Type2)); - ASSERT_FALSE(Type6.aggregatedOf(Type3)); - ASSERT_FALSE(Type6.aggregatedOf(Type4)); - ASSERT_FALSE(Type6.aggregatedOf(Type5)); - ASSERT_FALSE(Type6.aggregatedOf(Type6)); - ASSERT_FALSE(Type6.aggregatedOf(Type7)); - - ASSERT_TRUE(Type7.aggregatedOf(Type1)); - ASSERT_FALSE(Type7.aggregatedOf(Type2)); - ASSERT_FALSE(Type7.aggregatedOf(Type3)); - ASSERT_FALSE(Type7.aggregatedOf(Type4)); - ASSERT_FALSE(Type7.aggregatedOf(Type5)); - ASSERT_FALSE(Type7.aggregatedOf(Type6)); - ASSERT_FALSE(Type7.aggregatedOf(Type7)); + ASSERT_TRUE(Type5.composedOf(Type1)); + ASSERT_FALSE(Type5.composedOf(Type2)); + ASSERT_FALSE(Type5.composedOf(Type3)); + ASSERT_FALSE(Type5.composedOf(Type4)); + ASSERT_FALSE(Type5.composedOf(Type5)); + ASSERT_TRUE(Type5.composedOf(Type6)); + ASSERT_TRUE(Type5.composedOf(Type7)); + + ASSERT_TRUE(Type6.composedOf(Type1)); + ASSERT_FALSE(Type6.composedOf(Type2)); + ASSERT_FALSE(Type6.composedOf(Type3)); + ASSERT_FALSE(Type6.composedOf(Type4)); + ASSERT_FALSE(Type6.composedOf(Type5)); + ASSERT_FALSE(Type6.composedOf(Type6)); + ASSERT_FALSE(Type6.composedOf(Type7)); + + ASSERT_TRUE(Type7.composedOf(Type1)); + ASSERT_FALSE(Type7.composedOf(Type2)); + ASSERT_FALSE(Type7.composedOf(Type3)); + ASSERT_FALSE(Type7.composedOf(Type4)); + ASSERT_FALSE(Type7.composedOf(Type5)); + ASSERT_FALSE(Type7.composedOf(Type6)); + ASSERT_FALSE(Type7.composedOf(Type7)); } } } |