Skip to content

Commit cc54662

Browse files
edoputedoput
committed
[test] changed converter tests to use the custom test class
1 parent 720e7c8 commit cc54662

12 files changed

Lines changed: 47 additions & 78 deletions

‎tests/airos/test_aaa.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import AaaAirOS, ConverterTest
22

3-
from .dummy import AaaAirOS
43

5-
6-
class TestResolvConverter(unittest.TestCase):
4+
class TestResolvConverter(ConverterTest):
75

86
backend = AaaAirOS
97

@@ -20,5 +18,4 @@ def test_aaa_key(self):
2018
},
2119
]
2220

23-
24-
self.assertEqual(o.intermediate_data['aaa'], expected)
21+
self.assertEqualConfig(o.intermediate_data['aaa'], expected)

‎tests/airos/test_bridge.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import unittest
2-
31
from netjsonconfig.backends.airos.converters import *
42

5-
from .dummy import BridgeAirOS
3+
from .dummy import BridgeAirOS, ConverterTest
64

75

8-
class TestBridgeConverter(unittest.TestCase):
6+
class TestBridgeConverter(ConverterTest):
97
"""
108
tests for backends.airos.renderers.SystemRenderer
119
"""
@@ -55,7 +53,7 @@ def test_active_bridge(self):
5553
}
5654
]
5755

58-
self.assertEqual(o.intermediate_data['bridge'], expected)
56+
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
5957

6058
def test_disabled_bridge(self):
6159
o = self.backend({
@@ -100,7 +98,7 @@ def test_disabled_bridge(self):
10098
}
10199
]
102100

103-
self.assertEqual(o.intermediate_data['bridge'], expected)
101+
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
104102

105103
def test_many_bridges(self):
106104
o = self.backend({
@@ -174,7 +172,7 @@ def test_many_bridges(self):
174172
}
175173
]
176174

177-
self.assertEqual(o.intermediate_data['bridge'], expected)
175+
self.assertEqualConfig(o.intermediate_data['bridge'], expected)
178176

179177
def test_no_bridge(self):
180178
o = self.backend({
@@ -200,4 +198,4 @@ def test_no_bridge(self):
200198
}
201199
]
202200

203-
self.assertEqual(o.intermediate_data['bridge'], expected)
201+
self.assertEqualConfig(o.intermediate_data['bridge'], expected)

‎tests/airos/test_discovery.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import DiscoveryAirOS, ConverterTest
22

3-
from .dummy import DiscoveryAirOS
43

5-
6-
class TestDiscoveryConverter(unittest.TestCase):
4+
class TestDiscoveryConverter(ConverterTest):
75

86
backend = DiscoveryAirOS
97

@@ -22,4 +20,4 @@ def test_discovery_key(self):
2220
]
2321

2422

25-
self.assertEqual(o.intermediate_data['discovery'], expected)
23+
self.assertEqualConfig(o.intermediate_data['discovery'], expected)

‎tests/airos/test_dyndns.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import DyndnsAirOS, ConverterTest
22

3-
from .dummy import DyndnsAirOS
43

5-
6-
class TestDyndnsConverter(unittest.TestCase):
4+
class TestDyndnsConverter(ConverterTest):
75

86
backend = DyndnsAirOS
97

@@ -20,5 +18,4 @@ def test_Dyndns_key(self):
2018
},
2119
]
2220

23-
24-
self.assertEqual(o.intermediate_data['dyndns'], expected)
21+
self.assertEqualConfig(o.intermediate_data['dyndns'], expected)

‎tests/airos/test_gui.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import GuiAirOS, ConverterTest
22

3-
from .dummy import GuiAirOS
43

5-
6-
class TestGuiConverter(unittest.TestCase):
4+
class TestGuiConverter(ConverterTest):
75

86
backend = GuiAirOS
97

@@ -23,5 +21,4 @@ def test_gui_key(self):
2321
},
2422
]
2523

26-
27-
self.assertEqual(o.intermediate_data['gui'], expected)
24+
self.assertEqualConfig(o.intermediate_data['gui'], expected)

‎tests/airos/test_httpd.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import HttpdAirOS, ConverterTest
22

3-
from .dummy import HttpdAirOS
43

5-
6-
class TestHttpdConverter(unittest.TestCase):
4+
class TestHttpdConverter(ConverterTest):
75

86
backend = HttpdAirOS
97

@@ -26,5 +24,4 @@ def test_httpd_key(self):
2624
},
2725
]
2826

29-
30-
self.assertEqual(o.intermediate_data['httpd'], expected)
27+
self.assertEqualConfig(o.intermediate_data['httpd'], expected)

‎tests/airos/test_ntp.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import NtpclientAirOS, ConverterTest
22

3-
from .dummy import NtpclientAirOS
43

5-
6-
class TestResolvConverter(unittest.TestCase):
4+
class TestResolvConverter(ConverterTest):
75

86
backend = NtpclientAirOS
97

@@ -20,7 +18,7 @@ def test_ntp_key(self):
2018
},
2119
]
2220

23-
self.assertEqual(o.intermediate_data['ntpclient'], expected)
21+
self.assertEqualConfig(o.intermediate_data['ntpclient'], expected)
2422

2523
def test_no_ntp_server(self):
2624
o = self.backend({
@@ -35,7 +33,7 @@ def test_no_ntp_server(self):
3533
},
3634
]
3735

38-
self.assertEqual(o.intermediate_data['ntpclient'], expected)
36+
self.assertEqualConfig(o.intermediate_data['ntpclient'], expected)
3937

4038
def test_single_ntp_server(self):
4139
o = self.backend({
@@ -56,7 +54,7 @@ def test_single_ntp_server(self):
5654
},
5755
]
5856

59-
self.assertEqual(o.intermediate_data['ntpclient'], expected)
57+
self.assertEqualConfig(o.intermediate_data['ntpclient'], expected)
6058

6159
def test_multiple_ntp_server(self):
6260
o = self.backend({
@@ -82,4 +80,4 @@ def test_multiple_ntp_server(self):
8280
},
8381
]
8482

85-
self.assertEqual(o.intermediate_data['ntpclient'], expected)
83+
self.assertEqualConfig(o.intermediate_data['ntpclient'], expected)

‎tests/airos/test_pwdog.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import PwdogAirOS, ConverterTest
22

3-
from .dummy import PwdogAirOS
43

5-
6-
class TestPwdogConverter(unittest.TestCase):
4+
class TestPwdogConverter(ConverterTest):
75

86
backend = PwdogAirOS
97

@@ -23,4 +21,4 @@ def test_ntp_key(self):
2321
},
2422
]
2523

26-
self.assertEqual(o.intermediate_data['pwdog'], expected)
24+
self.assertEqualConfig(o.intermediate_data['pwdog'], expected)

‎tests/airos/test_radio.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import RadioAirOS, ConverterTest
22

3-
from .dummy import RadioAirOS
43

5-
6-
class TestRadioConverter(unittest.TestCase):
4+
class TestRadioConverter(ConverterTest):
75

86
backend = RadioAirOS
97

@@ -20,7 +18,7 @@ def test_no_radio(self):
2018
},
2119
]
2220

23-
self.assertEqual(o.intermediate_data['radio'], expected)
21+
self.assertEqualConfig(o.intermediate_data['radio'], expected)
2422

2523
def test_active_radio(self):
2624
o = self.backend({
@@ -49,7 +47,7 @@ def test_active_radio(self):
4947
},
5048
]
5149

52-
self.assertEqual(o.intermediate_data['radio'], expected)
50+
self.assertEqualConfig(o.intermediate_data['radio'], expected)
5351

5452
def test_inactive_radio(self):
5553
o = self.backend({
@@ -78,4 +76,4 @@ def test_inactive_radio(self):
7876
},
7977
]
8078

81-
self.assertEqual(o.intermediate_data['radio'], expected)
79+
self.assertEqualConfig(o.intermediate_data['radio'], expected)

‎tests/airos/test_resolv.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import unittest
1+
from .dummy import ResolvAirOS, ConverterTest
22

3-
from .dummy import ResolvAirOS
43

5-
6-
class TestResolvConverter(unittest.TestCase):
4+
class TestResolvConverter(ConverterTest):
75

86
backend = ResolvAirOS
97

@@ -30,8 +28,7 @@ def test_resolv(self):
3028
},
3129
]
3230

33-
34-
self.assertEqual(o.intermediate_data['resolv'], expected)
31+
self.assertEqualConfig(o.intermediate_data['resolv'], expected)
3532

3633
def test_no_dns_server(self):
3734
o = self.backend({
@@ -50,4 +47,4 @@ def test_no_dns_server(self):
5047
},
5148
]
5249

53-
self.assertEqual(o.intermediate_data['resolv'], expected)
50+
self.assertEqualConfig(o.intermediate_data['resolv'], expected)

0 commit comments

Comments
 (0)