Add the missing ranges so labels are usable and add a test to catch it in future

Author: peternewman

data/rdm/PidDataTest.py

@@ -51,6 +51,30 @@ def testLoad(self):
     self.assertEqual(store.ManufacturerIdToName(32767),
                      "RESERVED FOR PROTOTYPING/EXPERIMENTAL USE ONLY")
 
+  def testData(self):
+    store = PidStore.GetStore(os.environ['PIDDATA'])
+
+    self.assertIsNotNone(store)
+
+    pids = store.Pids()
+
+    # For fields (atoms) with ranges, check all labeled values are correctly
+    # within a range so they can be used
+    for pid in pids:
+      for command in (PidStore.RDM_GET,
+                      PidStore.RDM_SET,
+                      PidStore.RDM_DISCOVERY):
+        if pid.RequestSupported(command):
+          for atom in pid.GetRequest(command).GetAtoms():
+            # If we've only got labels then ranges are auto-generated
+            if atom.HasRanges() and atom.HasLabels():
+              for (label) in atom._labels:
+                self.assertTrue(
+                    atom.ValidateRawValueInRange(atom._labels[label]),
+                    "Label %s (%d) of %s not in a range in PID %s (0x%04hx)" %
+                    (label, atom._labels[label], atom.name, pid.name,
+                     pid.value))
+
 
 if __name__ == '__main__':
   unittest.main()

data/rdm/pids.proto

@@ -1770,6 +1770,10 @@ pid {
         value: 0
         label: "Root"
       }
+      range {
+        min: 0
+        max: 0
+      }
       range {
         min: 1
         max: 512
@@ -1782,6 +1786,10 @@ pid {
         value: 0
         label: "Root Device"
       }
+      range {
+        min: 0
+        max: 0
+      }
       range {
         min: 1
         max: 255
@@ -4386,6 +4394,10 @@ pid {
         value: 0
         label: "Un-set"
       }
+      range {
+        min: 0
+        max: 0
+      }
       range {
         min: 1
         max: 4294967295

python/ola/PidStore.py

@@ -273,6 +273,10 @@ def __repr__(self):
   def GetDescription(self, indent=0):
     return str(self)
 
+  @staticmethod
+  def HasLabels():
+    return False
+
   @staticmethod
   def HasRanges():
     return False
@@ -438,6 +442,9 @@ def RawValue(self, value):
     """
     return self._AccountForMultiplierPack(value)
 
+  def HasLabels(self):
+    return (len(self._labels) > 0)
+
   def HasRanges(self):
     return (len(self._ranges) > 0)