From 0c89dbaa629dc33ef6e36545a67cc57bf2f9577a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odin=20H=C3=B8rthe=20Omdal?= Date: Thu, 12 Feb 2009 02:38:58 +0100 Subject: [PATCH] test: Regexed 00-40, just escaping; no fancy stuff --- tests/15list.tests | 14 +- tests/15locking.tests | 2 +- tests/20config_lowlevel.tests | 6 +- tests/22config_highlevel.tests | 10 +- tests/31plugin.tests | 10 +- tests/40components.tests | 481 ++++++++++++++++----------------- 6 files changed, 253 insertions(+), 270 deletions(-) diff --git a/tests/15list.tests b/tests/15list.tests index e04044f27..1e6558e49 100644 --- a/tests/15list.tests +++ b/tests/15list.tests @@ -2,31 +2,22 @@ TESTING "Linked Lists" ./test-llist TEST "init nodes" basic <line = ' #comment bla' END TEST "check content of configitem with section" configitem_simple_content_check $'[ key.foo suffix.bar ] ' << END -out: item->line = '[ key.foo suffix.bar ] ' +out: item->line = '\[ key\.foo suffix.bar \] ' out: item->key_size = '7' -out: item->key = 'key.foo suffix.bar ] ' -out: item->delim = ' suffix.bar ] ' +out: item->key = 'key.foo suffix.bar \] ' +out: item->delim = ' suffix.bar \] ' END TEST "check content of configitem with directive (without argument)" configitem_simple_content_check $'\t @directive ' << END diff --git a/tests/22config_highlevel.tests b/tests/22config_highlevel.tests index c43baaefe..ac5a90a30 100644 --- a/tests/22config_highlevel.tests +++ b/tests/22config_highlevel.tests @@ -209,18 +209,16 @@ out: ' baz barf gnarf first second' END TEST "wordlist add same word" wordlist_add 'foo.bar' 'baz barf gnarf' same same << END -out: ' baz barf gnarf same' -out: ' baz barf gnarf same' +out: ^' baz barf gnarf same'$ END TEST "wordlist add to empty list" wordlist_add 'foo.bar' '' first second << END -out: ' first' -out: ' first second' +out: ^' first'$ +out: ^' first second'$ END TEST "wordlist add to empty list, same" wordlist_add 'foo.bar' '' same same << END -out: ' same' -out: ' same' +out: ^' same'$ END diff --git a/tests/31plugin.tests b/tests/31plugin.tests index 46844f754..6181c224b 100644 --- a/tests/31plugin.tests +++ b/tests/31plugin.tests @@ -2,7 +2,7 @@ TESTING "testing plugins" ./test-interfaces TEST "discovering plugins, missing path" plugin_discover < out: wrapping cmdline: -out: ... +out: \.\.\. out: --> out: wrapping cmdline:spam... -out: 0|spam| +out: 0\|spam\| out: -->spam out: wrapping cmdline: out: spam... -out: 0|spam| +out: 0\|spam\| out: -->spam out: wrapping cmdline:eat more spam... -out: 0|eat| -out: 1|more| -out: 2|spam| +out: 0\|eat\| +out: 1\|more\| +out: 2\|spam\| out: -->eat more spam -out: wrapping cmdline: oo _O()O_ ä + €... -out: 0|oo| -out: 1|_O()O_| -out: 2|ä| -out: 3|+| -out: 4|€| -out: -->oo _O()O_ ä + € +out: wrapping cmdline: oo _O\(\)O_ ä \+ €... +out: 0\|oo\| +out: 1\|_O\(\)O_\| +out: 2\|ä\| +out: 3\|\+\| +out: 4\|€\| +out: -->oo _O\(\)O_ ä \+ € out: wrapping cmdline:Ω ooΩ oΩo Ωoo... -out: 0|Ω| -out: 1|ooΩ| -out: 2|oΩo| -out: 3|Ωoo| +out: 0\|Ω\| +out: 1\|ooΩ\| +out: 2\|oΩo\| +out: 3\|Ωoo\| out: -->Ω ooΩ oΩo Ωoo out: Standard Cmdlineformat:one two END @@ -62,98 +60,98 @@ out: Conf2 :-<2>- out: Conf3 :-<3>- out: Conf4 :-<2>-<4>- out: AllFlags :-<1>-<2>-<3>-<4>- -out: __________________________ -out: __________________________ check_flags() +out: __________________________$ +out: __________________________ check_flags\(\) out: Flags1 :-<2>-<4>- out: Flags2 :-<2>-<4>- out: SimpleConfig_defined_by_Typelist :-<1>- out: AnotherConfig_defined_by_Typelist :-<1>-<2>-<3>-<4>- -out: __________________________ -out: __________________________ check_instantiation() -out: defined Conf0? ---> 0 -out: defined Conf1? ---> 1 -out: defined Conf2? ---> 1 -out: defined Conf3? ---> 1 -out: defined Conf4? ---> 1 -out: defined Trash? ---> 0 -out: __________________________ -out: __________________________ check_filter() +out: __________________________$ +out: __________________________ check_instantiation\(\) +out: defined Conf0\? ---> 0 +out: defined Conf1\? ---> 1 +out: defined Conf2\? ---> 1 +out: defined Conf3\? ---> 1 +out: defined Conf4\? ---> 1 +out: defined Trash\? ---> 0 +out: __________________________$ +out: __________________________ check_filter\(\) out: SomeFlagsets : -out: +---<1>-<3>-+ -out: +---<2>-<4>-+- +out: \+---<1>-<3>-\+ +out: \+---<2>-<4>-\+- out: Configs_defined_by_Flagsets : -out: +-Conf-[-<1>-<3>-] -out: +-Conf-[-<2>-<4>-]- +out: \+-Conf-\[-<1>-<3>-\] +out: \+-Conf-\[-<2>-<4>-\]- out: Filter_possible_Configs : -out: +-Conf-[-<2>-<4>-]- +out: \+-Conf-\[-<2>-<4>-\]- out: AllFlagCombinations : -out: +---<1>-<2>-<3>-<4>-<·>-+ -out: +---<1>-<2>-<3>-<·>-+ -out: +---<1>-<2>-<4>-<·>-+ -out: +---<1>-<2>-<·>-+ -out: +---<1>-<3>-<4>-<·>-+ -out: +---<1>-<3>-<·>-+ -out: +---<1>-<4>-<·>-+ -out: +---<1>-<·>-+ -out: +---<2>-<3>-<4>-<·>-+ -out: +---<2>-<3>-<·>-+ -out: +---<2>-<4>-<·>-+ -out: +---<2>-<·>-+ -out: +---<3>-<4>-<·>-+ -out: +---<3>-<·>-+ -out: +---<4>-<·>-+ -out: +---<·>-+- +out: \+---<1>-<2>-<3>-<4>-<·>-\+ +out: \+---<1>-<2>-<3>-<·>-\+ +out: \+---<1>-<2>-<4>-<·>-\+ +out: \+---<1>-<2>-<·>-\+ +out: \+---<1>-<3>-<4>-<·>-\+ +out: \+---<1>-<3>-<·>-\+ +out: \+---<1>-<4>-<·>-\+ +out: \+---<1>-<·>-\+ +out: \+---<2>-<3>-<4>-<·>-\+ +out: \+---<2>-<3>-<·>-\+ +out: \+---<2>-<4>-<·>-\+ +out: \+---<2>-<·>-\+ +out: \+---<3>-<4>-<·>-\+ +out: \+---<3>-<·>-\+ +out: \+---<4>-<·>-\+ +out: \+---<·>-\+- out: ListAllConfigs : -out: +-Conf-[-<1>-<2>-<3>-<4>-] -out: +-Conf-[-<1>-<2>-<3>-] -out: +-Conf-[-<1>-<2>-<4>-] -out: +-Conf-[-<1>-<2>-] -out: +-Conf-[-<1>-<3>-<4>-] -out: +-Conf-[-<1>-<3>-] -out: +-Conf-[-<1>-<4>-] -out: +-Conf-[-<1>-] -out: +-Conf-[-<2>-<3>-<4>-] -out: +-Conf-[-<2>-<3>-] -out: +-Conf-[-<2>-<4>-] -out: +-Conf-[-<2>-] -out: +-Conf-[-<3>-<4>-] -out: +-Conf-[-<3>-] -out: +-Conf-[-<4>-] -out: +-Conf-[-]- +out: \+-Conf-\[-<1>-<2>-<3>-<4>-\] +out: \+-Conf-\[-<1>-<2>-<3>-\] +out: \+-Conf-\[-<1>-<2>-<4>-\] +out: \+-Conf-\[-<1>-<2>-\] +out: \+-Conf-\[-<1>-<3>-<4>-\] +out: \+-Conf-\[-<1>-<3>-\] +out: \+-Conf-\[-<1>-<4>-\] +out: \+-Conf-\[-<1>-\] +out: \+-Conf-\[-<2>-<3>-<4>-\] +out: \+-Conf-\[-<2>-<3>-\] +out: \+-Conf-\[-<2>-<4>-\] +out: \+-Conf-\[-<2>-\] +out: \+-Conf-\[-<3>-<4>-\] +out: \+-Conf-\[-<3>-\] +out: \+-Conf-\[-<4>-\] +out: \+-Conf-\[-\]- out: Filter_all_possible_Configs : -out: +-Conf-[-<1>-] -out: +-Conf-[-<2>-<3>-] -out: +-Conf-[-<2>-<4>-] -out: +-Conf-[-<2>-] -out: +-Conf-[-<3>-]- -out: __________________________ -out: __________________________ check_FlagInfo() +out: \+-Conf-\[-<1>-\] +out: \+-Conf-\[-<2>-<3>-\] +out: \+-Conf-\[-<2>-<4>-\] +out: \+-Conf-\[-<2>-\] +out: \+-Conf-\[-<3>-\]- +out: __________________________$ +out: __________________________ check_FlagInfo\(\) out: Flags1 :-<1>-<3>- out: max bit : 3 out: binary code: 10 out: SomeConfigs : -out: +-Conf-[-<1>-<3>-] -out: +-Conf-[-<2>-<4>-]- -out: max bit in [SomeConfigs] : 4 +out: \+-Conf-\[-<1>-<3>-\] +out: \+-Conf-\[-<2>-<4>-\]- +out: max bit in \[SomeConfigs\] : 4 out: TestVisitor application: -out: visit(code=10) --> -out: +-Conf-[-<1>-<3>-]- -out: visit(code=20) --> -out: +-Conf-[-<2>-<4>-]- -out: __________________________ -out: __________________________ check_ConfigSelector() +out: visit\(code=10\) --> +out: \+-Conf-\[-<1>-<3>-\]- +out: visit\(code=20\) --> +out: \+-Conf-\[-<2>-<4>-\]- +out: __________________________$ +out: __________________________ check_ConfigSelector\(\) out: Possible_Configs : -out: +-Conf-[-<1>-] -out: +-Conf-[-<2>-<3>-] -out: +-Conf-[-<2>-<4>-] -out: +-Conf-[-<2>-] -out: +-Conf-[-<3>-]- -out: Flag-code = 2 ConfigSelector() ---> 1010 -out: Flag-code = 12 ConfigSelector() ---> 1023 -out: Flag-code = 20 ConfigSelector() ---> 1024 -out: Flag-code = 4 ConfigSelector() ---> 1020 -out: Flag-code = 8 ConfigSelector() ---> 1030 -out: LUMIERA_ERROR_INVALID:invalid input or parameters (ConfigSelector: No preconfigured factory for config-bits=10111). +out: \+-Conf-\[-<1>-\] +out: \+-Conf-\[-<2>-<3>-\] +out: \+-Conf-\[-<2>-<4>-\] +out: \+-Conf-\[-<2>-\] +out: \+-Conf-\[-<3>-\]- +out: Flag-code = 2 ConfigSelector\(\) ---> 1010 +out: Flag-code = 12 ConfigSelector\(\) ---> 1023 +out: Flag-code = 20 ConfigSelector\(\) ---> 1024 +out: Flag-code = 4 ConfigSelector\(\) ---> 1020 +out: Flag-code = 8 ConfigSelector\(\) ---> 1030 +out: LUMIERA_ERROR_INVALID:invalid input or parameters \(ConfigSelector: No preconfigured factory for config-bits=10111\)\. return: 0 END @@ -164,54 +162,54 @@ END TEST "ExceptionError_test" ExceptionError_test < [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ] -out: removed 0 ---> [ 1, 2, 3, 4, 5, 6, 7, 8, 9, ] -out: removed 9 ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, ] -out: removed 5 ---> [ 0, 1, 2, 3, 4, 6, 7, 8, 9, ] -out: removed 0 2 4 6 8 ---> [ 1, 3, 5, 7, 9, ] -out: removed 1 3 5 7 9 ---> [ 0, 2, 4, 6, 8, ] -out: removed 0 1 2 3 4 5 6 7 8 9 ---> [ ] -out: removed 0 1 2 3 4 5 6 7 8 ---> [ 9, ] -out: removed 1 2 3 4 5 6 7 8 9 ---> [ 0, ] -out: removed 0 1 2 3 4 6 7 8 9 ---> [ 5, ] +out: removed nothing ---> \[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, \] +out: removed 0 ---> \[ 1, 2, 3, 4, 5, 6, 7, 8, 9, \] +out: removed 9 ---> \[ 0, 1, 2, 3, 4, 5, 6, 7, 8, \] +out: removed 5 ---> \[ 0, 1, 2, 3, 4, 6, 7, 8, 9, \] +out: removed 0 2 4 6 8 ---> \[ 1, 3, 5, 7, 9, \] +out: removed 1 3 5 7 9 ---> \[ 0, 2, 4, 6, 8, \] +out: removed 0 1 2 3 4 5 6 7 8 9 ---> \[ \] +out: removed 0 1 2 3 4 5 6 7 8 ---> \[ 9, \] +out: removed 1 2 3 4 5 6 7 8 9 ---> \[ 0, \] +out: removed 0 1 2 3 4 6 7 8 9 ---> \[ 5, \] END @@ -241,7 +239,7 @@ out: 'trailing Withespace out: ' --> 'trailing_Withespace' out: 'with a lot out: of Whitespace' --> 'with_a_lot_of_Whitespace' -out: 'with"much (punctuation)[]!' --> 'withmuch_(punctuation)' +out: 'with"much \(punctuation\)\[\]!' --> 'withmuch_\(punctuation\)' out: '§&Ω%€ leading garbage' --> 'leading_garbage' out: 'mixed Ω garbage' --> 'mixed_garbage' out: 'Bääääh!!' --> 'Bh' @@ -250,24 +248,24 @@ END TEST "SingletonSubclass_test" SingletonSubclass_test 13 <... -out: . -out: ..install one element at index[0] -out: . -out: ..*** resize table to 16 elements -out: . -out: .throw some exceptions... +out: \.$ +out: \.\.install one element at index\[0\] +out: ^\.$ +out: \.\.\*\*\* resize table to 16 elements +out: ^\.$ +out: ^\.throw some exceptions... out: checking ScopedPtrHolder... -out: . -out: ..install one element at index[0] -out: . -out: ..*** resize table to 16 elements -out: . -out: .throw some exceptions... +out: ^\.$ +out: ..install one element at index\[0\] +out: ^\.$ +out: ..\*\*\* resize table to 16 elements +out: ^\.$ +out: ^\.throw some exceptions... END @@ -301,16 +299,16 @@ END TEST "Singleton_test" Singleton_test 23 < > out: ctor DoIt > out: ctor DoIt > out: ctor DoIt > -out: Block< 2>::eat(..) -out: Block< 5>::eat(..) -out: Block<13>::eat(..) +out: Block< 2>::eat\(..\) +out: Block< 5>::eat\(..\) +out: Block<13>::eat\(..\) out: gulp! out: dtor DoIt > out: dtor DoIt > @@ -435,87 +433,87 @@ out: Append8 :-<1>-<2>-<3>-<222>- out: Append9 :-<1>-<2>-<3>-<5>-<6>-<7>- out: FilterEven :-<2>-<6>- out: Prefix1 : -out: +---<11>-<22>-+- +out: \+---<11>-<22>-\+- out: Prefix2 : -out: +---<101>-<1>-+ -out: +---<101>-<2>-+ -out: +---<101>-<3>-+- +out: \+---<101>-<1>-\+ +out: \+---<101>-<2>-\+ +out: \+---<101>-<3>-\+- out: Prefix3 : -out: +---<1>-+ -out: +---<2>-+ -out: +---<3>-+- +out: \+---<1>-\+ +out: \+---<2>-\+ +out: \+---<3>-\+- out: Prefix4 : -out: +---<111>-<1>-<2>-<3>-+ -out: +---<111>-<0>-+ -out: +---<111>-<5>-<6>-<7>-+- +out: \+---<111>-<1>-<2>-<3>-\+ +out: \+---<111>-<0>-\+ +out: \+---<111>-<5>-<6>-<7>-\+- out: Prefix5 : -out: +---<1>-<2>-<3>-<5>-+ -out: +---<1>-<2>-<3>-<6>-+ -out: +---<1>-<2>-<3>-<7>-+- +out: \+---<1>-<2>-<3>-<5>-\+ +out: \+---<1>-<2>-<3>-<6>-\+ +out: \+---<1>-<2>-<3>-<7>-\+- out: Prefix6 : -out: +---<1>-<2>-<3>-<1>-<2>-<3>-+ -out: +---<1>-<2>-<3>-<0>-+ -out: +---<1>-<2>-<3>-<5>-<6>-<7>-+- +out: \+---<1>-<2>-<3>-<1>-<2>-<3>-\+ +out: \+---<1>-<2>-<3>-<0>-\+ +out: \+---<1>-<2>-<3>-<5>-<6>-<7>-\+- out: Dist1 : -out: +---<11>-<1>-+ -out: +---<11>-<2>-+ -out: +---<11>-<3>-+- +out: \+---<11>-<1>-\+ +out: \+---<11>-<2>-\+ +out: \+---<11>-<3>-\+- out: Dist2 : -out: +---<11>-<0>-+ -out: +---<22>-<0>-+ -out: +---<33>-<0>-+- +out: \+---<11>-<0>-\+ +out: \+---<22>-<0>-\+ +out: \+---<33>-<0>-\+- out: Dist3 : -out: +---<11>-<1>-+ -out: +---<11>-<2>-+ -out: +---<11>-<3>-+ -out: +---<22>-<1>-+ -out: +---<22>-<2>-+ -out: +---<22>-<3>-+ -out: +---<33>-<1>-+ -out: +---<33>-<2>-+ -out: +---<33>-<3>-+- +out: \+---<11>-<1>-\+ +out: \+---<11>-<2>-\+ +out: \+---<11>-<3>-\+ +out: \+---<22>-<1>-\+ +out: \+---<22>-<2>-\+ +out: \+---<22>-<3>-\+ +out: \+---<33>-<1>-\+ +out: \+---<33>-<2>-\+ +out: \+---<33>-<3>-\+- out: Dist4 : -out: +---<11>-<1>-<2>-<3>-+ -out: +---<11>-<5>-<6>-<7>-+ -out: +---<22>-<1>-<2>-<3>-+ -out: +---<22>-<5>-<6>-<7>-+ -out: +---<33>-<1>-<2>-<3>-+ -out: +---<33>-<5>-<6>-<7>-+- +out: \+---<11>-<1>-<2>-<3>-\+ +out: \+---<11>-<5>-<6>-<7>-\+ +out: \+---<22>-<1>-<2>-<3>-\+ +out: \+---<22>-<5>-<6>-<7>-\+ +out: \+---<33>-<1>-<2>-<3>-\+ +out: \+---<33>-<5>-<6>-<7>-\+- out: Down :-<11>-<10>-<9>-<8>-<7>-<6>-<5>-<4>-<3>-<2>-<1>-<0>- out: Combi : -out: +---<1>-<2>-<3>-<·>-+ -out: +---<1>-<2>-<2>-<·>-+ -out: +---<1>-<2>-<1>-<·>-+ -out: +---<1>-<2>-<0>-<·>-+ -out: +---<1>-<1>-<3>-<·>-+ -out: +---<1>-<1>-<2>-<·>-+ -out: +---<1>-<1>-<1>-<·>-+ -out: +---<1>-<1>-<0>-<·>-+ -out: +---<1>-<0>-<3>-<·>-+ -out: +---<1>-<0>-<2>-<·>-+ -out: +---<1>-<0>-<1>-<·>-+ -out: +---<1>-<0>-<0>-<·>-+ -out: +---<0>-<2>-<3>-<·>-+ -out: +---<0>-<2>-<2>-<·>-+ -out: +---<0>-<2>-<1>-<·>-+ -out: +---<0>-<2>-<0>-<·>-+ -out: +---<0>-<1>-<3>-<·>-+ -out: +---<0>-<1>-<2>-<·>-+ -out: +---<0>-<1>-<1>-<·>-+ -out: +---<0>-<1>-<0>-<·>-+ -out: +---<0>-<0>-<3>-<·>-+ -out: +---<0>-<0>-<2>-<·>-+ -out: +---<0>-<0>-<1>-<·>-+ -out: +---<0>-<0>-<0>-<·>-+- +out: \+---<1>-<2>-<3>-<·>-\+ +out: \+---<1>-<2>-<2>-<·>-\+ +out: \+---<1>-<2>-<1>-<·>-\+ +out: \+---<1>-<2>-<0>-<·>-\+ +out: \+---<1>-<1>-<3>-<·>-\+ +out: \+---<1>-<1>-<2>-<·>-\+ +out: \+---<1>-<1>-<1>-<·>-\+ +out: \+---<1>-<1>-<0>-<·>-\+ +out: \+---<1>-<0>-<3>-<·>-\+ +out: \+---<1>-<0>-<2>-<·>-\+ +out: \+---<1>-<0>-<1>-<·>-\+ +out: \+---<1>-<0>-<0>-<·>-\+ +out: \+---<0>-<2>-<3>-<·>-\+ +out: \+---<0>-<2>-<2>-<·>-\+ +out: \+---<0>-<2>-<1>-<·>-\+ +out: \+---<0>-<2>-<0>-<·>-\+ +out: \+---<0>-<1>-<3>-<·>-\+ +out: \+---<0>-<1>-<2>-<·>-\+ +out: \+---<0>-<1>-<1>-<·>-\+ +out: \+---<0>-<1>-<0>-<·>-\+ +out: \+---<0>-<0>-<3>-<·>-\+ +out: \+---<0>-<0>-<2>-<·>-\+ +out: \+---<0>-<0>-<1>-<·>-\+ +out: \+---<0>-<0>-<0>-<·>-\+- out: OnOff : -out: +---<1>-<2>-<3>-<·>-+ -out: +---<1>-<2>-<·>-+ -out: +---<1>-<3>-<·>-+ -out: +---<1>-<·>-+ -out: +---<2>-<3>-<·>-+ -out: +---<2>-<·>-+ -out: +---<3>-<·>-+ -out: +---<·>-+- +out: \+---<1>-<2>-<3>-<·>-\+ +out: \+---<1>-<2>-<·>-\+ +out: \+---<1>-<3>-<·>-\+ +out: \+---<1>-<·>-\+ +out: \+---<2>-<3>-<·>-\+ +out: \+---<2>-<·>-\+ +out: \+---<3>-<·>-\+ +out: \+---<·>-\+- return: 0 END @@ -546,7 +544,6 @@ out: we-do-everything-for-YOU! out: Hello Mr.Future, nice to meet you... out: === Babbler masqueraded as Tool meets Leader and Visionary masqueraded as HomoSapiens === out: Hello Boss, nice to meet you... -out: Hello Boss, nice to meet you... out: === Babbler masqueraded as Tool meets Leader and Visionary masqueraded as Leader === out: Hello Boss, nice to meet you... return: 0