Skip to content

Relax regex to allow varying lengths and reinstate tests #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehogan merged 1 commit into from
Oct 4, 2017
Merged

Relax regex to allow varying lengths and reinstate tests #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/iris/fileformats/pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ def from_msi(msi):
raise TypeError('Expected STASH code MSI string, got %r' % (msi,))

msi_match = re.match(
'^\s*m(\d{2}|\?{2})s(\d{2}|\?{2})i(\d{3}|\?{3})\s*$', msi,
'^\s*m(\d+|\?+)s(\d+|\?+)i(\d+|\?+)\s*$', msi,
re.IGNORECASE)

if msi_match is None:
Expand Down
50 changes: 37 additions & 13 deletions lib/iris/tests/test_pp_stash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,47 @@ def test_stash_against_str(self):
self.assertNotEqual('m02s03i004', iris.fileformats.pp.STASH(1, 2, 3))

def test_irregular_stash_str(self):
self.assertEqual(iris.fileformats.pp.STASH(1, 2, 3), 'm01s02i0000000003')
self.assertEqual(iris.fileformats.pp.STASH(1, 2, 3), 'm01s02i3')
self.assertEqual(iris.fileformats.pp.STASH(1, 2, 3), 'm01s2i3')
self.assertEqual(iris.fileformats.pp.STASH(1, 2, 3), 'm1s2i3')

self.assertEqual('m01s02i0000000003', iris.fileformats.pp.STASH(1, 2, 3))
self.assertEqual('m01s02i3', iris.fileformats.pp.STASH(1, 2, 3))
self.assertEqual('m01s2i3', iris.fileformats.pp.STASH(1, 2, 3))
self.assertEqual('m1s2i3', iris.fileformats.pp.STASH(1, 2, 3))

self.assertNotEqual(iris.fileformats.pp.STASH(2, 3, 4), 'm01s02i0000000003')
self.assertNotEqual(iris.fileformats.pp.STASH(2, 3, 4), 'm01s02i3')
self.assertNotEqual(iris.fileformats.pp.STASH(2, 3, 4), 'm01s2i3')
self.assertNotEqual(iris.fileformats.pp.STASH(2, 3, 4), 'm1s2i3')

self.assertNotEqual('m01s02i0000000003', iris.fileformats.pp.STASH(2, 3, 4))
self.assertNotEqual('m01s02i3', iris.fileformats.pp.STASH(2, 3, 4))
self.assertNotEqual('m01s2i3', iris.fileformats.pp.STASH(2, 3, 4))
self.assertNotEqual('m1s2i3', iris.fileformats.pp.STASH(2, 3, 4))

self.assertEqual(iris.fileformats.pp.STASH.from_msi('M01s02i003'), 'm01s02i003')
self.assertEqual('m01s02i003', iris.fileformats.pp.STASH.from_msi('M01s02i003'))

def test_illegal_stash_str_range(self):
self.assertEqual(iris.fileformats.pp.STASH(0, 2, 3), 'm00s02i003')

self.assertEqual(iris.fileformats.pp.STASH(0, 2, 3), 'm??s02i003')
self.assertNotEqual(iris.fileformats.pp.STASH(0, 2, 3), 'm01s02i003')
self.assertEqual('m00s02i003', iris.fileformats.pp.STASH(0, 2, 3))

self.assertEqual('m??s02i003', iris.fileformats.pp.STASH(0, 2, 3))
self.assertNotEqual('m01s02i003', iris.fileformats.pp.STASH(0, 2, 3))

self.assertEqual(iris.fileformats.pp.STASH(0, 2, 3), 'm??s02i003')
self.assertEqual(iris.fileformats.pp.STASH(0, 2, 3), 'm00s02i003')
self.assertEqual('m??s02i003', iris.fileformats.pp.STASH(0, 2, 3))
self.assertEqual('m00s02i003', iris.fileformats.pp.STASH(0, 2, 3))

self.assertEqual(iris.fileformats.pp.STASH(100, 2, 3), 'm??s02i003')
self.assertEqual(iris.fileformats.pp.STASH(100, 2, 3), 'm100s02i003')
self.assertEqual('m??s02i003', iris.fileformats.pp.STASH(100, 2, 3))
self.assertEqual('m100s02i003', iris.fileformats.pp.STASH(100, 2, 3))

def test_illegal_stash_stash_range(self):
self.assertEqual(iris.fileformats.pp.STASH(0, 2, 3), iris.fileformats.pp.STASH(0, 2, 3))
self.assertEqual(iris.fileformats.pp.STASH(100, 2, 3), iris.fileformats.pp.STASH(100, 2, 3))
Expand All @@ -79,22 +109,14 @@ def test_illegal_stash_format(self):
test_values = (
('abc', (1, 2, 3)),
('mlotstmin', (1, 2, 3)),
('m1s2i3', (1, 2, 3)),
('m1s2i3', (2, 3, 4)),
('m01s2i3', (1, 2, 3)),
('m01s2i3', (2, 3, 4)),
('m01s02i3', (1, 2, 3)),
('m01s02i3', (2, 3, 4)),
('m01s02003', (1, 2, 3)),
('m100s02i003', (100, 2, 3)),
('m01s02i0000000003', (1, 2, 3)),
('m01s02i0000000003', (2, 3, 4)),
)
('m01s02003', (1, 2, 3)))

for (test_value, reference) in test_values:
msg = 'Expected STASH code .* {!r}'.format(test_value)
with self.assertRaisesRegexp(ValueError, msg):
test_value == iris.fileformats.pp.STASH(*reference)
with self.assertRaisesRegexp(ValueError, msg):
iris.fileformats.pp.STASH(*reference) == test_value

def test_illegal_stash_type(self):
test_values = (
Expand All @@ -106,6 +128,8 @@ def test_illegal_stash_type(self):
msg = 'Expected STASH code .* {!r}'.format(test_value)
with self.assertRaisesRegexp(TypeError, msg):
iris.fileformats.pp.STASH.from_msi(test_value) == reference
with self.assertRaisesRegexp(TypeError, msg):
reference == iris.fileformats.pp.STASH.from_msi(test_value)

def test_stash_lbuser(self):
stash = iris.fileformats.pp.STASH(2, 32, 456)
Expand Down