Skip to content

Commit 117ba39

Browse files
tpaviottpaviot
committed
SCL unittest fix
1 parent 8595a29 commit 117ba39

15 files changed

+44
-97
lines changed

‎src/fedex_python/examples/unitary_schemas/index_attribute.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
common_datum_list = 'LIST TYPE Not implemented'

‎src/fedex_python/examples/unitary_schemas/test_array.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010

‎src/fedex_python/examples/unitary_schemas/test_array_of_simple_types.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010

‎src/fedex_python/examples/unitary_schemas/test_derived_attribute.py‎

Lines changed: 5 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010

@@ -13,40 +13,9 @@
1313
####################
1414
class vector(BaseEntityClass):
1515
'''Entity vector definition.
16-
17-
:param x
18-
:type x:REAL
19-
20-
:param y
21-
:type y:REAL
2216
'''
23-
def __init__( self , x,y, ):
24-
self.x = x
25-
self.y = y
26-
27-
@apply
28-
def x():
29-
def fget( self ):
30-
return self._x
31-
def fset( self, value ):
32-
# Mandatory argument
33-
if value==None:
34-
raise AssertionError('Argument x is mantatory and can not be set to None')
35-
check_type(value,REAL)
36-
self._x = value
37-
return property(**locals())
38-
39-
@apply
40-
def y():
41-
def fget( self ):
42-
return self._y
43-
def fset( self, value ):
44-
# Mandatory argument
45-
if value==None:
46-
raise AssertionError('Argument y is mantatory and can not be set to None')
47-
check_type(value,REAL)
48-
self._y = value
49-
return property(**locals())
17+
# This class does not define any attribute.
18+
pass
5019

5120
####################
5221
# ENTITY circle #
@@ -133,53 +102,6 @@ def fset( self, value ):
133102
####################
134103
class point(BaseEntityClass):
135104
'''Entity point definition.
136-
137-
:param x
138-
:type x:REAL
139-
140-
:param y
141-
:type y:REAL
142-
143-
:param z
144-
:type z:REAL
145105
'''
146-
def __init__( self , x,y,z, ):
147-
self.x = x
148-
self.y = y
149-
self.z = z
150-
151-
@apply
152-
def x():
153-
def fget( self ):
154-
return self._x
155-
def fset( self, value ):
156-
# Mandatory argument
157-
if value==None:
158-
raise AssertionError('Argument x is mantatory and can not be set to None')
159-
check_type(value,REAL)
160-
self._x = value
161-
return property(**locals())
162-
163-
@apply
164-
def y():
165-
def fget( self ):
166-
return self._y
167-
def fset( self, value ):
168-
# Mandatory argument
169-
if value==None:
170-
raise AssertionError('Argument y is mantatory and can not be set to None')
171-
check_type(value,REAL)
172-
self._y = value
173-
return property(**locals())
174-
175-
@apply
176-
def z():
177-
def fget( self ):
178-
return self._z
179-
def fset( self, value ):
180-
# Mandatory argument
181-
if value==None:
182-
raise AssertionError('Argument z is mantatory and can not be set to None')
183-
check_type(value,REAL)
184-
self._z = value
185-
return property(**locals())
106+
# This class does not define any attribute.
107+
pass

‎src/fedex_python/examples/unitary_schemas/test_enum_entity_name.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,20 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
# ENUMERATION TYPE simple_datum_reference_modifier
1111
simple_datum_reference_modifier = ENUMERATION([
1212
'line',
1313
'translation',
1414
])
15+
16+
####################
17+
# ENTITY line #
18+
####################
19+
class line(BaseEntityClass):
20+
'''Entity line definition.
21+
'''
22+
# This class does not define any attribute.
23+
pass

‎src/fedex_python/examples/unitary_schemas/test_enums_same_name.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
# ENUMERATION TYPE hair_color

‎src/fedex_python/examples/unitary_schemas/test_multiple_inheritance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
text = STRING

‎src/fedex_python/examples/unitary_schemas/test_named_type.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
measure = REAL

‎src/fedex_python/examples/unitary_schemas/test_select_data_type.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010

‎src/fedex_python/examples/unitary_schemas/test_single_inheritance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from SCL.SCLBase import *
55
from SCL.SimpleDataTypes import *
66
from SCL.ConstructedDataTypes import *
7-
from SCL.AggregationDataType import *
7+
from SCL.AggregationDataTypes import *
88
from SCL.TypeChecker import check_type
99
from SCL.Expr import *
1010
length_measure = REAL

0 commit comments

Comments
 (0)