@@ -82,23 +82,20 @@ def flip_validation(self, world):
8282 # We simply pass the validation_geometry from the validation object through.
8383 common = {
8484 "__init__" : constructor ,
85- "get_validation_geometry" : lambda self , world : (
86- self .validation .get_validation_geometry (world )
87- ),
85+ "get_validation_geometry" : lambda self ,
86+ world : self .validation .get_validation_geometry (world ),
8887 }
8988
9089 eventually_true = type (
9190 "EventuallyTrueValidation" ,
9291 (Validation ,),
9392 {
9493 ** common ,
95- "__repr__" : lambda self : (
96- "EventuallyTrueValidation: " + repr (self .validation )
97- ),
94+ "__repr__" : lambda self : "EventuallyTrueValidation: "
95+ + repr (self .validation ),
9896 "get_validation_type" : lambda self : ValidationType .EVENTUALLY ,
99- "get_validation_status" : lambda self , world : (
100- self .validation .get_validation_status (world )
101- ),
97+ "get_validation_status" : lambda self ,
98+ world : self .validation .get_validation_status (world ),
10299 },
103100 )
104101
@@ -107,9 +104,8 @@ def flip_validation(self, world):
107104 (Validation ,),
108105 {
109106 ** common ,
110- "__repr__" : lambda self : (
111- "EventuallyFalseValidation: " + repr (self .validation )
112- ),
107+ "__repr__" : lambda self : "EventuallyFalseValidation: "
108+ + repr (self .validation ),
113109 "get_validation_type" : lambda self : ValidationType .EVENTUALLY ,
114110 "get_validation_status" : lambda self , world : flip_validation (self , world ),
115111 },
@@ -122,9 +118,8 @@ def flip_validation(self, world):
122118 ** common ,
123119 "__repr__" : lambda self : "AlwaysTrueValidation: " + repr (self .validation ),
124120 "get_validation_type" : lambda self : ValidationType .ALWAYS ,
125- "get_validation_status" : lambda self , world : (
126- self .validation .get_validation_status (world )
127- ),
121+ "get_validation_status" : lambda self ,
122+ world : self .validation .get_validation_status (world ),
128123 },
129124 )
130125
@@ -215,6 +210,17 @@ def create_validation_proto_helper(validation_proto_set, validation):
215210 return eventually_validation_proto_set , always_validation_proto_set
216211
217212
213+ def check_validation (validation_proto_set ):
214+ """Check validation and make sure its always true
215+
216+ :param validation_proto_set: Validation proto set
217+ :raises: AssertionError
218+ """
219+ for validation_proto in validation_proto_set .validations :
220+ if validation_proto .status == ValidationStatus .FAILING :
221+ raise AssertionError (validation_proto .failure_msg )
222+
223+
218224def create_validation_geometry (geometry = []) -> ValidationGeometry :
219225 """Creates a ValidationGeometry which is a visual representation of the
220226 validation to be rendered as either green (PASSING) or red (FAILING)
@@ -251,14 +257,3 @@ def create_validation_geometry(geometry=[]) -> ValidationGeometry:
251257 )
252258
253259 return validation_geometry
254-
255-
256- def check_validation (validation_proto_set ):
257- """Check validation and make sure its always true
258-
259- :param validation_proto_set: Validation proto set
260- :raises: AssertionError
261- """
262- for validation_proto in validation_proto_set .validations :
263- if validation_proto .status == ValidationStatus .FAILING :
264- raise AssertionError (validation_proto .failure_msg )
0 commit comments