1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 34006bc2d8b0480208d2f9a5ee82d22ce9bbcb18 Mon Sep 17 00:00:00 2001
From: Daniel Kratzert <dkratzert@gmx.de>
Date: Fri, 7 Oct 2022 19:54:15 +0200
Subject: [PATCH] Fix tests for gemmi <= 0.5.6
---
tests/test_text.py | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/tests/test_text.py b/tests/test_text.py
index a5866ef..7361af7 100644
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -7,6 +7,7 @@
import unittest
import gemmi
+from packaging.version import Version
from finalcif.cif.text import quote, utf8_to_str, retranslate_delimiter, delimit_string, charcters, string_to_utf8
@@ -32,19 +33,31 @@ def test_quote_long(self):
def test_set_pair_delimited_empty(self):
self.block.set_pair('_foobar', delimit_string(''))
- self.assertEqual(('_foobar', ''), self.block.find_pair('_foobar'))
+ if Version(gemmi.__version__) >= Version('0.5.7'):
+ self.assertEqual(('_foobar', ''), self.block.find_pair('_foobar'))
+ else:
+ self.assertEqual(['_foobar', ''], self.block.find_pair('_foobar'))
def test_set_pair_delimited_question(self):
self.block.set_pair('_foobar', delimit_string('?'))
- self.assertEqual(('_foobar', '?'), self.block.find_pair('_foobar'))
+ if Version(gemmi.__version__) >= Version('0.5.7'):
+ self.assertEqual(('_foobar', '?'), self.block.find_pair('_foobar'))
+ else:
+ self.assertEqual(['_foobar', '?'], self.block.find_pair('_foobar'))
def test_set_pair_delimited_number(self):
self.block.set_pair('_foobar', delimit_string('1.123'))
- self.assertEqual(('_foobar', '1.123'), self.block.find_pair('_foobar'))
+ if Version(gemmi.__version__) >= Version('0.5.7'):
+ self.assertEqual(('_foobar', '1.123'), self.block.find_pair('_foobar'))
+ else:
+ self.assertEqual(['_foobar', '1.123'], self.block.find_pair('_foobar'))
def test_set_pair_delimited_with_newline(self):
self.block.set_pair('_foobar', delimit_string('abc\ndef foo'))
- self.assertEqual(('_foobar', 'abc\ndef foo'), self.block.find_pair('_foobar'))
+ if Version(gemmi.__version__) >= Version('0.5.7'):
+ self.assertEqual(('_foobar', 'abc\ndef foo'), self.block.find_pair('_foobar'))
+ else:
+ self.assertEqual(['_foobar', 'abc\ndef foo'], self.block.find_pair('_foobar'))
def test_delimit_ut8_to_cif_str(self):
s = utf8_to_str('100 °C')
|
