Skip to content

Commit 94c14cc

Browse files
mwatts15mwatts15
committed
Cleaning up unit tests
- Removing unused test file - Upgrading from deprecated unittest methods
1 parent 9e33c9b commit 94c14cc

File tree

3 files changed

+62
-220
lines changed

3 files changed

+62
-220
lines changed

‎test/context_case.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def testConjunction(self):
9696
# add to context 1
9797
graph = Graph(self.graph.store, self.c1)
9898
graph.add(triple)
99-
self.assertEquals(len(self.graph.store), len(graph.store))
99+
self.assertEqual(len(self.graph.store), len(graph.store))
100100

101101
def testAdd(self):
102102
self.addStuff()
@@ -116,23 +116,23 @@ def testLenInOneContext(self):
116116

117117
for i in range(0, 10):
118118
graph.add((BNode(), self.hates, self.hates))
119-
self.assertEquals(len(graph), oldLen + 10)
120-
self.assertEquals(len(self.get_context(c1)), oldLen + 10)
119+
self.assertEqual(len(graph), oldLen + 10)
120+
self.assertEqual(len(self.get_context(c1)), oldLen + 10)
121121
self.graph.remove_context(self.get_context(c1))
122-
self.assertEquals(len(self.graph), oldLen)
123-
self.assertEquals(len(graph), 0)
122+
self.assertEqual(len(self.graph), oldLen)
123+
self.assertEqual(len(graph), 0)
124124

125125
def testLenInMultipleContexts(self):
126126
oldLen = len(self.graph.store)
127127
self.addStuffInMultipleContexts()
128128
# addStuffInMultipleContexts is adding the same triple to
129129
# three different contexts. So it's only + 1
130-
self.assertEquals(len(self.graph.store), oldLen + 1,
131-
[self.graph.store, oldLen + 1])
130+
self.assertEqual(len(self.graph.store), oldLen + 1,
131+
[self.graph.store, oldLen + 1])
132132

133133
graph = Graph(self.graph.store, self.c1)
134-
self.assertEquals(len(graph.store), oldLen + 1,
135-
[graph.store, oldLen + 1])
134+
self.assertEqual(len(graph.store), oldLen + 1,
135+
[graph.store, oldLen + 1])
136136

137137
def testRemoveInMultipleContexts(self):
138138
c1 = self.c1
@@ -142,21 +142,21 @@ def testRemoveInMultipleContexts(self):
142142
self.addStuffInMultipleContexts()
143143

144144
# triple should be still in store after removing it from c1 + c2
145-
self.assert_(triple in self.graph)
145+
self.assertIn(triple, self.graph)
146146
graph = Graph(self.graph.store, c1)
147147
graph.remove(triple)
148-
self.assert_(triple in self.graph)
148+
self.assertIn(triple, self.graph)
149149
graph = Graph(self.graph.store, c2)
150150
graph.remove(triple)
151-
self.assert_(triple in self.graph)
151+
self.assertIn(triple, self.graph)
152152
self.graph.remove(triple)
153153
# now gone!
154-
self.assert_(triple not in self.graph)
154+
self.assertNotIn(triple, self.graph)
155155

156156
# add again and see if remove without context removes all triples!
157157
self.addStuffInMultipleContexts()
158158
self.graph.remove(triple)
159-
self.assert_(triple not in self.graph)
159+
self.assertNotIn(triple, self.graph)
160160

161161
def testContexts(self):
162162
triple = (self.pizza, self.hates, self.tarek) # revenge!
@@ -167,28 +167,28 @@ def cid(c):
167167
if not isinstance(c, string_types):
168168
return c.identifier
169169
return c
170-
self.assert_(self.c1 in list(map(cid, self.graph.contexts())))
171-
self.assert_(self.c2 in list(map(cid, self.graph.contexts())))
170+
self.assertIn(self.c1, list(map(cid, self.graph.contexts())))
171+
self.assertIn(self.c2, list(map(cid, self.graph.contexts())))
172172

173173
contextList = list(map(cid, list(self.graph.contexts(triple))))
174-
self.assert_(self.c1 in contextList)
175-
self.assert_(self.c2 in contextList)
174+
self.assertIn(self.c1, contextList)
175+
self.assertIn(self.c2, contextList)
176176

177177
def testRemoveContext(self):
178178
c1 = self.c1
179179

180180
self.addStuffInMultipleContexts()
181-
self.assertEquals(len(Graph(self.graph.store, c1)), 1)
182-
self.assertEquals(len(self.get_context(c1)), 1)
181+
self.assertEqual(len(Graph(self.graph.store, c1)), 1)
182+
self.assertEqual(len(self.get_context(c1)), 1)
183183

184184
self.graph.remove_context(self.get_context(c1))
185-
self.assert_(self.c1 not in self.graph.contexts())
185+
self.assertNotIn(self.c1, self.graph.contexts())
186186

187187
def testRemoveAny(self):
188188
Any = None
189189
self.addStuffInMultipleContexts()
190190
self.graph.remove((Any, Any, Any))
191-
self.assertEquals(len(self.graph), 0)
191+
self.assertEqual(len(self.graph), 0)
192192

193193
def testTriples(self):
194194
tarek = self.tarek
@@ -199,7 +199,7 @@ def testTriples(self):
199199
pizza = self.pizza
200200
cheese = self.cheese
201201
c1 = self.c1
202-
asserte = self.assertEquals
202+
asserte = self.assertEqual
203203
triples = self.graph.triples
204204
graph = self.graph
205205
c1graph = Graph(self.graph.store, c1)

‎test/graph_case.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def testTriples(self):
8282
hates = self.hates
8383
pizza = self.pizza
8484
cheese = self.cheese
85-
asserte = self.assertEquals
85+
asserte = self.assertEqual
8686
triples = self.graph.triples
8787
Any = None
8888

@@ -128,14 +128,14 @@ def testTriples(self):
128128
def testConnected(self):
129129
graph = self.graph
130130
self.addStuff()
131-
self.assertEquals(True, graph.connected())
131+
self.assertEqual(True, graph.connected())
132132

133133
jeroen = URIRef("jeroen")
134134
unconnected = URIRef("unconnected")
135135

136136
graph.add((jeroen, self.likes, unconnected))
137137

138-
self.assertEquals(False, graph.connected())
138+
self.assertEqual(False, graph.connected())
139139

140140
def testSub(self):
141141
g1 = Graph()
@@ -156,19 +156,19 @@ def testSub(self):
156156

157157
g3 = g1 - g2
158158

159-
self.assertEquals(len(g3), 1)
160-
self.assertEquals((tarek, likes, pizza) in g3, True)
161-
self.assertEquals((tarek, likes, cheese) in g3, False)
159+
self.assertEqual(len(g3), 1)
160+
self.assertEqual((tarek, likes, pizza) in g3, True)
161+
self.assertEqual((tarek, likes, cheese) in g3, False)
162162

163-
self.assertEquals((bob, likes, cheese) in g3, False)
163+
self.assertEqual((bob, likes, cheese) in g3, False)
164164

165165
g1 -= g2
166166

167-
self.assertEquals(len(g1), 1)
168-
self.assertEquals((tarek, likes, pizza) in g1, True)
169-
self.assertEquals((tarek, likes, cheese) in g1, False)
167+
self.assertEqual(len(g1), 1)
168+
self.assertEqual((tarek, likes, pizza) in g1, True)
169+
self.assertEqual((tarek, likes, cheese) in g1, False)
170170

171-
self.assertEquals((bob, likes, cheese) in g1, False)
171+
self.assertEqual((bob, likes, cheese) in g1, False)
172172

173173
def testGraphAdd(self):
174174
g1 = Graph()
@@ -188,19 +188,19 @@ def testGraphAdd(self):
188188

189189
g3 = g1 + g2
190190

191-
self.assertEquals(len(g3), 2)
192-
self.assertEquals((tarek, likes, pizza) in g3, True)
193-
self.assertEquals((tarek, likes, cheese) in g3, False)
191+
self.assertEqual(len(g3), 2)
192+
self.assertEqual((tarek, likes, pizza) in g3, True)
193+
self.assertEqual((tarek, likes, cheese) in g3, False)
194194

195-
self.assertEquals((bob, likes, cheese) in g3, True)
195+
self.assertEqual((bob, likes, cheese) in g3, True)
196196

197197
g1 += g2
198198

199-
self.assertEquals(len(g1), 2)
200-
self.assertEquals((tarek, likes, pizza) in g1, True)
201-
self.assertEquals((tarek, likes, cheese) in g1, False)
199+
self.assertEqual(len(g1), 2)
200+
self.assertEqual((tarek, likes, pizza) in g1, True)
201+
self.assertEqual((tarek, likes, cheese) in g1, False)
202202

203-
self.assertEquals((bob, likes, cheese) in g1, True)
203+
self.assertEqual((bob, likes, cheese) in g1, True)
204204

205205
def testGraphIntersection(self):
206206
g1 = Graph()
@@ -222,24 +222,24 @@ def testGraphIntersection(self):
222222

223223
g3 = g1 * g2
224224

225-
self.assertEquals(len(g3), 1)
226-
self.assertEquals((tarek, likes, pizza) in g3, False)
227-
self.assertEquals((tarek, likes, cheese) in g3, False)
225+
self.assertEqual(len(g3), 1)
226+
self.assertEqual((tarek, likes, pizza) in g3, False)
227+
self.assertEqual((tarek, likes, cheese) in g3, False)
228228

229-
self.assertEquals((bob, likes, cheese) in g3, False)
229+
self.assertEqual((bob, likes, cheese) in g3, False)
230230

231-
self.assertEquals((michel, likes, cheese) in g3, True)
231+
self.assertEqual((michel, likes, cheese) in g3, True)
232232

233233
g1 *= g2
234234

235-
self.assertEquals(len(g1), 1)
235+
self.assertEqual(len(g1), 1)
236236

237-
self.assertEquals((tarek, likes, pizza) in g1, False)
238-
self.assertEquals((tarek, likes, cheese) in g1, False)
237+
self.assertEqual((tarek, likes, pizza) in g1, False)
238+
self.assertEqual((tarek, likes, cheese) in g1, False)
239239

240-
self.assertEquals((bob, likes, cheese) in g1, False)
240+
self.assertEqual((bob, likes, cheese) in g1, False)
241241

242-
self.assertEquals((michel, likes, cheese) in g1, True)
242+
self.assertEqual((michel, likes, cheese) in g1, True)
243243

244244
def testStoreLiterals(self):
245245
bob = self.bob
@@ -256,14 +256,14 @@ def testStoreLiterals(self):
256256
objs = list(self.graph.objects(subject=bob, predicate=says))
257257
for o in objs:
258258
if o.value == u"hello":
259-
self.assertEquals(o.language, "en")
259+
self.assertEqual(o.language, "en")
260260
elif o.value == u"こんにちは":
261-
self.assertEquals(o.language, "ja")
261+
self.assertEqual(o.language, "ja")
262262
elif o.value == u"something":
263-
self.assertEquals(o.language, None)
263+
self.assertEqual(o.language, None)
264264
else:
265265
self.fail()
266-
self.assertEquals(len(list(objs)), 3)
266+
self.assertEqual(len(list(objs)), 3)
267267

268268
def testStoreLiteralsXml(self):
269269
bob = self.bob
@@ -278,11 +278,11 @@ def testStoreLiteralsXml(self):
278278
self.graph.parse(StringInputSource(testdoc), formal="xml")
279279

280280
objs = list(self.graph)
281-
self.assertEquals(len(objs), 3)
281+
self.assertEqual(len(objs), 3)
282282
for o in objs:
283-
self.assertEquals(o[0], bob)
284-
self.assertEquals(o[1], says)
285-
self.assertTrue(o[2] in objects)
283+
self.assertEqual(o[0], bob)
284+
self.assertEqual(o[1], says)
285+
self.assertIn(o[2], objects)
286286

287287
def testStoreLiteralsXmlQuote(self):
288288
bob = self.bob
@@ -294,9 +294,9 @@ def testStoreLiteralsXmlQuote(self):
294294
self.graph.parse(StringInputSource(testdoc), formal="xml")
295295

296296
objs = list(self.graph)
297-
self.assertEquals(len(objs), 1)
297+
self.assertEqual(len(objs), 1)
298298
o = objs[0]
299-
self.assertEquals(o, (bob, says, imtheone))
299+
self.assertEqual(o, (bob, says, imtheone))
300300

301301
def testBindNamespace(self):
302302
""" Check that bound namespaced with prefix (including empty ones) are correctly kept """

0 commit comments

Comments
 (0)