openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Refactor tests

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-12-14 12:44:50 +02:00
parent a794f4caad
commit ed158c8f9f
2 changed files with 180 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
tests/mixins.py Normal file
View File

@@ -0,0 +1,171 @@
import sqlalchemy as sa
class ThreeLevelDeepOneToOne(object):
def create_models(self):
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
category = sa.orm.relationship(
'Category',
uselist=False,
backref='catalog'
)
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
catalog_id = sa.Column(sa.Integer, sa.ForeignKey('catalog.id'))
sub_category = sa.orm.relationship(
'SubCategory',
uselist=False,
backref='category'
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
category_id = sa.Column(sa.Integer, sa.ForeignKey('category.id'))
product = sa.orm.relationship(
'Product',
uselist=False,
backref='sub_category'
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Integer)
sub_category_id = sa.Column(
sa.Integer, sa.ForeignKey('sub_category.id')
)
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product
class ThreeLevelDeepOneToMany(object):
def create_models(self):
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
categories = sa.orm.relationship('Category', backref='catalog')
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
catalog_id = sa.Column(sa.Integer, sa.ForeignKey('catalog.id'))
sub_categories = sa.orm.relationship(
'SubCategory', backref='category'
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
category_id = sa.Column(sa.Integer, sa.ForeignKey('category.id'))
products = sa.orm.relationship(
'Product',
backref='sub_category'
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Numeric)
sub_category_id = sa.Column(
sa.Integer, sa.ForeignKey('sub_category.id')
)
def __repr__(self):
return '<Product id=%r>' % self.id
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product
class ThreeLevelDeepManyToMany(object):
def create_models(self):
catalog_category = sa.Table(
'catalog_category',
self.Base.metadata,
sa.Column('catalog_id', sa.Integer, sa.ForeignKey('catalog.id')),
sa.Column('category_id', sa.Integer, sa.ForeignKey('category.id'))
)
category_subcategory = sa.Table(
'category_subcategory',
self.Base.metadata,
sa.Column(
'category_id',
sa.Integer,
sa.ForeignKey('category.id')
),
sa.Column(
'subcategory_id',
sa.Integer,
sa.ForeignKey('sub_category.id')
)
)
subcategory_product = sa.Table(
'subcategory_product',
self.Base.metadata,
sa.Column(
'subcategory_id',
sa.Integer,
sa.ForeignKey('sub_category.id')
),
sa.Column(
'product_id',
sa.Integer,
sa.ForeignKey('product.id')
)
)
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
categories = sa.orm.relationship(
'Category',
backref='catalogs',
secondary=catalog_category
)
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
sub_categories = sa.orm.relationship(
'SubCategory',
backref='categories',
secondary=category_subcategory
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
products = sa.orm.relationship(
'Product',
backref='sub_categories',
secondary=subcategory_product
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Numeric)
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product

178
tests/relationships/test_chained_join.py
View File

@@ -1,90 +1,16 @@
import sqlalchemy as sa
from sqlalchemy_utils.relationships import chained_join from sqlalchemy_utils.relationships import chained_join
from tests import TestCase from tests import TestCase
from tests.mixins import (
ThreeLevelDeepManyToMany,
ThreeLevelDeepOneToMany,
ThreeLevelDeepOneToOne,
)
class TestChainedJoinForManyToManyToManyToMany(TestCase): class TestChainedJoinFoDeepToManyToMany(ThreeLevelDeepManyToMany, TestCase):
dns = 'postgres://postgres@localhost/sqlalchemy_utils_test' dns = 'postgres://postgres@localhost/sqlalchemy_utils_test'
create_tables = False create_tables = False
def create_models(self):
catalog_category = sa.Table(
'catalog_category',
self.Base.metadata,
sa.Column('catalog_id', sa.Integer, sa.ForeignKey('catalog.id')),
sa.Column('category_id', sa.Integer, sa.ForeignKey('category.id'))
)
category_subcategory = sa.Table(
'category_subcategory',
self.Base.metadata,
sa.Column(
'category_id',
sa.Integer,
sa.ForeignKey('category.id')
),
sa.Column(
'subcategory_id',
sa.Integer,
sa.ForeignKey('sub_category.id')
)
)
subcategory_product = sa.Table(
'subcategory_product',
self.Base.metadata,
sa.Column(
'subcategory_id',
sa.Integer,
sa.ForeignKey('sub_category.id')
),
sa.Column(
'product_id',
sa.Integer,
sa.ForeignKey('product.id')
)
)
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
categories = sa.orm.relationship(
'Category',
backref='catalogs',
secondary=catalog_category
)
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
sub_categories = sa.orm.relationship(
'SubCategory',
backref='categories',
secondary=category_subcategory
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
products = sa.orm.relationship(
'Product',
backref='sub_categories',
secondary=subcategory_product
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Numeric)
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product
def test_simple_join(self): def test_simple_join(self):
assert str(chained_join(self.Catalog.categories)) == ( assert str(chained_join(self.Catalog.categories)) == (
'catalog_category JOIN category ON ' 'catalog_category JOIN category ON '
@@ -120,52 +46,10 @@ class TestChainedJoinForManyToManyToManyToMany(TestCase):
) )
class TestChainedJoinFor3LevelDeepOneToMany(TestCase): class TestChainedJoinForDeepOneToMany(ThreeLevelDeepOneToMany, TestCase):
dns = 'postgres://postgres@localhost/sqlalchemy_utils_test' dns = 'postgres://postgres@localhost/sqlalchemy_utils_test'
create_tables = False create_tables = False
def create_models(self):
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
categories = sa.orm.relationship('Category', backref='catalog')
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
catalog_id = sa.Column(sa.Integer, sa.ForeignKey('catalog.id'))
sub_categories = sa.orm.relationship(
'SubCategory', backref='category'
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
category_id = sa.Column(sa.Integer, sa.ForeignKey('category.id'))
products = sa.orm.relationship(
'Product',
backref='sub_category'
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Numeric)
sub_category_id = sa.Column(
sa.Integer, sa.ForeignKey('sub_category.id')
)
def __repr__(self):
return '<Product id=%r>' % self.id
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product
def test_simple_join(self): def test_simple_join(self):
assert str(chained_join(self.Catalog.categories)) == 'category' assert str(chained_join(self.Catalog.categories)) == 'category'
@@ -192,53 +76,9 @@ class TestChainedJoinFor3LevelDeepOneToMany(TestCase):
) )
class TestChainedJoinForOneToOneToOneToOne(TestCase): class TestChainedJoinForDeepOneToOne(ThreeLevelDeepOneToOne, TestCase):
dns = 'postgres://postgres@localhost/sqlalchemy_utils_test' dns = 'postgres://postgres@localhost/sqlalchemy_utils_test'
create_tables = False
def create_models(self):
class Catalog(self.Base):
__tablename__ = 'catalog'
id = sa.Column(sa.Integer, primary_key=True)
category = sa.orm.relationship(
'Category',
uselist=False,
backref='catalog'
)
class Category(self.Base):
__tablename__ = 'category'
id = sa.Column(sa.Integer, primary_key=True)
catalog_id = sa.Column(sa.Integer, sa.ForeignKey('catalog.id'))
sub_category = sa.orm.relationship(
'SubCategory',
uselist=False,
backref='category'
)
class SubCategory(self.Base):
__tablename__ = 'sub_category'
id = sa.Column(sa.Integer, primary_key=True)
category_id = sa.Column(sa.Integer, sa.ForeignKey('category.id'))
product = sa.orm.relationship(
'Product',
uselist=False,
backref='sub_category'
)
class Product(self.Base):
__tablename__ = 'product'
id = sa.Column(sa.Integer, primary_key=True)
price = sa.Column(sa.Integer)
sub_category_id = sa.Column(
sa.Integer, sa.ForeignKey('sub_category.id')
)
self.Catalog = Catalog
self.Category = Category
self.SubCategory = SubCategory
self.Product = Product
def test_simple_join(self): def test_simple_join(self):
assert str(chained_join(self.Catalog.category)) == 'category' assert str(chained_join(self.Catalog.category)) == 'category'