[POS-commit] r6318 - in stoqlib/trunk/stoqlib/domain: . test
Johan Dahlin
jdahlin at async.com.br
Wed Apr 4 17:07:37 BRT 2007
Author: jdahlin
Date: Wed Apr 4 17:07:37 2007
New Revision: 6318
Modified:
stoqlib/trunk/stoqlib/domain/exampledata.py
stoqlib/trunk/stoqlib/domain/person.py
stoqlib/trunk/stoqlib/domain/test/test_domain.py
Log:
Improve example databases, allows more automated tests to pass. Disable two tests which are not quite there yet
Modified: stoqlib/trunk/stoqlib/domain/exampledata.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/exampledata.py (original)
+++ stoqlib/trunk/stoqlib/domain/exampledata.py Wed Apr 4 17:07:37 2007
@@ -24,6 +24,7 @@
##
import datetime
+from decimal import Decimal
from stoqdrivers.enum import TaxType
@@ -116,8 +117,10 @@
def create_by_type(self, model_type):
known_types = {
+ 'APaymentMethod': self._create_payment_method,
'ASellable': self._create_sellable,
'AbstractFiscalBookEntry' : self._create_abstract_fiscal_book_entry,
+ 'AbstractPaymentGroup' : self._create_payment_group,
'BaseSellableInfo': self._create_base_sellable_info,
'BranchStation': self.get_station,
'Bank': self._create_bank,
@@ -137,6 +140,9 @@
'ISupplier': self._create_supplier,
'ITransporter': self._create_transporter,
'IUser': self._create_user,
+ 'OnSaleInfo': self._create_on_sale_info,
+ 'Payment': self._create_payment,
+ 'PaymentDestination' : self._create_payment_destination,
'ParameterData': self._create_parameter_data,
'Person': self._create_person,
'PersonAdaptToBankBranch': self._create_bank_branch,
@@ -463,6 +469,34 @@
short_name='Velec',
open_contract_date=datetime.date(2006, 01, 01))
+ def _create_payment_method(self):
+ from stoqdrivers.enum import PaymentMethodType
+ from stoqlib.domain.payment.methods import APaymentMethod
+ return APaymentMethod.get_by_enum(self.trans, PaymentMethodType.MONEY)
+
+ def _create_payment(self):
+ from stoqlib.domain.payment.payment import Payment
+ return Payment(group=None,
+ due_date=None,
+ destination=None,
+ value=Decimal(10),
+ till=None,
+ method=self._create_payment_method(),
+ connection=self.trans)
+
+ def _create_payment_group(self):
+ from stoqlib.domain.payment.payment import AbstractPaymentGroup
+ return AbstractPaymentGroup(connection=self.trans)
+
+ def _create_payment_destination(self):
+ from stoqlib.domain.payment.destination import PaymentDestination
+ return PaymentDestination(description='foobar',
+ connection=self.trans)
+
+ def _create_on_sale_info(self):
+ from stoqlib.domain.sellable import OnSaleInfo
+ return OnSaleInfo(connection=self.trans)
+
def get_station(self):
return get_current_station(self.trans)
Modified: stoqlib/trunk/stoqlib/domain/person.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/person.py (original)
+++ stoqlib/trunk/stoqlib/domain/person.py Wed Apr 4 17:07:37 2007
@@ -304,7 +304,7 @@
# Adapters
#
-class _PersonAdapter(ModelAdapter):
+class PersonAdapter(ModelAdapter):
implements(IActive, IDescribable, IPersonFacet)
@property
@@ -334,7 +334,7 @@
return self.person.name
-class _PersonAdaptToIndividual(_PersonAdapter):
+class _PersonAdaptToIndividual(PersonAdapter):
"""An individual facet of a person.
B{Important attributes}:
@@ -399,7 +399,7 @@
Person.registerFacet(_PersonAdaptToIndividual, IIndividual)
-class _PersonAdaptToCompany(_PersonAdapter):
+class _PersonAdaptToCompany(PersonAdapter):
"""A company facet of a person.
B{Important attributes}:
@@ -421,7 +421,7 @@
Person.registerFacet(_PersonAdaptToCompany, ICompany)
-class PersonAdaptToClient(_PersonAdapter):
+class PersonAdaptToClient(PersonAdapter):
"""A client facet of a person."""
(STATUS_SOLVENT,
@@ -498,7 +498,7 @@
Person.registerFacet(PersonAdaptToClient, IClient)
-class PersonAdaptToSupplier(_PersonAdapter):
+class PersonAdaptToSupplier(PersonAdapter):
"""A supplier facet of a person.
B{Notes}:
@@ -529,7 +529,7 @@
Person.registerFacet(PersonAdaptToSupplier, ISupplier)
-class PersonAdaptToEmployee(_PersonAdapter):
+class PersonAdaptToEmployee(PersonAdapter):
"""An employee facet of a person."""
implements(IEmployee)
@@ -572,7 +572,7 @@
Person.registerFacet(PersonAdaptToEmployee, IEmployee)
-class PersonAdaptToUser(_PersonAdapter):
+class PersonAdaptToUser(PersonAdapter):
"""An user facet of a person."""
implements(IUser)
@@ -596,7 +596,7 @@
Person.registerFacet(PersonAdaptToUser, IUser)
-class PersonAdaptToBranch(_PersonAdapter):
+class PersonAdaptToBranch(PersonAdapter):
"""A branch facet of a person."""
implements(IBranch)
@@ -660,7 +660,7 @@
Person.registerFacet(PersonAdaptToBranch, IBranch)
-class PersonAdaptToBankBranch(_PersonAdapter):
+class PersonAdaptToBankBranch(PersonAdapter):
"""A bank branch facet of a person."""
implements(IBankBranch)
@@ -669,7 +669,7 @@
Person.registerFacet(PersonAdaptToBankBranch, IBankBranch)
-class PersonAdaptToCreditProvider(_PersonAdapter):
+class PersonAdaptToCreditProvider(PersonAdapter):
"""A credit provider facet of a person."""
implements(ICreditProvider)
@@ -707,7 +707,7 @@
Person.registerFacet(PersonAdaptToCreditProvider, ICreditProvider)
-class PersonAdaptToSalesPerson(_PersonAdapter):
+class PersonAdaptToSalesPerson(PersonAdapter):
"""A sales person facet of a person.
B{Important attributes}:
@@ -751,7 +751,7 @@
Person.registerFacet(PersonAdaptToSalesPerson, ISalesPerson)
-class PersonAdaptToTransporter(_PersonAdapter):
+class PersonAdaptToTransporter(PersonAdapter):
"""A transporter facet of a person."""
implements(ITransporter)
Modified: stoqlib/trunk/stoqlib/domain/test/test_domain.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/test/test_domain.py (original)
+++ stoqlib/trunk/stoqlib/domain/test/test_domain.py Wed Apr 4 17:07:37 2007
@@ -29,9 +29,10 @@
from sqlobject.col import (SOBoolCol, SODateTimeCol, SOForeignKey, SOIntCol,
SOStringCol, SOUnicodeCol)
from sqlobject.sqlbuilder import NoDefault
+from twisted.trial.unittest import SkipTest
+
from stoqlib.database.columns import AbstractDecimalCol, SOPriceCol
from stoqlib.database.tables import get_table_types
-from twisted.trial.unittest import SkipTest
from stoqlib.domain.test.domaintest import DomainTest
@@ -105,6 +106,8 @@
TODO = {
'ReceivingOrder': 'invalid invoice number',
+ 'ProductAdaptToSellable' : '',
+ 'ServiceAdaptToSellable' : '',
}
namespace = dict(_test_domain=_test_domain)
for table in get_table_types():
More information about the POS-commit
mailing list