From 842b214ac19e27bb41a54bbbc032a6e250651986 Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Thu, 28 May 2015 21:52:07 +0000 Subject: [PATCH] Simplify regex in TestDataFormatterUnordered.py for better readability. Summary: Using `(match){3}` instead of `matchmatchmatch`. This is an update to D10078. Test Plan: no change in test behavior. Reviewers: clayborg, sivachandra Reviewed By: sivachandra Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10094 llvm-svn: 238510 --- .../libcxx/unordered/TestDataFormatterUnordered.py | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py index 2717c40..98554d9 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py @@ -61,12 +61,28 @@ class LibcxxUnorderedDataFormatterTestCase(TestBase): self.expect('image list', substrs = self.getLibcPlusPlusLibs()) - self.look_for_content_and_continue("map", ['size=5 {', 'hello', 'world', 'this', 'is', 'me']) - self.look_for_content_and_continue("mmap", ['size=6 {', 'first = 3', 'second = "this"', 'first = 2', 'second = "hello"']) - self.look_for_content_and_continue("iset", ['size=5 {', '\[\d\] = 5', '\[\d\] = 3', '\[\d\] = 2']) - self.look_for_content_and_continue("sset", ['size=5 {', '\[\d\] = "is"', '\[\d\] = "world"', '\[\d\] = "hello"']) - self.look_for_content_and_continue("imset", ['size=6 {', '\[\d\] = 3(\\n|.)+\[\d\] = 3(\\n|.)+\[\d\] = 3', '\[\d\] = 2', '\[\d\] = 1']) - self.look_for_content_and_continue("smset", ['size=5 {', '\[\d\] = "is"(\\n|.)+\[\d\] = "is"', '\[\d\] = "world"(\\n|.)+\[\d\] = "world"']) + self.look_for_content_and_continue( + "map", ['size=5 {', 'hello', 'world', 'this', 'is', 'me']) + + self.look_for_content_and_continue( + "mmap", ['size=6 {', 'first = 3', 'second = "this"', + 'first = 2', 'second = "hello"']) + + self.look_for_content_and_continue( + "iset", ['size=5 {', '\[\d\] = 5', '\[\d\] = 3', '\[\d\] = 2']) + + self.look_for_content_and_continue( + "sset", ['size=5 {', '\[\d\] = "is"', '\[\d\] = "world"', + '\[\d\] = "hello"']) + + self.look_for_content_and_continue( + "imset", ['size=6 {', '(\[\d\] = 3(\\n|.)+){3}', + '\[\d\] = 2', '\[\d\] = 1']) + + self.look_for_content_and_continue( + "smset", + ['size=5 {', '(\[\d\] = "is"(\\n|.)+){2}', + '(\[\d\] = "world"(\\n|.)+){2}']) if __name__ == '__main__': import atexit -- 2.7.4