handles tuple diagram gen with sequence of primitives fields (#947)

Initially, tuple type whose fields are sequence of primitives generate the wrong plantuml diagram. This PR fixes that.
anz-bank · Jul 10, 2020 · 3139d28 · 3139d28
1 parent 5b55656
commit 3139d28
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/pkg/datamodeldiagram/datamodelview.go b/pkg/datamodeldiagram/datamodelview.go
@@ -308,6 +308,8 @@ func (v *DataModelView) DrawTuple(
 						Count:        1,
 					}
 				}
+			} else {
+				v.StringBuilder.WriteString(collectionString)
 			}
 		} else {
 			v.StringBuilder.WriteString(fmt.Sprintf("+ %s : %s\n", attrName, strings.ToLower(attrType.GetPrimitive().String())))

diff --git a/pkg/datamodeldiagram/datamodelview_test.go b/pkg/datamodeldiagram/datamodelview_test.go
@@ -97,4 +97,32 @@ func TestDrawTuple(t *testing.T) {
 			)
 		},
 	)
+
+	assertDraw(t,
+		`class "typeName" as _0 << (D,orchid) >> {
++ attr1 : **Sequence <string>**
++ attr2 : **Set <int>**
++ attr3 : **List <bool>**
+}
+`,
+		"typeName",
+		func(v *DataModelView, relationshipMap map[string]map[string]RelationshipParam) {
+			v.DrawTuple(
+				EntityViewParam{
+					EntityColor:  "orchid",
+					EntityHeader: "D",
+					EntityName:   "typeName",
+					EntityAlias:  "",
+				},
+				syslwrapper.MakeTuple(
+					map[string]*sysl.Type{
+						"attr1": syslwrapper.MakeSequence(syslwrapper.MakePrimitive("string")),
+						"attr2": syslwrapper.MakeSet(syslwrapper.MakePrimitive("int")),
+						"attr3": syslwrapper.MakeList(syslwrapper.MakePrimitive("bool")),
+					},
+				).Type.(*sysl.Type_Tuple_).Tuple,
+				relationshipMap,
+			)
+		},
+	)
 }
diff --git a/pkg/syslwrapper/test_helper.go b/pkg/syslwrapper/test_helper.go
@@ -209,6 +209,14 @@ func MakeSet(setType *sysl.Type) *sysl.Type {
 	}
 }
 
+func MakeSequence(seqType *sysl.Type) *sysl.Type {
+	return &sysl.Type{
+		Type: &sysl.Type_Sequence{
+			Sequence: seqType,
+		},
+	}
+}
+
 func MakeNoType() *sysl.Type {
 	return &sysl.Type{
 		Type: &sysl.Type_NoType_{