Skip to content

Commit ac6c4bc

Browse files
flipbit03flipbit03
committed
Reverted all tests. We will be writing new tests specifically for the hybrid_property type inference thing so that we don't need to pepper unwanted imports and generations in other unrelated tests.
1 parent 3f3593e commit ac6c4bc

File tree

6 files changed

+237
-330
lines changed

6 files changed

+237
-330
lines changed

‎graphene_sqlalchemy/tests/test_batching.py

Lines changed: 123 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
class MockLoggingHandler(logging.Handler):
1919
"""Intercept and store log messages in a list."""
20-
2120
def __init__(self, *args, **kwargs):
2221
self.messages = []
2322
logging.Handler.__init__(self, *args, **kwargs)
@@ -43,15 +42,15 @@ def mock_sqlalchemy_logging_handler():
4342

4443

4544
def get_schema():
46-
class ArticleType(SQLAlchemyObjectType):
45+
class ReporterType(SQLAlchemyObjectType):
4746
class Meta:
48-
model = Article
47+
model = Reporter
4948
interfaces = (relay.Node,)
5049
batching = True
5150

52-
class ReporterType(SQLAlchemyObjectType):
51+
class ArticleType(SQLAlchemyObjectType):
5352
class Meta:
54-
model = Reporter
53+
model = Article
5554
interfaces = (relay.Node,)
5655
batching = True
5756

@@ -83,11 +82,11 @@ async def test_many_to_one(session_factory):
8382
session = session_factory()
8483

8584
reporter_1 = Reporter(
86-
first_name='Reporter_1',
85+
first_name='Reporter_1',
8786
)
8887
session.add(reporter_1)
8988
reporter_2 = Reporter(
90-
first_name='Reporter_2',
89+
first_name='Reporter_2',
9190
)
9291
session.add(reporter_2)
9392

@@ -139,20 +138,20 @@ async def test_many_to_one(session_factory):
139138
assert not result.errors
140139
result = to_std_dicts(result.data)
141140
assert result == {
142-
"articles": [
143-
{
144-
"headline": "Article_1",
145-
"reporter": {
146-
"firstName": "Reporter_1",
147-
},
148-
},
149-
{
150-
"headline": "Article_2",
151-
"reporter": {
152-
"firstName": "Reporter_2",
153-
},
154-
},
155-
],
141+
"articles": [
142+
{
143+
"headline": "Article_1",
144+
"reporter": {
145+
"firstName": "Reporter_1",
146+
},
147+
},
148+
{
149+
"headline": "Article_2",
150+
"reporter": {
151+
"firstName": "Reporter_2",
152+
},
153+
},
154+
],
156155
}
157156

158157

@@ -161,11 +160,11 @@ async def test_one_to_one(session_factory):
161160
session = session_factory()
162161

163162
reporter_1 = Reporter(
164-
first_name='Reporter_1',
163+
first_name='Reporter_1',
165164
)
166165
session.add(reporter_1)
167166
reporter_2 = Reporter(
168-
first_name='Reporter_2',
167+
first_name='Reporter_2',
169168
)
170169
session.add(reporter_2)
171170

@@ -217,20 +216,20 @@ async def test_one_to_one(session_factory):
217216
assert not result.errors
218217
result = to_std_dicts(result.data)
219218
assert result == {
220-
"reporters": [
221-
{
222-
"firstName": "Reporter_1",
223-
"favoriteArticle": {
224-
"headline": "Article_1",
225-
},
226-
},
227-
{
228-
"firstName": "Reporter_2",
229-
"favoriteArticle": {
230-
"headline": "Article_2",
231-
},
232-
},
233-
],
219+
"reporters": [
220+
{
221+
"firstName": "Reporter_1",
222+
"favoriteArticle": {
223+
"headline": "Article_1",
224+
},
225+
},
226+
{
227+
"firstName": "Reporter_2",
228+
"favoriteArticle": {
229+
"headline": "Article_2",
230+
},
231+
},
232+
],
234233
}
235234

236235

@@ -239,11 +238,11 @@ async def test_one_to_many(session_factory):
239238
session = session_factory()
240239

241240
reporter_1 = Reporter(
242-
first_name='Reporter_1',
241+
first_name='Reporter_1',
243242
)
244243
session.add(reporter_1)
245244
reporter_2 = Reporter(
246-
first_name='Reporter_2',
245+
first_name='Reporter_2',
247246
)
248247
session.add(reporter_2)
249248

@@ -307,42 +306,42 @@ async def test_one_to_many(session_factory):
307306
assert not result.errors
308307
result = to_std_dicts(result.data)
309308
assert result == {
310-
"reporters": [
311-
{
312-
"firstName": "Reporter_1",
313-
"articles": {
314-
"edges": [
315-
{
316-
"node": {
317-
"headline": "Article_1",
318-
},
319-
},
320-
{
321-
"node": {
322-
"headline": "Article_2",
323-
},
324-
},
325-
],
309+
"reporters": [
310+
{
311+
"firstName": "Reporter_1",
312+
"articles": {
313+
"edges": [
314+
{
315+
"node": {
316+
"headline": "Article_1",
317+
},
318+
},
319+
{
320+
"node": {
321+
"headline": "Article_2",
322+
},
323+
},
324+
],
325+
},
326+
},
327+
{
328+
"firstName": "Reporter_2",
329+
"articles": {
330+
"edges": [
331+
{
332+
"node": {
333+
"headline": "Article_3",
326334
},
327-
},
328-
{
329-
"firstName": "Reporter_2",
330-
"articles": {
331-
"edges": [
332-
{
333-
"node": {
334-
"headline": "Article_3",
335-
},
336-
},
337-
{
338-
"node": {
339-
"headline": "Article_4",
340-
},
341-
},
342-
],
335+
},
336+
{
337+
"node": {
338+
"headline": "Article_4",
343339
},
344-
},
345-
],
340+
},
341+
],
342+
},
343+
},
344+
],
346345
}
347346

348347

@@ -351,11 +350,11 @@ async def test_many_to_many(session_factory):
351350
session = session_factory()
352351

353352
reporter_1 = Reporter(
354-
first_name='Reporter_1',
353+
first_name='Reporter_1',
355354
)
356355
session.add(reporter_1)
357356
reporter_2 = Reporter(
358-
first_name='Reporter_2',
357+
first_name='Reporter_2',
359358
)
360359
session.add(reporter_2)
361360

@@ -421,42 +420,42 @@ async def test_many_to_many(session_factory):
421420
assert not result.errors
422421
result = to_std_dicts(result.data)
423422
assert result == {
424-
"reporters": [
425-
{
426-
"firstName": "Reporter_1",
427-
"pets": {
428-
"edges": [
429-
{
430-
"node": {
431-
"name": "Pet_1",
432-
},
433-
},
434-
{
435-
"node": {
436-
"name": "Pet_2",
437-
},
438-
},
439-
],
423+
"reporters": [
424+
{
425+
"firstName": "Reporter_1",
426+
"pets": {
427+
"edges": [
428+
{
429+
"node": {
430+
"name": "Pet_1",
440431
},
441-
},
442-
{
443-
"firstName": "Reporter_2",
444-
"pets": {
445-
"edges": [
446-
{
447-
"node": {
448-
"name": "Pet_3",
449-
},
450-
},
451-
{
452-
"node": {
453-
"name": "Pet_4",
454-
},
455-
},
456-
],
432+
},
433+
{
434+
"node": {
435+
"name": "Pet_2",
457436
},
458-
},
459-
],
437+
},
438+
],
439+
},
440+
},
441+
{
442+
"firstName": "Reporter_2",
443+
"pets": {
444+
"edges": [
445+
{
446+
"node": {
447+
"name": "Pet_3",
448+
},
449+
},
450+
{
451+
"node": {
452+
"name": "Pet_4",
453+
},
454+
},
455+
],
456+
},
457+
},
458+
],
460459
}
461460

462461

@@ -469,11 +468,6 @@ def test_disable_batching_via_ormfield(session_factory):
469468
session.commit()
470469
session.close()
471470

472-
class ArticleType(SQLAlchemyObjectType):
473-
class Meta:
474-
model = Article
475-
interfaces = (relay.Node,)
476-
477471
class ReporterType(SQLAlchemyObjectType):
478472
class Meta:
479473
model = Reporter
@@ -483,6 +477,11 @@ class Meta:
483477
favorite_article = ORMField(batching=False)
484478
articles = ORMField(batching=False)
485479

480+
class ArticleType(SQLAlchemyObjectType):
481+
class Meta:
482+
model = Article
483+
interfaces = (relay.Node,)
484+
486485
class Query(graphene.ObjectType):
487486
reporters = graphene.Field(graphene.List(ReporterType))
488487

@@ -542,11 +541,6 @@ async def test_connection_factory_field_overrides_batching_is_false(session_fact
542541
session.commit()
543542
session.close()
544543

545-
class ArticleType(SQLAlchemyObjectType):
546-
class Meta:
547-
model = Article
548-
interfaces = (relay.Node,)
549-
550544
class ReporterType(SQLAlchemyObjectType):
551545
class Meta:
552546
model = Reporter
@@ -556,6 +550,11 @@ class Meta:
556550

557551
articles = ORMField(batching=False)
558552

553+
class ArticleType(SQLAlchemyObjectType):
554+
class Meta:
555+
model = Article
556+
interfaces = (relay.Node,)
557+
559558
class Query(graphene.ObjectType):
560559
reporters = graphene.Field(graphene.List(ReporterType))
561560

@@ -601,11 +600,6 @@ def test_connection_factory_field_overrides_batching_is_true(session_factory):
601600
session.commit()
602601
session.close()
603602

604-
class ArticleType(SQLAlchemyObjectType):
605-
class Meta:
606-
model = Article
607-
interfaces = (relay.Node,)
608-
609603
class ReporterType(SQLAlchemyObjectType):
610604
class Meta:
611605
model = Reporter
@@ -615,6 +609,11 @@ class Meta:
615609

616610
articles = ORMField(batching=True)
617611

612+
class ArticleType(SQLAlchemyObjectType):
613+
class Meta:
614+
model = Article
615+
interfaces = (relay.Node,)
616+
618617
class Query(graphene.ObjectType):
619618
reporters = graphene.Field(graphene.List(ReporterType))
620619

0 commit comments

Comments
 (0)