From 951ef62200aaa1de7a9a3a1c2a7a942f46e4c975 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Thu, 23 Mar 2023 22:05:02 +0100 Subject: [PATCH] refactoring --- src/SmartRegexpFactoryTest.py | 20 ++++++++++++++++++++ src/SmartSearch.py | 11 ----------- src/SmartSearchTest.py | 15 --------------- 3 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 src/SmartRegexpFactoryTest.py delete mode 100644 src/SmartSearch.py delete mode 100644 src/SmartSearchTest.py diff --git a/src/SmartRegexpFactoryTest.py b/src/SmartRegexpFactoryTest.py new file mode 100644 index 00000000000..79c81d95426 --- /dev/null +++ b/src/SmartRegexpFactoryTest.py @@ -0,0 +1,20 @@ +import unittest +from SmartRegexpFactory import SmartRegexpFactory + + +class SmartRegexpFactoryTest(unittest.TestCase): + + def test_smartSearch(self): + def smartSearch(searchTerm, str): + smartRegexp = SmartRegexpFactory().createSmartRegexp(searchTerm) + return bool(smartRegexp.match(str)) + + self.assertTrue(smartSearch(searchTerm = 'one two three', str = 'one two three')) + self.assertTrue(smartSearch(searchTerm = 'one two three', str = 'ONE two ThReE')) + self.assertFalse(smartSearch(searchTerm = 'one two three', str = 'one two')) + self.assertFalse(smartSearch(searchTerm = 'one two three', str = 'three two')) + self.assertTrue(smartSearch(searchTerm = 'one two three', str = 'three two one')) + self.assertTrue(smartSearch(searchTerm = 'one two three', str = 'TESTone twoTEST TESTthreeTEST')) + self.assertTrue(smartSearch(searchTerm = 'eins zwei drei', str = 'drei, EINS oder zwei?')) + self.assertFalse(smartSearch(searchTerm = 'eins zwei drei', str = 'drei, ONE oder zwei?')) + diff --git a/src/SmartSearch.py b/src/SmartSearch.py deleted file mode 100644 index c4b9e76772f..00000000000 --- a/src/SmartSearch.py +++ /dev/null @@ -1,11 +0,0 @@ -import re -from SmartRegexpFactory import SmartRegexpFactory - - -class SmartSearch: - - def __init__(self, searchTerm): - self.smartRegexp = SmartRegexpFactory().createSmartRegexp(searchTerm) - - def matches(self, str): - return True if self.smartRegexp.match(str) else False diff --git a/src/SmartSearchTest.py b/src/SmartSearchTest.py deleted file mode 100644 index 1fec6ef5ffc..00000000000 --- a/src/SmartSearchTest.py +++ /dev/null @@ -1,15 +0,0 @@ -import unittest -from SmartSearch import SmartSearch - - -class SmartSearchTest(unittest.TestCase): - - def test_smartSearch(self): - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('one two three'), True) - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('ONE two ThReE'), True) - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('one two'), False) - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('three two'), False) - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('three two one'), True) - self.assertEqual(SmartSearch(searchTerm = 'one two three').matches('TESTone twoTEST TESTthreeTEST'), True) - self.assertEqual(SmartSearch(searchTerm = 'eins zwei drei').matches('drei, EINS oder zwei?'), True) - self.assertEqual(SmartSearch(searchTerm = 'eins zwei drei').matches('drei, ONE oder zwei?'), False)