Skip to content

Commit 9d1405a

Browse files
committed
test_dataframes constants now are correctly uppercase
1 parent 2413ac7 commit 9d1405a

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

test/test_dataframes.py

+26-27
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@
1111
from hikari.dataframes.cif import CifValidator
1212
from hikari.symmetry import PG
1313

14-
rad60 = 1.0471975511965976
15-
rad70 = 1.2217304763960306
16-
rad80 = 1.3962634015954636
17-
rad90 = 1.5707963267948966
18-
19-
u1 = uncertainties.ufloat(1, 1)
20-
upi = uncertainties.ufloat(np.pi, 0)
21-
u6 = uncertainties.ufloat(6.0, 0.1)
22-
u7 = uncertainties.ufloat(7.0, 0.1)
23-
u8 = uncertainties.ufloat(8.0, 0.1)
24-
u60 = uncertainties.ufloat(60.0, 1.0)
25-
u70 = uncertainties.ufloat(70.0, 1.0)
26-
u80 = uncertainties.ufloat(80.0, 1.0)
27-
u90 = uncertainties.ufloat(90.0, 1.0)
14+
RAD60 = 1.0471975511965976
15+
RAD70 = 1.2217304763960306
16+
RAD80 = 1.3962634015954636
17+
RAD90 = 1.5707963267948966
18+
19+
U1 = uncertainties.ufloat(1, 1)
20+
U6 = uncertainties.ufloat(6.0, 0.1)
21+
U7 = uncertainties.ufloat(7.0, 0.1)
22+
U8 = uncertainties.ufloat(8.0, 0.1)
23+
U60 = uncertainties.ufloat(60.0, 1.0)
24+
U70 = uncertainties.ufloat(70.0, 1.0)
25+
U80 = uncertainties.ufloat(80.0, 1.0)
26+
U90 = uncertainties.ufloat(90.0, 1.0)
2827

2928

3029
class TempFile:
@@ -52,17 +51,17 @@ def test_init(self):
5251
self.assertAlmostEqual(b.a_d, 1.)
5352
self.assertAlmostEqual(b.b_d, 1.)
5453
self.assertAlmostEqual(b.c_d, 1.)
55-
self.assertAlmostEqual(b.al_d, rad90)
56-
self.assertAlmostEqual(b.be_d, rad90)
57-
self.assertAlmostEqual(b.ga_d, rad90)
54+
self.assertAlmostEqual(b.al_d, RAD90)
55+
self.assertAlmostEqual(b.be_d, RAD90)
56+
self.assertAlmostEqual(b.ga_d, RAD90)
5857

5958
def test_edit_cell(self):
6059
self.assertAlmostEqual(self.b.a_d, 6.)
6160
self.assertAlmostEqual(self.b.b_d, 7.)
6261
self.assertAlmostEqual(self.b.c_d, 8.)
63-
self.assertAlmostEqual(self.b.al_d, rad60)
64-
self.assertAlmostEqual(self.b.be_d, rad70)
65-
self.assertAlmostEqual(self.b.ga_d, rad80)
62+
self.assertAlmostEqual(self.b.al_d, RAD60)
63+
self.assertAlmostEqual(self.b.be_d, RAD70)
64+
self.assertAlmostEqual(self.b.ga_d, RAD80)
6665
with self.assertRaises(KeyError):
6766
BaseFrame().edit_cell(alpha=0.0)
6867

@@ -139,19 +138,19 @@ def test_get_as_type_single(self):
139138
self.assertEqual(self.b.get_as_type(k, typ=str), '90')
140139
self.assertEqual(self.b.get_as_type(k, typ=int), 90)
141140
u_typ = uncertainties.ufloat_fromstr
142-
self.assertEqual(repr(self.b.get_as_type(k, typ=u_typ)), repr(u90))
141+
self.assertEqual(repr(self.b.get_as_type(k, typ=u_typ)), repr(U90))
143142

144143
def test_get_as_type_list(self):
145144
k = '_atom_site_occupancy'
146145
self.assertEqual(self.b.get_as_type(k, typ=str), ['1', '1'])
147146
self.assertEqual(self.b.get_as_type(k, typ=int), [1, 1])
148147
u_typ = uncertainties.ufloat_fromstr
149-
self.assertEqual(repr(self.b.get_as_type(k, typ=u_typ)), repr([u1, u1]))
148+
self.assertEqual(repr(self.b.get_as_type(k, typ=u_typ)), repr([U1, U1]))
150149

151150
def test_get_as_type_exceptions(self):
152151
with self.assertRaises(KeyError):
153152
_ = self.b.get_as_type('_nonexistent_key', str)
154-
self.b['_cell_angle_beta'] = u90
153+
self.b['_cell_angle_beta'] = U90
155154
with self.assertRaises(TypeError):
156155
_ = self.b.get_as_type('_cell_angle_beta', str)
157156

@@ -288,7 +287,7 @@ class TestUBaseFrame(unittest.TestCase):
288287

289288
def setUp(self) -> None:
290289
self.b = UBaseFrame()
291-
self.b.edit_cell(a=u6, b=u7, c=u8, al=u60, be=u70, ga=u80)
290+
self.b.edit_cell(a=U6, b=U7, c=U8, al=U60, be=U70, ga=U80)
292291

293292
def test_init(self):
294293
b = UBaseFrame()
@@ -303,9 +302,9 @@ def test_edit_cell(self):
303302
self.assertAlmostEqual(self.b.a_d.n, 6)
304303
self.assertAlmostEqual(self.b.b_d.n, 7)
305304
self.assertAlmostEqual(self.b.c_d.n, 8)
306-
self.assertAlmostEqual(self.b.al_d.n, rad60)
307-
self.assertAlmostEqual(self.b.be_d.n, rad70)
308-
self.assertAlmostEqual(self.b.ga_d.n, rad80)
305+
self.assertAlmostEqual(self.b.al_d.n, RAD60)
306+
self.assertAlmostEqual(self.b.be_d.n, RAD70)
307+
self.assertAlmostEqual(self.b.ga_d.n, RAD80)
309308
with self.assertRaises(KeyError):
310309
BaseFrame().edit_cell(alpha=0.0)
311310

0 commit comments

Comments
 (0)