merge #863 tests part

Author: ebroecker

tests/createTestFdMatrix.py

@@ -4,24 +4,30 @@
 import sys
 sys.path.append('..')
 
-import canmatrix
+# import canmatrix
+from canmatrix.Frame import Frame
+from canmatrix.Signal import Signal
+from canmatrix.Ecu import Ecu
+from canmatrix.CanMatrix import CanMatrix
+
+
 #
 # create target Matrix
 #
 
-db = canmatrix.CanMatrix()
+db = CanMatrix()
 
-db.ecus.add(canmatrix.Ecu("testBU"))
-db.ecus.add(canmatrix.Ecu("recBU"))
+db.ecus.add(Ecu("testBU"))
+db.ecus.add(Ecu("recBU"))
 
-myFrame1 = canmatrix.Frame("canFdStandard1",Id=1,  dlc=24, is_fd = True, transmitter=["testBU"])
-myFrame2 = canmatrix.Frame("CanFdExtended2",Id=2,  dlc=16, extended = True, is_fd = True, transmitter=["testBU"])
-myFrame3 = canmatrix.Frame("CanExtended3", Id=3, dlc=8, extended = True, transmitter=["testBU"])
-myFrame4 = canmatrix.Frame("CanStandard4", Id=4,  dlc=8)
+myFrame1 = Frame("canFdStandard1",Id=1,  dlc=24, is_fd = True, transmitter=["testBU"])
+myFrame2 = Frame("CanFdExtended2",Id=2,  dlc=16, extended = True, is_fd = True, transmitter=["testBU"])
+myFrame3 = Frame("CanExtended3", Id=3, dlc=8, extended = True, transmitter=["testBU"])
+myFrame4 = Frame("CanStandard4", Id=4,  dlc=8)
 
-mySignal1 = canmatrix.Signal("signal1", signalSize=64, startBit=0, is_little_endian=True, min=0, max=0, is_signed=True, receiver=["recBU"])
-mySignal2 = canmatrix.Signal("signal2", signalSize=64, startBit=64, is_little_endian=True, min=0, max=0, is_signed=True, receiver=["recBU"])
-mySignal3 = canmatrix.Signal("signal3", signalSize=64, startBit=128, is_little_endian=True, min=0, max=0, is_signed=True)
+mySignal1 = Signal("signal1", signalSize=64, startBit=0, is_little_endian=True, min=0, max=0, is_signed=True, receiver=["recBU"])
+mySignal2 = Signal("signal2", signalSize=64, startBit=64, is_little_endian=True, min=0, max=0, is_signed=True, receiver=["recBU"])
+mySignal3 = Signal("signal3", signalSize=64, startBit=128, is_little_endian=True, min=0, max=0, is_signed=True)
 
 myFrame1.add_signal(mySignal3)
 myFrame1.add_signal(mySignal2)

tests/createTestMatrix.py

@@ -5,7 +5,7 @@
 sys.path.append('..')
 
 import canmatrix.formats
-from canmatrix.canmatrix import *
+# from canmatrix.canmatrix import *
 #
 # create target Matrix
 #

tests/test_arxml.py

@@ -9,7 +9,7 @@
 
 
 def test_ecu_extract():
-    test_file = "tests/files/arxml/MyECU.ecuc.arxml"
+    test_file = "../tests/files/arxml/MyECU.ecuc.arxml"
     db = canmatrix.formats.arxml.load(test_file)['']
     assert db.frames is not None
     assert len(db.frames) == 2
@@ -18,7 +18,7 @@ def test_ecu_extract():
 
 
 def test_get_signals_from_container_i_pdu():
-    test_file = "tests/files/arxml/ARXMLContainerTest.arxml"
+    test_file = "../tests/files/arxml/ARXMLContainerTest.arxml"
     matrix = canmatrix.formats.arxml.load(test_file)
     assert matrix["New_CanCluster"].frames[0].signals[0].name == 'Header_ID'
     assert matrix["New_CanCluster"].frames[0].signals[1].name == 'Header_DLC'
@@ -28,20 +28,20 @@ def test_get_signals_from_container_i_pdu():
 
 
 def test_get_signals_from_secured_pdu():
-    test_file = "tests/files/arxml/ARXMLSecuredPDUTest.arxml"
+    test_file = "../tests/files/arxml/ARXMLSecuredPDUTest.arxml"
     matrix = canmatrix.formats.arxml.load(test_file)
     assert matrix["CAN"].frames[0].signals[0].name == 'someTestSignal'
     assert matrix["CAN"].frames[0].signals[1].name == 'Signal'
 
 
 def test_min_max():
-    test_file = "tests/files/arxml/ARXML_min_max.arxml"
+    test_file = "../tests/files/arxml/ARXML_min_max.arxml"
     matrix = canmatrix.formats.arxml.load(test_file)
     assert matrix["New_CanCluster"].frames[0].signals[0].is_signed is False
 
 
 def test_decode_compu_method_1():
-    test_file = "tests/files/arxml/ARXMLCompuMethod1.arxml"
+    test_file = "../tests/files/arxml/ARXMLCompuMethod1.arxml"
     ea = canmatrix.formats.arxml.Earxml()
     ea.open(test_file)
     compu_method = ea.find("COMPU-METHOD")

tests/test_canmatrix.py

@@ -4,11 +4,19 @@
 import pytest
 from builtins import *
 
-import canmatrix.canmatrix
+from canmatrix.CanMatrix import CanMatrix
+from canmatrix.Signal import Signal
+from canmatrix.Frame import Frame
+from canmatrix.ArbitrationId import ArbitrationId
+from canmatrix.Ecu import Ecu
+
+@pytest.fixture
+def empty_frame():
+    return Frame(name="test_frame")
 
 
 def test_signal_defaults_to_decimal():
-    signal = canmatrix.canmatrix.Signal(
+    signal = Signal(
         offset=4,
         factor=2,
     )
@@ -910,10 +918,10 @@ def test_arbitration_id_j1939_direct_setters():
     assert arb_id.j1939_priority == 3
 
 def test_arbitration_id_comparators():
-    id_standard_1 = canmatrix.ArbitrationId(id=0x1, extended=False)
-    id_standard_2 = canmatrix.ArbitrationId(id=0x2, extended=False)
-    id_extended_1 = canmatrix.ArbitrationId(id=0x1, extended=True)
-    id_extended_2 = canmatrix.ArbitrationId(id=0x2, extended=True)
+    id_standard_1 = ArbitrationId(id=0x1, extended=False)
+    id_standard_2 = ArbitrationId(id=0x2, extended=False)
+    id_extended_1 = ArbitrationId(id=0x1, extended=True)
+    id_extended_2 = ArbitrationId(id=0x2, extended=True)
 
     sorting_results = sorted((
         id_extended_1, id_standard_2, id_extended_2, id_standard_1))
@@ -924,7 +932,7 @@ def test_arbitration_id_comparators():
 
 @pytest.fixture
 def empty_matrix():
-    return canmatrix.CanMatrix()
+    return CanMatrix()
 
 
 def test_canmatrix_add_attribure(empty_matrix):
@@ -934,7 +942,7 @@ def test_canmatrix_add_attribure(empty_matrix):
 
 def test_canmatrix_get_frame_by_glob(empty_matrix, empty_frame):
     empty_matrix.add_frame(empty_frame)
-    f2 = canmatrix.Frame(name="nm_osek_esp")
+    f2 = Frame(name="nm_osek_esp")
     empty_matrix.add_frame(f2)
     assert empty_matrix.glob_frames("*osek*") == [f2]
 
@@ -948,6 +956,7 @@ def test_canmatrix_get_frame_by_wrong_name(empty_matrix, empty_frame):
     empty_matrix.add_frame(empty_frame)
     assert empty_matrix.frame_by_name("wrong") is None
 
+
 def test_canmatrix_get_frame_by_pgn(empty_matrix, empty_frame):
     empty_frame.arbitration_id.id = 0xA123456
     empty_frame.arbitration_id.extended = True
@@ -968,29 +977,29 @@ def test_canmatrix_iterate_over_frames(empty_matrix, empty_frame):
 
 def test_canmatrix_remove_frame(empty_matrix, empty_frame):
     empty_matrix.add_frame(empty_frame)
-    empty_matrix.add_frame(canmatrix.Frame())
+    empty_matrix.add_frame(Frame())
     empty_matrix.remove_frame(empty_frame)
     assert len(empty_matrix.frames) == 1
 
 
 def test_canmatrix_rename_ecu_by_name(empty_matrix):
-    ecu = canmatrix.Ecu(name="old_name")
+    ecu = Ecu(name="old_name")
     empty_matrix.add_ecu(ecu)
     empty_matrix.rename_ecu("old_name", "new name")
     assert ecu.name == "new name"
 
 
 def test_canmatrix_rename_ecu_by_wrong_name(empty_matrix):
-    ecu = canmatrix.Ecu(name="old_name")
+    ecu = Ecu(name="old_name")
     empty_matrix.add_ecu(ecu)
     empty_matrix.rename_ecu("wrong", "new name")
     assert ecu.name == "old_name"
 
 
 def test_canmatrix_rename_ecu_check_frame(empty_matrix):
-    ecu = canmatrix.Ecu(name="old_name")
-    frame = canmatrix.Frame(name="test_frame")
-    signal = canmatrix.Signal(name="test_signal")
+    ecu = Ecu(name="old_name")
+    frame = Frame(name="test_frame")
+    signal = Signal(name="test_signal")
     signal.add_receiver("old_name")
     frame.add_signal(signal)
     frame.update_receiver()
@@ -1003,19 +1012,19 @@ def test_canmatrix_rename_ecu_check_frame(empty_matrix):
     assert "new_name" in frame.receivers
 
 def test_canmatrix_rename_ecu_by_instance(empty_matrix):
-    ecu = canmatrix.Ecu(name="old_name")
+    ecu = Ecu(name="old_name")
     empty_matrix.add_ecu(ecu)
     empty_matrix.rename_ecu(ecu, "new name")
     assert ecu.name == "new name"
 
 
 def test_canmatrix_del_ecu_by_glob(empty_matrix):
-    ecu1 = canmatrix.Ecu(name="ecu1")
-    ecu2 = canmatrix.Ecu(name="ecu2")
-    frame = canmatrix.Frame(transmitters=["ecu2", "ecu3"])
+    ecu1 = Ecu(name="ecu1")
+    ecu2 = Ecu(name="ecu2")
+    frame = Frame(transmitters=["ecu2", "ecu3"])
     empty_matrix.add_ecu(ecu1)
     empty_matrix.add_ecu(ecu2)
-    frame.add_signal(canmatrix.Signal(receivers=["ecu1", "ecu2"]))
+    frame.add_signal(Signal(receivers=["ecu1", "ecu2"]))
     empty_matrix.add_frame(frame)
     empty_matrix.del_ecu("*2")
     assert empty_matrix.ecus == [ecu1]
@@ -1024,19 +1033,19 @@ def test_canmatrix_del_ecu_by_glob(empty_matrix):
 
 
 def test_canmatrix_del_ecu_by_instance(empty_matrix):
-    ecu1 = canmatrix.Ecu(name="ecu1")
-    ecu2 = canmatrix.Ecu(name="ecu2")
+    ecu1 = Ecu(name="ecu1")
+    ecu2 = Ecu(name="ecu2")
     empty_matrix.add_ecu(ecu1)
     empty_matrix.add_ecu(ecu2)
     empty_matrix.del_ecu(ecu1)
     assert empty_matrix.ecus == [ecu2]
 
 
 def test_canmatrix_del_obsolete_ecus(empty_matrix):
-    empty_matrix.add_ecu(canmatrix.Ecu(name="Ecu1"))
-    empty_matrix.add_ecu(canmatrix.Ecu(name="Ecu2"))
-    frame1 = canmatrix.Frame(name="frame1", transmitters=["Ecu1"])
-    frame1.add_signal(canmatrix.Signal("signal1", receivers=["Ecu2"]))
+    empty_matrix.add_ecu(Ecu(name="Ecu1"))
+    empty_matrix.add_ecu(Ecu(name="Ecu2"))
+    frame1 = Frame(name="frame1", transmitters=["Ecu1"])
+    frame1.add_signal(Signal("signal1", receivers=["Ecu2"]))
     empty_matrix.add_frame(frame1)
     empty_matrix.delete_obsolete_ecus()
     assert "Ecu1" in [ecu.name for ecu in empty_matrix.ecus]
@@ -1048,7 +1057,7 @@ def test_canmatrix_del_obsolete_ecus(empty_matrix):
 
 
 def test_canmatrix_rename_frame_by_name(empty_matrix):
-    f = canmatrix.Frame(name="F1")
+    f = Frame(name="F1")
     empty_matrix.add_frame(f)
     empty_matrix.rename_frame("F1", "F2")
     assert f.name == "F2"
@@ -1063,15 +1072,15 @@ def test_canmatrix_rename_frame_by_name(empty_matrix):
 
 
 def test_canmatrix_rename_frame_by_instance(empty_matrix):
-    f = canmatrix.Frame(name="F1")
+    f = Frame(name="F1")
     empty_matrix.add_frame(f)
     empty_matrix.rename_frame(f, "F2")
     assert f.name == "F2"
 
 
 def test_canmatrix_del_frame_by_name(empty_matrix):
-    f1 = canmatrix.Frame(name="F1")
-    f2 = canmatrix.Frame(name="F2")
+    f1 = Frame(name="F1")
+    f2 = Frame(name="F2")
     empty_matrix.add_frame(f1)
     empty_matrix.add_frame(f2)
     empty_matrix.del_frame("F1")
@@ -1080,17 +1089,17 @@ def test_canmatrix_del_frame_by_name(empty_matrix):
 
 
 def test_canmatrix_del_frame_by_instance(empty_matrix):
-    f1 = canmatrix.Frame(name="F1")
-    f2 = canmatrix.Frame(name="F2")
+    f1 = Frame(name="F1")
+    f2 = Frame(name="F2")
     empty_matrix.add_frame(f1)
     empty_matrix.add_frame(f2)
     empty_matrix.del_frame(f1)
     assert empty_matrix.frames == [f2]
 
 def test_effective_cycle_time():
-    frame = canmatrix.Frame()
-    sig1 = canmatrix.Signal(name = "s1", cycle_time=1)
-    sig2 = canmatrix.Signal(name = "s2", cycle_time=0)
+    frame = Frame()
+    sig1 = Signal(name = "s1", cycle_time=1)
+    sig2 = Signal(name = "s2", cycle_time=0)
     frame.add_signal(sig1)
     frame.add_signal(sig2)
     assert frame.effective_cycle_time == 1
@@ -1113,30 +1122,30 @@ def test_effective_cycle_time():
     assert frame.effective_cycle_time == 0
 
 def test_baudrate():
-    cm = canmatrix.CanMatrix()
+    cm = CanMatrix()
     cm.baudrate = 500000
     assert cm.baudrate == 500000
     cm.fd_baudrate = 1000000
     assert cm.fd_baudrate == 1000000
 
 def test_frame_compress():
-    frame = canmatrix.Frame("my_frame", size=8)
-    frame.add_signal(canmatrix.Signal(name = "Sig1", start_bit = 2, size = 13, is_little_endian=False ))
-    frame.add_signal(canmatrix.Signal(name = "Sig2", start_bit = 17, size = 14, is_little_endian=False))
-    frame.add_signal(canmatrix.Signal(name = "Sig3", start_bit = 35, size = 6, is_little_endian=False))
-    frame.add_signal(canmatrix.Signal(name = "Sig4", start_bit = 49, size = 8, is_little_endian=False))
+    frame = Frame("my_frame", size=8)
+    frame.add_signal(Signal(name = "Sig1", start_bit = 2, size = 13, is_little_endian=False ))
+    frame.add_signal(Signal(name = "Sig2", start_bit = 17, size = 14, is_little_endian=False))
+    frame.add_signal(Signal(name = "Sig3", start_bit = 35, size = 6, is_little_endian=False))
+    frame.add_signal(Signal(name = "Sig4", start_bit = 49, size = 8, is_little_endian=False))
     frame.compress()
     assert frame.signal_by_name("Sig1").start_bit == 0
     assert frame.signal_by_name("Sig2").start_bit == 13
     assert frame.signal_by_name("Sig3").start_bit == 27
     assert frame.signal_by_name("Sig4").start_bit == 33
 
-    frame = canmatrix.Frame("my_frame", size=8)
+    frame = Frame("my_frame", size=8)
     # some signals overlap!
-    frame.add_signal(canmatrix.Signal(name = "Sig1", start_bit = 12, size = 12, is_little_endian=True))
-    frame.add_signal(canmatrix.Signal(name = "Sig2", start_bit = 17, size = 9, is_little_endian=True))
-    frame.add_signal(canmatrix.Signal(name = "Sig3", start_bit = 33, size = 5, is_little_endian=True))
-    frame.add_signal(canmatrix.Signal(name = "Sig4", start_bit = 48, size = 9, is_little_endian=True))
+    frame.add_signal(Signal(name = "Sig1", start_bit = 12, size = 12, is_little_endian=True))
+    frame.add_signal(Signal(name = "Sig2", start_bit = 17, size = 9, is_little_endian=True))
+    frame.add_signal(Signal(name = "Sig3", start_bit = 33, size = 5, is_little_endian=True))
+    frame.add_signal(Signal(name = "Sig4", start_bit = 48, size = 9, is_little_endian=True))
     frame.compress()
     assert frame.signal_by_name("Sig1").start_bit == 0
     assert frame.signal_by_name("Sig2").start_bit == 12

tests/test_cli_compare.py

@@ -5,6 +5,10 @@
 import pytest
 
 import canmatrix.formats
+from canmatrix.utils import arbitration_id_converter
+from canmatrix.CanMatrix import CanMatrix
+from canmatrix.Signal import Signal
+from canmatrix.Frame import Frame
 
 try:
     from pathlib import Path
@@ -44,8 +48,8 @@ def create_dbc():
     outFile1 = tmp_dir + "/output_cli_compare_tmpa.dbc"
     outFile2 = tmp_dir + "/output_cli_compare_tmpb.dbc"
 
-    myFrame = canmatrix.Frame("testFrame3", arbitration_id=canmatrix.arbitration_id_converter(0x124), size=8, transmitters=["testBU"])
-    mySignal = canmatrix.Signal("someTestSignal",
+    myFrame = Frame("testFrame3", arbitration_id=arbitration_id_converter(0x124), size=8, transmitters=["testBU"])
+    mySignal = Signal("someTestSignal",
                       size=11,
                       is_little_endian=False,
                       is_signed=False,
@@ -56,7 +60,7 @@ def create_dbc():
                       receivers=["recBU"])
     myFrame.add_signal(mySignal)
     mySignal.add_values(1, "one")
-    db = canmatrix.CanMatrix()
+    db = CanMatrix()
     db.add_frame(myFrame)
     canmatrix.formats.dumpp({"": db}, outFile1, dbcExportEncoding='iso-8859-1',
                             dbcExportCommentEncoding='iso-8859-1')