vincent/PyCNC
1
0
Fork 0
mirror of https://github.com/sinseman44/PyCNC.git synced 2026-07-16 08:37:09 +00:00
Code Issues Projects Releases Wiki Activity

rename depricated calls

Browse Source
This commit is contained in:
Nikolay Khabarov
2017-05-14 03:26:18 +03:00
parent fa10a1221c
commit 6a9657a632
4 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_coordinates.py
+31 -31
View File
@@ -14,9 +14,9 @@ class TestCoordinates(unittest.TestCase):
# constructor rounds values to 10 digits after the point
self.assertRaises(TypeError, Coordinates)
c = Coordinates(1.00000000005, 2.00000000004, -3.5000000009)
self.assertEquals(c.x, 1.0000000001)
self.assertEquals(c.y, 2.0)
self.assertEquals(c.z, -3.5000000009)
self.assertEqual(c.x, 1.0000000001)
self.assertEqual(c.y, 2.0)
self.assertEqual(c.z, -3.5000000009)
def test_zero(self):
c = Coordinates(0, 0, 0)
@@ -43,60 +43,60 @@ class TestCoordinates(unittest.TestCase):
def test_length(self):
c = Coordinates(-1, 0, 0)
self.assertEquals(c.length(), 1)
self.assertEqual(c.length(), 1)
c = Coordinates(0, 3, -4)
self.assertEquals(c.length(), 5)
self.assertEqual(c.length(), 5)
c = Coordinates(3, 4, 12)
self.assertEquals(c.length(), 13)
self.assertEqual(c.length(), 13)
def test_round(self):
# round works in another way then Python's round.
# This round() rounds digits with specified step.
c = Coordinates(1.5, -1.4, 3.05)
r = c.round(1)
self.assertEquals(r.x, 2.0)
self.assertEquals(r.y, -1.0)
self.assertEquals(r.z, 3.0)
self.assertEqual(r.x, 2.0)
self.assertEqual(r.y, -1.0)
self.assertEqual(r.z, 3.0)
r = c.round(0.25)
self.assertEquals(r.x, 1.5)
self.assertEquals(r.y, -1.5)
self.assertEquals(r.z, 3.0)
self.assertEqual(r.x, 1.5)
self.assertEqual(r.y, -1.5)
self.assertEqual(r.z, 3.0)
def test_max(self):
self.assertEquals(self.default.find_max(), max(self.default.x,
self.assertEqual(self.default.find_max(), max(self.default.x,
self.default.y,
self.default.z))
# build-in function overriding tests
def test_add(self):
r = self.default + Coordinates(1, 2, 3)
self.assertEquals(r.x, self.default.x + 1)
self.assertEquals(r.y, self.default.y + 2)
self.assertEquals(r.z, self.default.z + 3)
self.assertEqual(r.x, self.default.x + 1)
self.assertEqual(r.y, self.default.y + 2)
self.assertEqual(r.z, self.default.z + 3)
def test_sub(self):
r = self.default - Coordinates(1, 2, 3)
self.assertEquals(r.x, self.default.x - 1)
self.assertEquals(r.y, self.default.y - 2)
self.assertEquals(r.z, self.default.z - 3)
self.assertEqual(r.x, self.default.x - 1)
self.assertEqual(r.y, self.default.y - 2)
self.assertEqual(r.z, self.default.z - 3)
def test_mul(self):
r = self.default * 2
self.assertEquals(r.x, self.default.x * 2)
self.assertEquals(r.y, self.default.y * 2)
self.assertEquals(r.z, self.default.z * 2)
self.assertEqual(r.x, self.default.x * 2)
self.assertEqual(r.y, self.default.y * 2)
self.assertEqual(r.z, self.default.z * 2)
def test_div(self):
r = self.default / 2
self.assertEquals(r.x, self.default.x / 2)
self.assertEquals(r.y, self.default.y / 2)
self.assertEquals(r.z, self.default.z / 2)
self.assertEqual(r.x, self.default.x / 2)
self.assertEqual(r.y, self.default.y / 2)
self.assertEqual(r.z, self.default.z / 2)
def test_truediv(self):
r = self.default / 3.0
self.assertEquals(r.x, self.default.x / 3.0)
self.assertEquals(r.y, self.default.y / 3.0)
self.assertEquals(r.z, self.default.z / 3.0)
self.assertEqual(r.x, self.default.x / 3.0)
self.assertEqual(r.y, self.default.y / 3.0)
self.assertEqual(r.z, self.default.z / 3.0)
def test_eq(self):
a = Coordinates(self.default.x, self.default.y, self.default.z)
@@ -114,9 +114,9 @@ class TestCoordinates(unittest.TestCase):
def test_abs(self):
c = Coordinates(-1, -2.5, -99)
r = abs(c)
self.assertEquals(r.x, 1.0)
self.assertEquals(r.y, 2.5)
self.assertEquals(r.z, 99.0)
self.assertEqual(r.x, 1.0)
self.assertEqual(r.y, 2.5)
self.assertEqual(r.z, 99.0)
if __name__ == '__main__':
tests/test_gcode.py
+33 -33
View File
@@ -16,16 +16,16 @@ class TestGCode(unittest.TestCase):
# internally, let's check it.
self.assertRaises(TypeError, GCode)
gc = GCode({"X": "1", "Y": "-2", "Z":"0", "G": "1"})
self.assertEquals(gc.coordinates(self.default, 1).x, 1.0)
self.assertEquals(gc.coordinates(self.default, 1).y, -2.0)
self.assertEquals(gc.coordinates(self.default, 1).z, 0.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 1.0)
self.assertEqual(gc.coordinates(self.default, 1).y, -2.0)
self.assertEqual(gc.coordinates(self.default, 1).z, 0.0)
def test_parser(self):
gc = GCode.parse_line("G1X2Y-3Z4")
self.assertEquals(gc.command(), "G1")
self.assertEquals(gc.coordinates(self.default, 1).x, 2.0)
self.assertEquals(gc.coordinates(self.default, 1).y, -3.0)
self.assertEquals(gc.coordinates(self.default, 1).z, 4.0)
self.assertEqual(gc.command(), "G1")
self.assertEqual(gc.coordinates(self.default, 1).x, 2.0)
self.assertEqual(gc.coordinates(self.default, 1).y, -3.0)
self.assertEqual(gc.coordinates(self.default, 1).z, 4.0)
gc = GCode.parse_line("")
self.assertIsNone(gc)
@@ -34,24 +34,24 @@ class TestGCode(unittest.TestCase):
# value doesn't exist in gcode.
default = Coordinates(11, -12, 14)
gc = GCode.parse_line("G1")
self.assertEquals(gc.coordinates(default, 1).x, 11.0)
self.assertEquals(gc.coordinates(default, 1).y, -12.0)
self.assertEquals(gc.coordinates(default, 1).z, 14.0)
self.assertEqual(gc.coordinates(default, 1).x, 11.0)
self.assertEqual(gc.coordinates(default, 1).y, -12.0)
self.assertEqual(gc.coordinates(default, 1).z, 14.0)
def test_commands(self):
gc = GCode({"G": "1"})
self.assertEquals(gc.command(), "G1")
self.assertEqual(gc.command(), "G1")
gc = GCode.parse_line("M99")
self.assertEquals(gc.command(), "M99")
self.assertEqual(gc.command(), "M99")
def test_case_sensitivity(self):
gc = GCode.parse_line("m111")
self.assertEquals(gc.command(), "M111")
self.assertEqual(gc.command(), "M111")
gc = GCode.parse_line("g2X3y-4Z5")
self.assertEquals(gc.command(), "G2")
self.assertEquals(gc.coordinates(self.default, 1).x, 3.0)
self.assertEquals(gc.coordinates(self.default, 1).y, -4.0)
self.assertEquals(gc.coordinates(self.default, 1).z, 5.0)
self.assertEqual(gc.command(), "G2")
self.assertEqual(gc.coordinates(self.default, 1).x, 3.0)
self.assertEqual(gc.coordinates(self.default, 1).y, -4.0)
self.assertEqual(gc.coordinates(self.default, 1).z, 5.0)
def test_has_coordinates(self):
gc = GCode.parse_line("X2Y-3Z4")
@@ -68,22 +68,22 @@ class TestGCode(unittest.TestCase):
def test_multiply(self):
# getting coordinates could modify value be specified multiplier.
gc = GCode.parse_line("X2 Y-3 Z4")
self.assertEquals(gc.coordinates(self.default, 25.4).x, 50.8)
self.assertEquals(gc.coordinates(self.default, 2).y, -6)
self.assertEquals(gc.coordinates(self.default, 0).y, 0)
self.assertEqual(gc.coordinates(self.default, 25.4).x, 50.8)
self.assertEqual(gc.coordinates(self.default, 2).y, -6)
self.assertEqual(gc.coordinates(self.default, 0).y, 0)
def test_whitespaces(self):
gc = GCode.parse_line("X1 Y2")
self.assertEquals(gc.coordinates(self.default, 1).x, 1.0)
self.assertEquals(gc.coordinates(self.default, 1).y, 2.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 1.0)
self.assertEqual(gc.coordinates(self.default, 1).y, 2.0)
gc = GCode.parse_line("X 3 Y4")
self.assertEquals(gc.coordinates(self.default, 1).x, 3.0)
self.assertEquals(gc.coordinates(self.default, 1).y, 4.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 3.0)
self.assertEqual(gc.coordinates(self.default, 1).y, 4.0)
gc = GCode.parse_line("X 5 Y\t 6")
self.assertEquals(gc.coordinates(self.default, 1).x, 5.0)
self.assertEquals(gc.coordinates(self.default, 1).y, 6.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 5.0)
self.assertEqual(gc.coordinates(self.default, 1).y, 6.0)
gc = GCode.parse_line(" \tX\t\t \t\t7\t ")
self.assertEquals(gc.coordinates(self.default, 1).x, 7.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 7.0)
def test_errors(self):
self.assertRaises(GCodeException, GCode.parse_line, "X1X1")
@@ -100,14 +100,14 @@ class TestGCode(unittest.TestCase):
self.assertIsNone(GCode.parse_line(" \t \t ; some text"))
self.assertIsNone(GCode.parse_line("(another comment)"))
gc = GCode.parse_line("X2.5 ; end of line comment")
self.assertEquals(gc.coordinates(self.default, 1).x, 2.5)
self.assertEqual(gc.coordinates(self.default, 1).x, 2.5)
gc = GCode.parse_line("X2 Y(inline comment)7")
self.assertEquals(gc.coordinates(self.default, 1).x, 2.0)
self.assertEquals(gc.coordinates(self.default, 1).y, 7.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 2.0)
self.assertEqual(gc.coordinates(self.default, 1).y, 7.0)
gc = GCode.parse_line("X2 Y(inline comment)3 \t(one more comment) \tz4 ; multi comment test")
self.assertEquals(gc.coordinates(self.default, 1).x, 2.0)
self.assertEquals(gc.coordinates(self.default, 1).y, 3.0)
self.assertEquals(gc.coordinates(self.default, 1).z, 4.0)
self.assertEqual(gc.coordinates(self.default, 1).x, 2.0)
self.assertEqual(gc.coordinates(self.default, 1).y, 3.0)
self.assertEqual(gc.coordinates(self.default, 1).z, 4.0)
if __name__ == '__main__':
tests/test_gmachine.py
+14 -14
View File
@@ -21,27 +21,27 @@ class TestGMachine(unittest.TestCase):
m.do_command(GCode.parse_line("X1Y1Z1"))
m.reset()
m.do_command(GCode.parse_line("X3Y4Z5"))
self.assertEquals(m.position(), Coordinates(3, 4, 5))
self.assertEqual(m.position(), Coordinates(3, 4, 5))
def test_release(self):
# release homes head.
m = GMachine()
m.do_command(GCode.parse_line("X1Y2Z3"))
m.release()
self.assertEquals(m.position(), Coordinates(0, 0, 0))
self.assertEqual(m.position(), Coordinates(0, 0, 0))
def test_home(self):
m = GMachine()
m.do_command(GCode.parse_line("X1Y2Z3"))
m.home()
self.assertEquals(m.position(), Coordinates(0, 0, 0))
self.assertEqual(m.position(), Coordinates(0, 0, 0))
def test_none(self):
# GMachine must ignore None commands, since GCode.parse_line()
# returns None if no gcode found in line.
m = GMachine()
m.do_command(None)
self.assertEquals(m.position(), Coordinates(0, 0, 0))
self.assertEqual(m.position(), Coordinates(0, 0, 0))
def test_unknown(self):
# Test commands which doesn't exists
@@ -55,9 +55,9 @@ class TestGMachine(unittest.TestCase):
def test_g0_g1(self):
m = GMachine()
m.do_command(GCode.parse_line("G0X3Y2Z1"))
self.assertEquals(m.position(), Coordinates(3, 2, 1))
self.assertEqual(m.position(), Coordinates(3, 2, 1))
m.do_command(GCode.parse_line("G1X1Y2Z3"))
self.assertEquals(m.position(), Coordinates(1, 2, 3))
self.assertEqual(m.position(), Coordinates(1, 2, 3))
self.assertRaises(GMachineException,
m.do_command, GCode.parse_line("G1F-1"))
self.assertRaises(GMachineException,
@@ -81,10 +81,10 @@ class TestGMachine(unittest.TestCase):
m = GMachine()
m.do_command(GCode.parse_line("G20"))
m.do_command(GCode.parse_line("X3Y2Z1"))
self.assertEquals(m.position(), Coordinates(76.2, 50.8, 25.4))
self.assertEqual(m.position(), Coordinates(76.2, 50.8, 25.4))
m.do_command(GCode.parse_line("G21"))
m.do_command(GCode.parse_line("X3Y2Z1"))
self.assertEquals(m.position(), Coordinates(3, 2, 1))
self.assertEqual(m.position(), Coordinates(3, 2, 1))
def test_g90_g91(self):
m = GMachine()
@@ -92,26 +92,26 @@ class TestGMachine(unittest.TestCase):
m.do_command(GCode.parse_line("X1Y1Z1"))
m.do_command(GCode.parse_line("X1Y1"))
m.do_command(GCode.parse_line("X1"))
self.assertEquals(m.position(), Coordinates(3, 2, 1))
self.assertEqual(m.position(), Coordinates(3, 2, 1))
m.do_command(GCode.parse_line("X-1Y-1Z-1"))
m.do_command(GCode.parse_line("G90"))
m.do_command(GCode.parse_line("X1Y1Z1"))
self.assertEquals(m.position(), Coordinates(1, 1, 1))
self.assertEqual(m.position(), Coordinates(1, 1, 1))
def test_g90_g92(self):
m = GMachine()
m.do_command(GCode.parse_line("G92X100Y100Z100"))
m.do_command(GCode.parse_line("X101Y102Z103"))
self.assertEquals(m.position(), Coordinates(1, 2, 3))
self.assertEqual(m.position(), Coordinates(1, 2, 3))
m.do_command(GCode.parse_line("G92X-1Y-1Z-1"))
m.do_command(GCode.parse_line("X1Y1Z1"))
self.assertEquals(m.position(), Coordinates(3, 4, 5))
self.assertEqual(m.position(), Coordinates(3, 4, 5))
m.do_command(GCode.parse_line("G92X3Y4Z5"))
m.do_command(GCode.parse_line("X0Y0Z0"))
self.assertEquals(m.position(), Coordinates(0, 0, 0))
self.assertEqual(m.position(), Coordinates(0, 0, 0))
m.do_command(GCode.parse_line("G90"))
m.do_command(GCode.parse_line("X6Y7Z8"))
self.assertEquals(m.position(), Coordinates(6, 7, 8))
self.assertEqual(m.position(), Coordinates(6, 7, 8))
def test_m3_m5(self):
m = GMachine()
tests/test_pulses.py
+18 -18
View File
@@ -27,10 +27,10 @@ class TestPulses(unittest.TestCase):
i = 0
for px, py, pz in g:
i += 1
self.assertEquals(px, 0)
self.assertEquals(py, None)
self.assertEquals(pz, None)
self.assertEquals(i, 1)
self.assertEqual(px, 0)
self.assertEqual(py, None)
self.assertEqual(pz, None)
self.assertEqual(i, 1)
g = PulseGeneratorLinear(Coordinates(
1.0 / STEPPER_PULSES_PER_MM,
1.0 / STEPPER_PULSES_PER_MM,
@@ -39,10 +39,10 @@ class TestPulses(unittest.TestCase):
i = 0
for px, py, pz in g:
i += 1
self.assertEquals(px, 0)
self.assertEquals(py, 0)
self.assertEquals(pz, 0)
self.assertEquals(i, 1)
self.assertEqual(px, 0)
self.assertEqual(py, 0)
self.assertEqual(pz, 0)
self.assertEqual(i, 1)
def test_linear_with_hal_virtual(self):
# Using hal_virtual module for this test, it already contains plenty
@@ -62,13 +62,13 @@ class TestPulses(unittest.TestCase):
i = 0
for px, py, pz in g:
if i % 2 == 0:
self.assertNotEquals(px, None)
self.assertNotEqual(px, None)
else:
self.assertEquals(px, None)
self.assertNotEquals(py, None)
self.assertEquals(pz, None)
self.assertEqual(px, None)
self.assertNotEqual(py, None)
self.assertEqual(pz, None)
i += 1
self.assertEquals(m.find_max() * STEPPER_PULSES_PER_MM, i)
self.assertEqual(m.find_max() * STEPPER_PULSES_PER_MM, i)
def test_pulses_count_and_timings(self):
# Check if number of pulses is equal to specified distance.
@@ -86,12 +86,12 @@ class TestPulses(unittest.TestCase):
if pz is not None:
iz += 1
v = list(x for x in (px, py, pz) if x is not None)
self.assertEquals(min(v), max(v))
self.assertEqual(min(v), max(v))
self.assertLess(t, min(v))
t = max(v)
self.assertEquals(m.x * STEPPER_PULSES_PER_MM, ix)
self.assertEquals(m.y * STEPPER_PULSES_PER_MM, iy)
self.assertEquals(m.z * STEPPER_PULSES_PER_MM, iz)
self.assertEqual(m.x * STEPPER_PULSES_PER_MM, ix)
self.assertEqual(m.y * STEPPER_PULSES_PER_MM, iy)
self.assertEqual(m.z * STEPPER_PULSES_PER_MM, iz)
self.assertLessEqual(t, g.total_time_s())
def test_acceleration_velocity(self):
@@ -109,7 +109,7 @@ class TestPulses(unittest.TestCase):
bt = px - lx
lx = px
i += 1
self.assertEquals(round(60.0 / lt / STEPPER_PULSES_PER_MM), round(self.v))
self.assertEqual(round(60.0 / lt / STEPPER_PULSES_PER_MM), round(self.v))
self.assertGreater(at, lt)
self.assertGreater(bt, lt)