fixed tests for None reserved commands, and mode_int -> mode

Brendan Whitfield · Brendan Whitfield · commit 2b58457b8598 · 2016-06-29T23:05:57.000-04:00
diff --git a/obd/OBDCommand.py b/obd/OBDCommand.py
@@ -65,14 +65,14 @@ def clone(self):
                           self.fast)
 
     @property
-    def mode_int(self):
+    def mode(self):
         if len(self.command) >= 2:
             return unhex(self.command[:2])
         else:
             return 0
 
     @property
-    def pid_int(self):
+    def pid(self):
         if len(self.command) > 2:
             return unhex(self.command[2:])
         else:
diff --git a/obd/commands.py b/obd/commands.py
@@ -382,10 +382,15 @@ def base_commands(self):
     def pid_getters(self):
         """ returns a list of PID GET commands """
         getters = []
-        for m in self.modes:
-            for c in m:
-                if c.decode == pid: # GET commands have a special decoder
-                    getters.append(c)
+        for mode in self.modes:
+            for cmd in mode:
+
+                if cmd is None:
+                    continue # this command is reserved
+
+                if cmd.decode == pid: # GET commands have a special decoder
+                    getters.append(cmd)
+
         return getters
 
 
diff --git a/obd/obd.py b/obd/obd.py
@@ -120,8 +120,8 @@ def __load_commands(self):
             for i in range(len(supported)):
                 if supported[i] == "1":
 
-                    mode = get.mode_int
-                    pid  = get.pid_int + i + 1
+                    mode = get.mode
+                    pid  = get.pid + i + 1
 
                     if commands.has_pid(mode, pid):
                         self.supported_commands.add(commands[mode][pid])
diff --git a/tests/test_OBDCommand.py b/tests/test_OBDCommand.py
@@ -19,8 +19,8 @@ def test_constructor():
     assert cmd.ecu       == ECU.ENGINE
     assert cmd.fast      == False
 
-    assert cmd.mode_int == 1
-    assert cmd.pid_int  == 35
+    assert cmd.mode == 1
+    assert cmd.pid  == 35
 
     # a case where "fast", and "supported" were set explicitly
     #                 name       description        cmd  bytes decoder ECU         fast
@@ -67,18 +67,18 @@ def test_call():
 
 
 
-def test_get_mode_int():
+def test_get_mode():
     cmd = OBDCommand("", "", "0123", 4, noop, ECU.ENGINE)
-    assert cmd.mode_int == 0x01
+    assert cmd.mode == 0x01
 
     cmd = OBDCommand("", "", "", "23", 4, noop, ECU.ENGINE)
-    assert cmd.mode_int == 0
+    assert cmd.mode == 0
 
 
 
-def test_pid_int():
+def test_pid():
     cmd = OBDCommand("", "", "0123", 4, noop, ECU.ENGINE)
-    assert cmd.pid_int == 0x23
+    assert cmd.pid == 0x23
 
     cmd = OBDCommand("", "", "01", 4, noop, ECU.ENGINE)
-    assert cmd.pid_int == 0
+    assert cmd.pid == 0
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -7,11 +7,14 @@ def test_list_integrity():
     for mode, cmds in enumerate(obd.commands.modes):
         for pid, cmd in enumerate(cmds):
 
+            if cmd is None:
+                continue # this command is reserved
+
             assert cmd.command != "",         "The Command's command string must not be null"
 
             # make sure the command tables are in mode & PID order
-            assert mode == cmd.mode_int,      "Command is in the wrong mode list: %s" % cmd.name
-            assert pid == cmd.pid_int,        "The index in the list must also be the PID: %s" % cmd.name
+            assert mode == cmd.mode,      "Command is in the wrong mode list: %s" % cmd.name
+            assert pid == cmd.pid,        "The index in the list must also be the PID: %s" % cmd.name
 
             # make sure all the fields are set
             assert cmd.name != "",                  "Command names must not be null"
@@ -30,6 +33,10 @@ def test_unique_names():
 
     for cmds in obd.commands.modes:
         for cmd in cmds:
+
+            if cmd is None:
+                continue # this command is reserved
+
             assert not names.__contains__(cmd.name), "Two commands share the same name: %s" % cmd.name
             names[cmd.name] = True
 
@@ -39,9 +46,12 @@ def test_getitem():
     for cmds in obd.commands.modes:
         for cmd in cmds:
 
+            if cmd is None:
+                continue # this command is reserved
+
             # by [mode][pid]
-            mode = cmd.mode_int
-            pid  = cmd.pid_int
+            mode = cmd.mode
+            pid  = cmd.pid
             assert cmd == obd.commands[mode][pid], "mode %d, PID %d could not be accessed through __getitem__" % (mode, pid)
 
             # by [name]
@@ -53,12 +63,15 @@ def test_contains():
     for cmds in obd.commands.modes:
         for cmd in cmds:
 
+            if cmd is None:
+                continue # this command is reserved
+
             # by (command)
             assert obd.commands.has_command(cmd)
 
             # by (mode, pid)
-            mode = cmd.mode_int
-            pid  = cmd.pid_int
+            mode = cmd.mode
+            pid  = cmd.pid
             assert obd.commands.has_pid(mode, pid)
 
             # by (name)
@@ -78,7 +91,11 @@ def test_pid_getters():
     # ensure that all pid getters are found
     pid_getters = obd.commands.pid_getters()
 
-    for cmds in obd.commands.modes:
-        for cmd in cmds:
+    for mode in obd.commands.modes:
+        for cmd in mode:
+
+            if cmd is None:
+                continue # this command is reserved
+
             if cmd.decode == pid:
                 assert cmd in pid_getters
