From 4350c6fd7a955892712e2bf7a78adf4531e483b4 Mon Sep 17 00:00:00 2001
From: Andreas Finkler <3929834+DudeNr33@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:14:11 +0200
Subject: Added escaping of vertical bar character in annotation labels (#8610)
(#8631)
---
tests/data/nullable_pattern.py | 10 ++++++++++
tests/pyreverse/data/classes_No_Name.dot | 1 +
tests/pyreverse/data/classes_No_Name.html | 6 +++++-
tests/pyreverse/data/classes_No_Name.mmd | 4 ++++
tests/pyreverse/data/classes_No_Name.puml | 4 ++++
tests/pyreverse/data/classes_No_Name.vcg | 29 +++++++++++++++-------------
tests/pyreverse/data/classes_colorized.dot | 1 +
tests/pyreverse/data/classes_colorized.puml | 4 ++++
tests/pyreverse/data/packages_No_Name.dot | 1 +
tests/pyreverse/data/packages_No_Name.html | 4 +++-
tests/pyreverse/data/packages_No_Name.mmd | 2 ++
tests/pyreverse/data/packages_No_Name.puml | 6 ++----
tests/pyreverse/data/packages_No_Name.vcg | 13 ++++++++-----
tests/pyreverse/data/packages_colorized.dot | 1 +
tests/pyreverse/data/packages_colorized.puml | 3 +++
tests/pyreverse/test_diadefs.py | 2 ++
tests/pyreverse/test_inspector.py | 1 +
17 files changed, 68 insertions(+), 24 deletions(-)
create mode 100644 tests/data/nullable_pattern.py
(limited to 'tests')
diff --git a/tests/data/nullable_pattern.py b/tests/data/nullable_pattern.py
new file mode 100644
index 000000000..bd730bbd6
--- /dev/null
+++ b/tests/data/nullable_pattern.py
@@ -0,0 +1,10 @@
+""" docstring for file nullable_pattern.py """
+from typing import Optional
+
+class NullablePatterns:
+ def return_nullable_1(self) -> int | None:
+ """ Nullable return type using the | operator as mentioned in PEP 604, see https://peps.python.org/pep-0604 """
+ pass
+
+ def return_nullable_2(self) -> Optional[int]:
+ pass
diff --git a/tests/pyreverse/data/classes_No_Name.dot b/tests/pyreverse/data/classes_No_Name.dot
index a598ab6d9..2e8830fa0 100644
--- a/tests/pyreverse/data/classes_No_Name.dot
+++ b/tests/pyreverse/data/classes_No_Name.dot
@@ -7,6 +7,7 @@ charset="utf-8"
"data.suppliermodule_test.DoNothing2" [color="black", fontcolor="black", label=<{DoNothing2|
|}>, shape="record", style="solid"];
"data.suppliermodule_test.DoSomething" [color="black", fontcolor="black", label=<{DoSomething|my_int : Optional[int]
my_int_2 : Optional[int]
my_string : str
|do_it(new_int: int): int
}>, shape="record", style="solid"];
"data.suppliermodule_test.Interface" [color="black", fontcolor="black", label=<{Interface|
|get_value()
set_value(value)
}>, shape="record", style="solid"];
+"data.nullable_pattern.NullablePatterns" [color="black", fontcolor="black", label=<{NullablePatterns|
|return_nullable_1(): int \| None
return_nullable_2(): Optional[int]
}>, shape="record", style="solid"];
"data.property_pattern.PropertyPatterns" [color="black", fontcolor="black", label=<{PropertyPatterns|prop1
prop2
|}>, shape="record", style="solid"];
"data.clientmodule_test.Specialization" [color="black", fontcolor="black", label=<{Specialization|TYPE : str
relation
relation2
top : str
|from_value(value: int)
increment_value(): None
transform_value(value: int): int
}>, shape="record", style="solid"];
"data.clientmodule_test.Specialization" -> "data.clientmodule_test.Ancestor" [arrowhead="empty", arrowtail="none"];
diff --git a/tests/pyreverse/data/classes_No_Name.html b/tests/pyreverse/data/classes_No_Name.html
index 602f2e3b7..bed9a8d14 100644
--- a/tests/pyreverse/data/classes_No_Name.html
+++ b/tests/pyreverse/data/classes_No_Name.html
@@ -26,6 +26,10 @@
get_value()*
set_value(value)*
}
+ class NullablePatterns {
+ return_nullable_1()* int | None
+ return_nullable_2()* Optional[int]
+ }
class PropertyPatterns {
prop1
prop2
@@ -44,7 +48,7 @@
DoNothing --* Ancestor : cls_member
DoNothing --* Specialization : relation
DoNothing2 --o Specialization : relation2
-
+