Adding upstream version 1.2+20240521.upstream/1.2+20240521upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 137 insertions, 0 deletions

diff --git a/tests/inputs/nested/nested.json b/tests/inputs/nested/nested.json
new file mode 100644
index 0000000..f460cad
--- /dev/null
+++ b/tests/inputs/nested/nested.json
@@ -0,0 +1,7 @@
+{
+  "nested": {
+    "count": 150
+  },
+  "sibling": {},
+  "msg": "THIS"
+}
diff --git a/tests/inputs/nested/nested.proto b/tests/inputs/nested/nested.proto
new file mode 100644
index 0000000..619c721
--- /dev/null
+++ b/tests/inputs/nested/nested.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package nested;
+
+// A test message with a nested message inside of it.
+message Test {
+    // This is the nested type.
+    message Nested {
+        // Stores a simple counter.
+        int32 count = 1;
+    }
+    // This is the nested enum.
+    enum Msg {
+        NONE = 0;
+        THIS = 1;
+    }
+
+    Nested nested = 1;
+    Sibling sibling = 2;
+    Sibling sibling2 = 3;
+    Msg msg = 4;
+}
+
+message Sibling {
+  int32 foo = 1;
+}
\ No newline at end of file
diff --git a/tests/inputs/nested2/nested2.proto b/tests/inputs/nested2/nested2.proto
new file mode 100644
index 0000000..cd6510c
--- /dev/null
+++ b/tests/inputs/nested2/nested2.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package nested2;
+
+import "package.proto";
+
+message Game {
+    message Player {
+        enum Race {
+            human = 0;
+            orc = 1;
+        }
+    }
+}
+
+message Test {
+    Game game = 1;
+    Game.Player GamePlayer = 2;
+    Game.Player.Race GamePlayerRace = 3;
+    equipment.Weapon Weapon = 4;
+}
\ No newline at end of file
diff --git a/tests/inputs/nested2/package.proto b/tests/inputs/nested2/package.proto
new file mode 100644
index 0000000..e12abb1
--- /dev/null
+++ b/tests/inputs/nested2/package.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package nested2.equipment;
+
+message Weapon {
+
+}
\ No newline at end of file
diff --git a/tests/inputs/nestedtwice/nestedtwice.json b/tests/inputs/nestedtwice/nestedtwice.json
new file mode 100644
index 0000000..c953132
--- /dev/null
+++ b/tests/inputs/nestedtwice/nestedtwice.json
@@ -0,0 +1,11 @@
+{
+  "top": {
+    "name": "double-nested",
+    "middle": {
+      "bottom": [{"foo": "hello"}],
+      "enumBottom": ["A"],
+      "topMiddleBottom": [{"a": "hello"}],
+      "bar": true
+    }
+  }
+}
diff --git a/tests/inputs/nestedtwice/nestedtwice.proto b/tests/inputs/nestedtwice/nestedtwice.proto
new file mode 100644
index 0000000..84d142a
--- /dev/null
+++ b/tests/inputs/nestedtwice/nestedtwice.proto
@@ -0,0 +1,40 @@
+syntax = "proto3";
+
+package nestedtwice;
+
+/* Test doc. */
+message Test {
+  /* Top doc. */
+  message Top {
+    /* Middle doc. */
+    message Middle {
+      /* TopMiddleBottom doc.*/
+      message TopMiddleBottom {
+        // TopMiddleBottom.a doc.
+        string a = 1;
+      }
+      /* EnumBottom doc. */
+      enum EnumBottom{
+        /* EnumBottom.A doc. */
+        A = 0;
+        B = 1;
+      }
+      /* Bottom doc. */
+      message Bottom {
+        /* Bottom.foo doc. */
+        string foo = 1;
+      }
+      reserved 1;
+      /* Middle.bottom doc. */
+      repeated Bottom bottom = 2;
+      repeated EnumBottom enumBottom=3;
+      repeated TopMiddleBottom topMiddleBottom=4;
+      bool bar = 5;
+    }
+    /* Top.name doc. */
+    string name = 1;
+    Middle middle = 2;
+  }
+  /* Test.top doc. */
+  Top top = 1;
+}
diff --git a/tests/inputs/nestedtwice/test_nestedtwice.py b/tests/inputs/nestedtwice/test_nestedtwice.py
new file mode 100644
index 0000000..502e710
--- /dev/null
+++ b/tests/inputs/nestedtwice/test_nestedtwice.py
@@ -0,0 +1,25 @@
+import pytest
+
+from tests.output_aristaproto.nestedtwice import (
+    Test,
+    TestTop,
+    TestTopMiddle,
+    TestTopMiddleBottom,
+    TestTopMiddleEnumBottom,
+    TestTopMiddleTopMiddleBottom,
+)
+
+
+@pytest.mark.parametrize(
+    ("cls", "expected_comment"),
+    [
+        (Test, "Test doc."),
+        (TestTopMiddleEnumBottom, "EnumBottom doc."),
+        (TestTop, "Top doc."),
+        (TestTopMiddle, "Middle doc."),
+        (TestTopMiddleTopMiddleBottom, "TopMiddleBottom doc."),
+        (TestTopMiddleBottom, "Bottom doc."),
+    ],
+)
+def test_comment(cls, expected_comment):
+    assert cls.__doc__ == expected_comment