OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Python tests

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-07-15 14:05:34 +02:00
parent dcd3ff6754
commit 3898b97c8a
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/GrpcInterface/Python/rips/PdmObject.py
View File

@ -12,7 +12,7 @@ class PdmObject:
def __init__(self, pb2Object, channel):
self.pb2Object = pb2Object
self.channel = channel
self.stub = PdmObject_pb2_grpc.PdmObjectServiceStub(self.channel)
self.pdmObjectStub = PdmObject_pb2_grpc.PdmObjectServiceStub(self.channel)
def address(self):
return self.pb2Object.address
@ -41,6 +41,8 @@ class PdmObject:
floatVal = float(value)
return floatVal
except ValueError:
# We may have a string. Strip internal start and end quotes
value = value.strip('\"')
return value
def setValue(self, keyword, value):
@ -56,7 +58,7 @@ class PdmObject:
def descendants(self, classKeyword):
request = PdmObject_pb2.PdmChildObjectRequest(object=self.pb2Object, child_keyword=classKeyword)
objectList = self.stub.GetDescendantPdmObjects(request).objects
objectList = self.pdmObjectStub.GetDescendantPdmObjects(request).objects
childList = []
for object in objectList:
childList.append(PdmObject(object, self.channel))
@ -64,7 +66,7 @@ class PdmObject:
def children(self, classKeyword):
request = PdmObject_pb2.PdmChildObjectRequest(object=self.pb2Object, child_keyword=classKeyword)
objectList = self.stub.GetChildPdmObjects(request).objects
objectList = self.pdmObjectStub.GetChildPdmObjects(request).objects
childList = []
for object in objectList:
childList.append(PdmObject(object, self.channel))
@ -72,7 +74,7 @@ class PdmObject:
def ancestor(self, classKeyword):
request = PdmObject_pb2.PdmParentObjectRequest(object=self.pb2Object, parent_keyword=classKeyword)
return PdmObject(self.stub.GetAncestorPdmObject(request), self.channel)
return PdmObject(self.pdmObjectStub.GetAncestorPdmObject(request), self.channel)
def update(self):
self.stub.UpdateExistingPdmObject(self.pb2Object)
self.pdmObjectStub.UpdateExistingPdmObject(self.pb2Object)

14
ApplicationCode/GrpcInterface/Python/rips/tests/test_cases.py
View File

@ -53,14 +53,12 @@ def test_10k(rips_instance, initializeTest):
def test_PdmObject(rips_instance, initializeTest):
casePath = dataroot.PATH + "/TEST10K_FLT_LGR_NNC/TEST10K_FLT_LGR_NNC.EGRID"
case = rips_instance.project.loadCase(path=casePath)
pdmObject = case.pdmObject()
assert(pdmObject.address is not 0)
assert(pdmObject.class_keyword == "EclipseCase")
assert(pdmObject.parameters['CaseFileName'] == casePath)
assert(int(pdmObject.parameters['CaseId']) == 0)
for keyword in pdmObject.parameters:
print (keyword + ": " + pdmObject.parameters[keyword])
assert(case.id == 0)
assert(case.address() is not 0)
assert(case.classKeyword() == "EclipseCase")
assert(case.getValue('CaseFileName') == casePath)
caseId = case.getValue('CaseId')
assert(caseId == case.id)
@pytest.mark.skipif(sys.platform.startswith('linux'), reason="Brugge is currently exceptionally slow on Linux")
def test_brugge_0010(rips_instance, initializeTest):

3
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@ -46,8 +46,9 @@ RimCase::RimCase() : m_isInActiveDestruction(false)
{
RICF_InitField(&caseUserDescription, "CaseUserDescription", QString(), "Case Name", "", "" ,"");
CAF_PDM_InitField(&caseId, "CaseId", -1, "Case ID", "", "" ,"");
RICF_InitField(&caseId, "CaseId", -1, "Case ID", "", "" ,"");
caseId.uiCapability()->setUiReadOnly(true);
caseId.capability<RicfFieldHandle>()->setIOWriteable(false);
CAF_PDM_InitFieldNoDefault(&activeFormationNames, "DefaultFormationNames", "Formation Names File", "", "", "");

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -26,6 +26,8 @@
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h"
#include "RicfCommandObject.h"
#include "RifEclipseOutputFileTools.h"
#include "RifReaderEclipseOutput.h"
#include "RifReaderEclipseRft.h"
@ -70,8 +72,9 @@ RimEclipseResultCase::RimEclipseResultCase()
{
CAF_PDM_InitObject("Eclipse Case", ":/Case48x48.png", "", "");
CAF_PDM_InitField(&caseFileName, "CaseFileName", QString(), "Case File Name", "", "" ,"");
RICF_InitField(&caseFileName, "CaseFileName", QString(), "Case File Name", "", "" ,"");
caseFileName.uiCapability()->setUiReadOnly(true);
caseFileName.capability<RicfFieldHandle>()->setIOWriteable(false);
CAF_PDM_InitFieldNoDefault(&m_unitSystem, "UnitSystem", "Unit System", "", "", "");
m_unitSystem.registerGetMethod(RiaApplication::instance()->project(), &RimProject::commonUnitSystemForAllCases);