From 7c8523136a59a724c9863f8577896ff481bab2a3 Mon Sep 17 00:00:00 2001 From: Jon Michael Aanes Date: Fri, 28 Feb 2025 09:52:13 +0100 Subject: [PATCH] DisplayName parsing can now handle expressions --- standardize_test_format/__init__.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/standardize_test_format/__init__.py b/standardize_test_format/__init__.py index 557d0ed..f8c7587 100644 --- a/standardize_test_format/__init__.py +++ b/standardize_test_format/__init__.py @@ -6,7 +6,8 @@ Tool for standardizing Java tests. import re PATTERN_JAVADOC = r'/\*\*(?P.*(\n\s*\*.*)*?)\s*\*/' -PATTERN_DISPLAY_NAME = r'@DisplayName\(\s*"(?P[^"]*?)"\s*\)' +PATTERN_DISPLAY_NAME_EXPRESSION = r'\s*(?:"[^"]*?")(?:\s*\+\s*"[^"]*?")*\s*' +PATTERN_DISPLAY_NAME = r'@DisplayName\((?P'+PATTERN_DISPLAY_NAME_EXPRESSION+r')\)' TEST_PATTERN: re.Pattern = re.compile( r'' @@ -23,7 +24,7 @@ IGNORABLE_WORDS_IN_NAME = frozenset({ 'a', 'the', 'is', - 'are' + 'are', }) def format_test_prefix(name: str, description: str, annotation: @@ -52,7 +53,7 @@ def to_camel_case_word(word: str, first: bool = False) -> str | None: return (word[0].lower() if first else word[0].upper()) + word[1:] def to_camel_case(description: str) -> str: - description = description.strip(' \t.').replace(',',' ') + description = description.replace(',',' ').replace('.',' ').replace('"', ' ').replace('+', ' ').strip(' \t.') words = description.split(' ') words[0] = to_camel_case_word(words[0], first=True) @@ -75,6 +76,15 @@ def parse_javadoc_to_description(text: str| None): text = re.sub(r'\{@link\s+(\w+)\}', r'\1', text) return text + +def parse_display_name_to_description(text: str|None): + if text is None: + return '' + + text = re.sub(r'"\s*\+\s*"', '', text).strip('"') + return text.strip() + + def replace_test_pattern(match: re.Match, with_javadoc: bool, with_display_name: bool) -> str: javadoc = parse_javadoc_to_description(match.group('javadoc')) @@ -82,7 +92,7 @@ def replace_test_pattern(match: re.Match, with_javadoc: bool, with_display_name: annotation = match.group('annotation').strip() visibility = (match.group('visibility') or '').strip() name = match.group('name').strip() - display = (match.group('display') or '').strip() + display = parse_display_name_to_description(match.group('display')) description = display or javadoc or from_camel_case(name)