-# Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+# Copyright (C) 2014-2021 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
reffile = ""
def setUp(self):
- salome.salome_close()
-
- # leave file name only (trim path and extension)
- fileName = os.path.basename(self.testfile)
- self.reffile = self.reffile + "/" + os.path.splitext(fileName)[0] + ".py"
-
+ salome.standalone()
salome.salome_init(self.testfile, embedded=1)
myStudyName = salome.myStudy._get_Name()
self.session = salome.naming_service.Resolve('/Kernel/Session')
def test_hdf_file(self):
self.assertTrue(self.partSet.size("Parts") > 0)
- aPartsList = []
+ aPartsList = dict()
for aPartIndex in range(self.partSet.size("Parts")):
self.session.startOperation()
aPart = ModelAPI.modelAPI_ResultPart(ModelAPI.objectToResult(self.partSet.object("Parts", aPartIndex)))
self.session.finishOperation()
aPartFeature = PartSetAPI.PartSetAPI_Part(self.partSet.currentFeature(True))
- # check reference data
- exec(open(self.reffile, "rb").read())
+ aPartsList["Part_{}".format(aPartIndex+1)] = aPartFeature
+
+ self.session.startOperation()
+ self.session.setActiveDocument(self.partSet)
+ self.session.finishOperation()
+
+ # check reference data
+ exec(open(self.reffile, "rb").read(), globals(), aPartsList)
if __name__ == "__main__":
if len(sys.argv) > 1:
TestHDF.testfile = sys.argv[1]
if len(sys.argv) > 2:
- salomePortFile = sys.argv[2]
+ TestHDF.reffile = sys.argv[2]
if len(sys.argv) > 3:
errFile = open(sys.argv[3], 'w')
- if len(sys.argv) > 4:
- salomeKernelDir = sys.argv[4]
- if len(sys.argv) > 5:
- TestHDF.reffile = sys.argv[5]
aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF)
unittest.TextTestRunner(stream=errFile).run(aTest)
errFile.close()
-
- # close Salome GUI
- port = salome_utils.getPortNumber()
- proc = subprocess.Popen([salomeKernelDir + "/bin/salome/killSalomeWithPort.py", "{}".format(port)])
-
- try:
- os.remove(salomePortFile)
- except:
- print("Cannot remove file", file=f)
+ #import qtsalome
+ #qtsalome.qApp.closeAllWindows()
+ import signal
+ os.kill(os.getpid(),signal.SIGKILL)
+
\ No newline at end of file