Changeset 323ae805 in mainline

Timestamp:

2018-07-05T21:41:24Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cf51eae

Parents:

46c7668

git-author:

Dzejrou <dzejrou@…> (2018-05-14 23:46:21)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:24)

Message:

cpp: added unordered_set tests

Location:

uspace/lib/cpp

Files:

• Makefile (modified) (1 diff)
• include/internal/test/test.hpp (modified) (1 diff)
• include/internal/test/tests.hpp (modified) (1 diff)
• src/internal/test/unordered_set.cpp (added)

uspace/lib/cpp/Makefile

@@ -65 +65 @@
         src/internal/test/tuple.cpp \
         src/internal/test/unordered_map.cpp \
+        src/internal/test/unordered_set.cpp \
         src/internal/test/vector.cpp
 

uspace/lib/cpp/include/internal/test/test.hpp

@@ -102 +102 @@
                 return true;
             }
+
+            template<class Iterator, class Container>
+            void test_contains(const char* tname, Iterator first,
+                               Iterator last, const Container& cont)
+            {
+                if (!assert_contains(first, last, cont))
+                {
+                    report(false, tname);
+                    ++failed_;
+                    ok_ = false;
+                }
+                else
+                {
+                    report(true, tname);
+                    ++succeeded_;
+                }
+            }
+
+            template<class Iterator1, class Iterator2, class Container>
+            void test_contains_multi(const char* tname, Iterator1 first1,
+                               Iterator1 last1, Iterator2 first2,
+                               const Container& cont)
+            {
+                if (!assert_contains_multi(first1, last1, first2, cont))
+                {
+                    report(false, tname);
+                    ++failed_;
+                    ok_ = false;
+                }
+                else
+                {
+                    report(true, tname);
+                    ++succeeded_;
+                }
+            }
+
+            template<class Iterator, class Container>
+            bool assert_contains(Iterator first, Iterator last, const Container& cont)
+            {
+                while (first != last)
+                {
+                    if (cont.find(*first++) == cont.end())
+                        return false;
+                }
+
+                return true;
+            }
+
+            template<class Iterator1, class Iterator2, class Container>
+            bool assert_contains_multi(Iterator1 first1, Iterator1 last1,
+                                       Iterator2 first2, const Container& cont)
+            {
+                while (first1 != last1)
+                {
+                    if (cont.count(*first1++) != *first2++)
+                        return false;
+                }
+
+                return true;
+            }
     };
 }

uspace/lib/cpp/include/internal/test/tests.hpp

@@ -207 +207 @@
             void test_emplace_insert();
             void test_multi();
-
-            template<class Iterator, class Container>
-            void test_contains(const char* tname, Iterator first,
-                               Iterator last, const Container& cont)
-            {
-                if (!assert_contains(first, last, cont))
-                {
-                    report(false, tname);
-                    ++failed_;
-                    ok_ = false;
-                }
-                else
-                {
-                    report(true, tname);
-                    ++succeeded_;
-                }
-            }
-
-            template<class Iterator1, class Iterator2, class Container>
-            void test_contains_multi(const char* tname, Iterator1 first1,
-                               Iterator1 last1, Iterator2 first2,
-                               const Container& cont)
-            {
-                if (!assert_contains_multi(first1, last1, first2, cont))
-                {
-                    report(false, tname);
-                    ++failed_;
-                    ok_ = false;
-                }
-                else
-                {
-                    report(true, tname);
-                    ++succeeded_;
-                }
-            }
-
-            template<class Iterator, class Container>
-            bool assert_contains(Iterator first, Iterator last, const Container& cont)
-            {
-                while (first != last)
-                {
-                    if (cont.find(*first++) == cont.end())
-                        return false;
-                }
-
-                return true;
-            }
-
-            template<class Iterator1, class Iterator2, class Container>
-            bool assert_contains_multi(Iterator1 first1, Iterator1 last1,
-                                       Iterator2 first2, const Container& cont)
-            {
-                while (first1 != last1)
-                {
-                    if (cont.count(*first1++) != *first2++)
-                        return false;
-                }
-
-                return true;
-            }
+    };
+
+    class unordered_set_test: public test_suite
+    {
+        public:
+            bool run(bool) override;
+            const char* name() override;
+
+        private:
+            void test_constructors_and_assignment();
+            void test_emplace_insert();
+            void test_multi();
     };
 }