suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM, Tests: Fix line end problem in compare_inp_files

Browse Source 
Add new function to force unix line ends and use it in compare_inp_files
and compare_stats.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt 2015-11-18 16:07:38 +00:00 committed by wmayer
parent ed8eab273d
commit fe522bc66b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Fem/TestFem.py
View File

@ -115,15 +115,25 @@ class FemTest(unittest.TestCase):
self.pressure_constraint.Pressure = 10.000000 self.pressure_constraint.Pressure = 10.000000
self.pressure_constraint.Reversed = True self.pressure_constraint.Reversed = True
def force_unix_line_ends(self, line_list):
new_line_list = []
for l in line_list:
if l.endswith("\r\n"):
l = l[:-2] + '\n'
new_line_list.append(l)
return new_line_list
def compare_inp_files(self, file_name1, file_name2): def compare_inp_files(self, file_name1, file_name2):
file1 = open(file_name1, 'r') file1 = open(file_name1, 'r')
f1 = file1.readlines() f1 = file1.readlines()
file1.close() file1.close()
lf1 = [l for l in f1 if not l.startswith('** written ')]
lf1 = self.force_unix_line_ends(lf1)
file2 = open(file_name2, 'r') file2 = open(file_name2, 'r')
f2 = file2.readlines() f2 = file2.readlines()
file2.close() file2.close()
lf1 = [l for l in f1 if not l.startswith('** written ')]
lf2 = [l for l in f2 if not l.startswith('** written ')] lf2 = [l for l in f2 if not l.startswith('** written ')]
lf2 = self.force_unix_line_ends(lf2)
import difflib import difflib
diff = difflib.unified_diff(lf1, lf2, n=0) diff = difflib.unified_diff(lf1, lf2, n=0)
result = '' result = ''
@ -134,21 +144,16 @@ class FemTest(unittest.TestCase):
return result return result
def compare_stats(self, fea, stat_file=None): def compare_stats(self, fea, stat_file=None):
sf_content_normalised = []
if stat_file: if stat_file:
sf = open(stat_file, 'r') sf = open(stat_file, 'r')
sf_content = sf.readlines() sf_content = sf.readlines()
sf.close() sf.close()
# Force \n line ends sf_content = self.force_unix_line_ends(sf_content)
for line in sf_content:
if line.endswith("\r\n"):
line = line[:-2] + '\n'
sf_content_normalised.append(line)
stat_types = ["U1", "U2", "U3", "Uabs", "Sabs"] stat_types = ["U1", "U2", "U3", "Uabs", "Sabs"]
stats = [] stats = []
for s in stat_types: for s in stat_types:
stats.append("{}: {}\n".format(s, fea.get_stats(s))) stats.append("{}: {}\n".format(s, fea.get_stats(s)))
if sf_content_normalised != stats: if sf_content != stats:
fcc_print("Expected stats from {}".format(stat_file)) fcc_print("Expected stats from {}".format(stat_file))
fcc_print(sf_content) fcc_print(sf_content)
fcc_print("Stats read from {}.frd file".format(fea.base_name)) fcc_print("Stats read from {}.frd file".format(fea.base_name))