diff --git a/src/diagrams/class/svgDraw.js b/src/diagrams/class/svgDraw.js index d9cd52161..353e20130 100644 --- a/src/diagrams/class/svgDraw.js +++ b/src/diagrams/class/svgDraw.js @@ -274,7 +274,7 @@ export const drawClass = function (elem, classDef, conf) { }; export const parseMember = function (text) { - const fieldRegEx = /^(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+) *(\*|\$)?$/; + const fieldRegEx = /^(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+) *(\$)?$/; const methodRegEx = /^([+|\-|~|#])?(\w+) *\( *(.*)\) *(\*|\$)? *(\w*[~|[\]]*\s*\w*~?)$/; let fieldMatch = text.match(fieldRegEx); diff --git a/src/diagrams/class/svgDraw.spec.js b/src/diagrams/class/svgDraw.spec.js index 6d4571b12..ae5882349 100644 --- a/src/diagrams/class/svgDraw.spec.js +++ b/src/diagrams/class/svgDraw.spec.js @@ -51,7 +51,7 @@ describe('class member Renderer, ', function () { expect(actual.cssStyle).toBe(''); }); - it('should handle abstract classifier', function () { + it('should handle abstract method classifier', function () { const str = 'foo()*'; let actual = svgDraw.parseMember(str); @@ -59,7 +59,7 @@ describe('class member Renderer, ', function () { expect(actual.cssStyle).toBe('font-style:italic;'); }); - it('should handle static classifier', function () { + it('should handle static method classifier', function () { const str = 'foo()$'; let actual = svgDraw.parseMember(str); @@ -157,15 +157,7 @@ describe('class member Renderer, ', function () { expect(actual.cssStyle).toBe(''); }); - it('should handle abstract classifier', function () { - const str = 'String foo*'; - let actual = svgDraw.parseMember(str); - - expect(actual.displayText).toBe('String foo'); - expect(actual.cssStyle).toBe('font-style:italic;'); - }); - - it('should handle static classifier', function () { + it('should handle static field classifier', function () { const str = 'String foo$'; let actual = svgDraw.parseMember(str);