add more tests

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
openhab · May 6, 2024 · 725e626 · 725e626
1 parent 4b71453
commit 725e626
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/bundles/org.openhab.ui/web/src/assets/sitemap-lexer.nearley b/bundles/org.openhab.ui/web/src/assets/sitemap-lexer.nearley
@@ -44,7 +44,7 @@
     comma:            ',',
     colon:            ':',
     hyphen:           '-',
-    number:           /-?[0-9]+(?:\.[0-9]*)?/,
+    number:           /[+-]?[0-9]+(?:\.[0-9]*)?/,
     string:           { match: /"(?:\\["\\]|[^\n"\\])*"/, value: x => x.slice(1, -1) }
   })
   const requiresItem = ['Group', 'Chart', 'Switch', 'Mapview', 'Slider', 'Selection', 'Setpoint', 'Input ', 'Colorpicker', 'Default']

diff --git a/...les/org.openhab.ui/web/src/components/pagedesigner/sitemap/__tests__/dslUtil_jest.spec.js b/...les/org.openhab.ui/web/src/components/pagedesigner/sitemap/__tests__/dslUtil_jest.spec.js
@@ -113,9 +113,9 @@ describe('dslUtil', () => {
       mappings: [
         '1=Morning',
         '2=Evening',
-        '10=Cinéma',
+        '10="Cinéma"',
         '11=TV',
-        '3=Bed time',
+        '3="Bed time"',
         '4=Night=moon'
       ]
     })
@@ -132,9 +132,9 @@ describe('dslUtil', () => {
       buttons: [
         { row: 1, column: 1, command: '1=Morning' },
         { row: 1, column: 2, command: '2=Evening' },
-        { row: 1, column: 3, command: '10=Cinéma' },
+        { row: 1, column: 3, command: '10="Cinéma"' },
         { row: 2, column: 1, command: '11=TV' },
-        { row: 2, column: 2, command: '3=Bed time' },
+        { row: 2, column: 2, command: '3="Bed time"' },
         { row: 2, column: 3, command: '4=Night=moon' }
       ]
     })
@@ -149,15 +149,39 @@ describe('dslUtil', () => {
     addWidget(component, 'Selection', {
       item: 'Echos',
       mappings: [
-        'EchoDot1=Echo 1',
-        'EchoDot2=Echo 2',
-        'EchoDot1,EchoDot2=Alle'
+        'EchoDot1="Echo 1"',
+        'EchoDot2="Echo 2"',
+        '"EchoDot1,EchoDot2"=Alle'
       ]
     })
     const sitemap = dslUtil.toDsl(component).split('\n')
     expect(sitemap[1]).toEqual('    Selection item=Echos mappings=[EchoDot1="Echo 1", EchoDot2="Echo 2", "EchoDot1,EchoDot2"=Alle]')
   })
 
+  it('renders a widget with mappings and release command correctly', () => {
+    const component = createSitemapComponent('test', 'Test')
+    const widget = {
+    }
+    addWidget(component, 'Switch', {
+      item: 'pressAndRelease',
+      mappings: ['ON:OFF=ON']
+    })
+    const sitemap = dslUtil.toDsl(component).split('\n')
+    expect(sitemap[1]).toEqual('    Switch item=pressAndRelease mappings=[ON:OFF=ON]')
+  })
+
+  it('renders a widget with mappings and release command and string commands correctly', () => {
+    const component = createSitemapComponent('test', 'Test')
+    const widget = {
+    }
+    addWidget(component, 'Switch', {
+      item: 'pressAndRelease',
+      mappings: ['"ON command":"OFF command"="ON"']
+    })
+    const sitemap = dslUtil.toDsl(component).split('\n')
+    expect(sitemap[1]).toEqual('    Switch item=pressAndRelease mappings=["ON command":"OFF command"="ON"]')
+  })
+
   it('renders a widget with 0 value parameter correctly', () => {
     const component = createSitemapComponent('test', 'Test')
     const widget = {