vincent/PyCNC
1
0
Fork 0
mirror of https://github.com/sinseman44/PyCNC.git synced 2026-04-20 18:48:11 +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

66
tests/test_gcode.py
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__':