lefake/S4-P3-Projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix

Browse Source
This commit is contained in:
Marc-Antoine Lafreniere
2019-02-21 13:54:44 -05:00
parent f5599ce4b7
commit 1b4d729e87
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pcbdevice/tests/gcode/test_listToGcode.py
View File

@@ -34,27 +34,27 @@ class TestListToGCode(TestCase):
Coordinate(1, 10)] Coordinate(1, 10)]
def test_listToGCodeMultipleTrace(self): def test_listToGCodeMultipleTrace(self):
xSize, ySize = 2, 3 xSize, ySize = 2.0, 3.0
self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize)) self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize))
self.assertEqual(listToGCode(self.twoTrace, ySize, xSize), getExpected(self.twoTrace, ySize, xSize)) self.assertEqual(listToGCode(self.twoTrace, ySize, xSize), getExpected(self.twoTrace, ySize, xSize))
self.assertEqual(listToGCode(self.threeTrace, ySize, xSize), getExpected(self.threeTrace, ySize, xSize)) self.assertEqual(listToGCode(self.threeTrace, ySize, xSize), getExpected(self.threeTrace, ySize, xSize))
def test_listToGCodePixelSize(self): def test_listToGCodePixelSize(self):
xSize, ySize = 1, 4 xSize, ySize = 1.0, 4.0
self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize)) self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize))
xSize, ySize = 4, 2 xSize, ySize = 4.0, 2.0
self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize)) self.assertEqual(listToGCode(self.oneTrace, ySize, xSize), getExpected(self.oneTrace, ySize, xSize))
xSize, ySize = 8, -1 xSize, ySize = 8.0, -1.0
self.assertRaises(RuntimeError, lambda: listToGCode(self.oneTrace, ySize, xSize)) self.assertRaises(RuntimeError, lambda: listToGCode(self.oneTrace, ySize, xSize))
def getExpected(coords, ySize, xSize): def getExpected(coords, ySize, xSize):
header = ['G28', 'G90\n'] header = ['G28', 'G90\n']
footer = ['\nG0 Z0', 'G28'] footer = ['\nG0 Z0', 'G28']
content = ['G0 X' + str(xSize * coords[0].getX()) + ' Y' + str(ySize * coords[0].getY()), content = ['G0 X' + str(round(xSize * coords[0].getX(), 2)) + ' Y' + str(round(ySize * coords[0].getY(), 2)),
'G0 Z3', 'G0 Z3',
] ]

1
pcbdevice/tests/utils/test_fileUtils.py
View File

@@ -39,7 +39,6 @@ class TestFileUtils(TestCase):
self.assertEqual((10, 10), FileUtils.getPixelSize(10, 10, 100, 100)) self.assertEqual((10, 10), FileUtils.getPixelSize(10, 10, 100, 100))
self.assertEqual((1, 1), FileUtils.getPixelSize(100, 100, 100, 100)) self.assertEqual((1, 1), FileUtils.getPixelSize(100, 100, 100, 100))
self.assertEqual((10, 10), FileUtils.getPixelSize(10, 10, 10, 10, unit = 'cm')) self.assertEqual((10, 10), FileUtils.getPixelSize(10, 10, 10, 10, unit = 'cm'))
self.assertEqual((10, 10), FileUtils.getPixelSize(10, 10, 1, 1, unit = 'm'))
self.assertEqual((25.4, 25.4), FileUtils.getPixelSize(10, 10, 10, 10, unit = 'in')) self.assertEqual((25.4, 25.4), FileUtils.getPixelSize(10, 10, 10, 10, unit = 'in'))
self.assertEqual((1, 2), FileUtils.getPixelSize(10, 10, 10, 20)) self.assertEqual((1, 2), FileUtils.getPixelSize(10, 10, 10, 20))
self.assertRaises(RuntimeError, lambda: FileUtils.getPixelSize(10, 10, 10, 10, 'ft')) self.assertRaises(RuntimeError, lambda: FileUtils.getPixelSize(10, 10, 10, 10, 'ft'))