Skip to content

Commit 9da4a76

Browse files
rldhontrldhont
committedDec 24, 2015
[Processing] update parameters test
·
ltr-3_40archive/master_2
1 parent afcf567 commit 9da4a76

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed
 

‎python/plugins/processing/tests/ParametersTest.py

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,30 @@ class ParameterBooleanTest(unittest.TestCase):
6262
def testSetValue(self):
6363
parameter = ParameterBoolean('myName', 'myDescription')
6464
self.assertEqual(parameter.value, None)
65-
parameter.setValue(True)
66-
self.assertEqual(parameter.value, True)
6765
parameter.setValue(False)
6866
self.assertEqual(parameter.value, False)
67+
parameter.setValue(True)
68+
self.assertEqual(parameter.value, True)
6969

7070
def testDefault(self):
7171
parameter = ParameterBoolean('myName', 'myDescription', default=False, optional=True)
72-
parameter.setValue(None)
7372
self.assertEqual(parameter.value, False)
73+
parameter.setValue(None)
74+
self.assertEqual(parameter.value, None)
7475

7576
def testOptional(self):
7677
optionalParameter = ParameterBoolean('myName', 'myDescription', default=False, optional=True)
77-
optionalParameter.setValue(True)
78-
optionalParameter.setValue(None)
7978
self.assertEqual(optionalParameter.value, False)
79+
optionalParameter.setValue(True)
80+
self.assertEqual(optionalParameter.value, True)
81+
self.assertTrue(optionalParameter.setValue(None))
82+
self.assertEqual(optionalParameter.value, None)
8083

8184
requiredParameter = ParameterBoolean('myName', 'myDescription', default=False, optional=False)
85+
self.assertEqual(requiredParameter.value, False)
8286
requiredParameter.setValue(True)
83-
requiredParameter.setValue(None)
87+
self.assertEqual(requiredParameter.value, True)
88+
self.assertFalse(requiredParameter.setValue(None))
8489
self.assertEqual(requiredParameter.value, True)
8590

8691

@@ -93,13 +98,17 @@ def testSetValue(self):
9398

9499
def testOptional(self):
95100
optionalParameter = ParameterCrs('myName', 'myDesc', default='EPSG:4326', optional=True)
96-
optionalParameter.setValue('EPSG:12003')
97-
optionalParameter.setValue(None)
98101
self.assertEqual(optionalParameter.value, 'EPSG:4326')
102+
optionalParameter.setValue('EPSG:12003')
103+
self.assertEqual(optionalParameter.value, 'EPSG:12003')
104+
self.assertTrue(optionalParameter.setValue(None))
105+
self.assertEqual(optionalParameter.value, None)
99106

100107
requiredParameter = ParameterCrs('myName', 'myDesc', default='EPSG:4326', optional=False)
108+
self.assertEqual(requiredParameter.value, 'EPSG:4326')
101109
requiredParameter.setValue('EPSG:12003')
102-
requiredParameter.setValue(None)
110+
self.assertEqual(requiredParameter.value, 'EPSG:12003')
111+
self.assertFalse(requiredParameter.setValue(None))
103112
self.assertEqual(requiredParameter.value, 'EPSG:12003')
104113

105114

@@ -129,15 +138,19 @@ def testSetInvalidValue(self):
129138

130139
def testOptional(self):
131140
optionalParameter = ParameterExtent('myName', 'myDesc', default='0,1,0,1', optional=True)
141+
self.assertEqual(optionalParameter.value, '0,1,0,1')
132142
optionalParameter.setValue('1,2,3,4')
133-
optionalParameter.setValue(None)
143+
self.assertEqual(optionalParameter.value, '1,2,3,4')
144+
self.assertTrue(optionalParameter.setValue(None))
134145
# Extent is unique in that it will let you set `None`, whereas other
135146
# optional parameters become "default" when assigning None.
136147
self.assertEqual(optionalParameter.value, None)
137148

138149
requiredParameter = ParameterExtent('myName', 'myDesc', default='0,1,0,1', optional=False)
150+
self.assertEqual(requiredParameter.value, '0,1,0,1')
139151
requiredParameter.setValue('1,2,3,4')
140-
requiredParameter.setValue(None)
152+
self.assertEqual(requiredParameter.value, '1,2,3,4')
153+
self.assertFalse(requiredParameter.setValue(None))
141154
self.assertEqual(requiredParameter.value, '1,2,3,4')
142155

143156

@@ -157,7 +170,7 @@ def testOptional(self):
157170
self.assertEquals(optionalParameter.value, '')
158171

159172
self.assertTrue(optionalParameter.setValue(None))
160-
self.assertEquals(optionalParameter.value, '')
173+
self.assertEquals(optionalParameter.value, None)
161174

162175
requiredParameter = ParameterFile('myName', 'myDesc', optional=False)
163176
self.assertTrue(requiredParameter.setValue('myFile.png'))
@@ -178,7 +191,7 @@ def testSetValueWithExtension(self):
178191
self.assertEquals(parameter.value, 'myFile.png')
179192

180193
self.assertFalse(parameter.setValue('myFile.bmp'))
181-
self.assertEquals(parameter.value, 'myFile.bmp')
194+
self.assertEquals(parameter.value, 'myFile.png')
182195

183196
def testGetValueAsCommandLineParameter(self):
184197
parameter = ParameterFile('myName', 'myDesc')
@@ -313,13 +326,17 @@ def testMinValue(self):
313326

314327
def testOptional(self):
315328
optionalParameter = ParameterNumber('myName', 'myDescription', default=1.0, optional=True)
316-
optionalParameter.setValue(5)
317-
optionalParameter.setValue(None)
318329
self.assertEqual(optionalParameter.value, 1.0)
330+
optionalParameter.setValue(5)
331+
self.assertEqual(optionalParameter.value, 5)
332+
self.assertTrue(optionalParameter.setValue(None))
333+
self.assertEqual(optionalParameter.value, None)
319334

320335
requiredParameter = ParameterNumber('myName', 'myDescription', default=1.0, optional=False)
336+
self.assertEqual(requiredParameter.value, 1.0)
321337
requiredParameter.setValue(5)
322-
requiredParameter.setValue(None)
338+
self.assertEqual(requiredParameter.value, 5)
339+
self.assertFalse(requiredParameter.setValue(None))
323340
self.assertEqual(requiredParameter.value, 5)
324341

325342

0 commit comments

Comments
 (0)
Please sign in to comment.