fix tests/pattern_tools_

- add alternative output for pattern_tools_06 (different order for
unordered map)
- remove printing of typeid for pattern_tools_01
fixes #4691

diff --git a/tests/base/pattern_tools_01.cc b/tests/base/pattern_tools_01.cc
index 0a0542e711213349e4eafbac99abb3eb0f755227..627935133506eff300db204287eb32691a37c4a5 100644 (file)
--- a/tests/base/pattern_tools_01.cc
+++ b/tests/base/pattern_tools_01.cc
@@ -31,7 +31,6 @@ using namespace Patterns::Tools;
 template<class T>
 void test(T t)
 {
-  deallog << "Type     : " << boost::core::demangle(typeid(T).name()) << std::endl;
   auto p = Convert<T>::to_pattern();
   deallog << "Pattern  : " << p->description() << std::endl;
   auto s = Convert<T>::to_string(t);

diff --git a/tests/base/pattern_tools_01.output b/tests/base/pattern_tools_01.output
index 6c2cf15ba74c081446ac2f8620d9d2085c718bbf..c3a9c70dd63597ec50c91360c611ad8c538b3a3b 100644 (file)
--- a/tests/base/pattern_tools_01.output
+++ b/tests/base/pattern_tools_01.output
@@ -1,28 +1,22 @@
 
-DEAL::Type     : int
 DEAL::Pattern  : [Integer range -2147483648...2147483647 (inclusive)]
 DEAL::To String: 1
 DEAL::To value : 1
-DEAL::Type     : unsigned int
 DEAL::Pattern  : [Integer]
 DEAL::To String: 2
 DEAL::To value : 2
-DEAL::Type     : unsigned char
 DEAL::Pattern  : [Integer range 0...255 (inclusive)]
 DEAL::To String: 3
 DEAL::To value : 3
 DEAL::Pattern  : [Anything]
 DEAL::To String: Ciao
 DEAL::To value : Ciao
-DEAL::Type     : double
 DEAL::Pattern  : [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]
 DEAL::To String: 4.000000
 DEAL::To value : 4.000000
-DEAL::Type     : bool
 DEAL::Pattern  : [Bool]
 DEAL::To String: true
 DEAL::To value : true
-DEAL::Type     : float
 DEAL::Pattern  : [Double -3.40282e+38...3.40282e+38 (inclusive)]
 DEAL::To String: 5.500000
 DEAL::To value : 5.500000

diff --git a/tests/base/pattern_tools_06.output.2 b/tests/base/pattern_tools_06.output.2
new file mode 100644 (file)
index 0000000..49c24b6
--- /dev/null
+++ b/tests/base/pattern_tools_06.output.2
@@ -0,0 +1,13 @@
+
+DEAL::Pattern  : [Map of <[Integer range -2147483648...2147483647 (inclusive)]>:<[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 0...4294967295 (inclusive)]
+DEAL::To String: 1:3.000000, 5:1.000000
+DEAL::To value : 1:3.000000, 5:1.000000
+DEAL::Pattern  : [Map of <[Integer range -2147483648...2147483647 (inclusive)]>:<[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 0...4294967295 (inclusive)]
+DEAL::To String: 1:3.000000, 5:1.000000
+DEAL::To value : 5:1.000000, 1:3.000000
+DEAL::Pattern  : [Map of <[Integer range -2147483648...2147483647 (inclusive)]>:<[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 0...4294967295 (inclusive)]
+DEAL::To String: 1:3.000000, 5:1.000000, 5:2.000000
+DEAL::To value : 1:3.000000, 5:1.000000, 5:2.000000
+DEAL::Pattern  : [Map of <[Integer range -2147483648...2147483647 (inclusive)]>:<[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 0...4294967295 (inclusive)]
+DEAL::To String: 1:3.000000, 5:2.000000, 5:1.000000
+DEAL::To value : 5:1.000000, 5:2.000000, 1:3.000000