ByoungSooPark/cadquery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial attempt to fix import issues caused by verutil.py implementation.

Browse Source
This commit is contained in:
Jeremy Wright
2014-12-01 11:51:26 -05:00
parent d9ca06a6e8
commit 087f0621a7
11 changed files with 135 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/TestCadObjects.py
View File

@ -4,10 +4,12 @@ import sys
import unittest
from tests import BaseTest
from cadquery.freecad_impl.verutil import fc_import
FreeCAD = fc_import("FreeCAD")
if not hasattr(FreeCAD, 'Part'):
FreeCAD.Part = fc_import("FreeCAD.Part")
#from cadquery.freecad_impl.verutil import fc_import
# FreeCAD = fc_import("FreeCAD")
# if not hasattr(FreeCAD, 'Part'):
# FreeCAD.Part = fc_import("FreeCAD.Part")
import FreeCAD
import Part
from cadquery import *

38
tests/TestImports.py
View File

@ -4,26 +4,26 @@
#core modules
#my modules
from cadquery.freecad_impl import verutil
from tests import BaseTest
#from cadquery.freecad_impl import verutil
#from tests import BaseTest
class TestVersionsForImport(BaseTest):
"""Test version checks."""
def test_013_version(self):
"""Make sure various 0.13 Version calls work correctly"""
self.assertEquals(verutil._figure_out_version(
['0', '13', '2055 (Git)',
'git://git.code.sf.net/p/free-cad/code',
'2013/04/18 13:48:49', 'master',
'3511a807a30cf41909aaf12a1efe1db6c53db577']),
(0,13,2055))
self.assertEquals(verutil._figure_out_version(
['0', '13', '12345']),
(0,13,12345))
self.assertEquals(verutil._figure_out_version(
['0', '13', 'SOMETAGTHATBREAKSSTUFF']),
(0,13,0))
# class TestVersionsForImport(BaseTest):
# """Test version checks."""
#
# def test_013_version(self):
# """Make sure various 0.13 Version calls work correctly"""
# self.assertEquals(verutil._figure_out_version(
# ['0', '13', '2055 (Git)',
# 'git://git.code.sf.net/p/free-cad/code',
# '2013/04/18 13:48:49', 'master',
# '3511a807a30cf41909aaf12a1efe1db6c53db577']),
# (0,13,2055))
# self.assertEquals(verutil._figure_out_version(
# ['0', '13', '12345']),
# (0,13,12345))
# self.assertEquals(verutil._figure_out_version(
# ['0', '13', 'SOMETAGTHATBREAKSSTUFF']),
# (0,13,0))

13
tests/__init__.py
View File

@ -3,11 +3,16 @@ import unittest
import sys
import os
from cadquery.freecad_impl.verutil import fc_import
FreeCAD = fc_import("FreeCAD")
#from cadquery.freecad_impl.verutil import fc_import
#FreeCAD = fc_import("FreeCAD")
#import cadquery.freecad_impl
import FreeCAD
P = fc_import("FreeCAD.Part")
V = fc_import("FreeCAD").Base.Vector
# P = fc_import("FreeCAD.Part")
# V = fc_import("FreeCAD").Base.Vector
import Part as P
from FreeCAD import Vector as V
def readFileAsString(fileName):
f= open(fileName,'r')