[Pymerase-cvs-commit] pymerase/tests/pymerase TestClassMembers.py,1.2,1.3

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/tests/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv2014

Modified Files:
	TestClassMembers.py 
Log Message:
added tests for isPublic/Private/Protected. Fixed some invalid tests

Index: TestClassMembers.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/tests/pymerase/TestClassMembers.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestClassMembers.py	10 Sep 2003 02:05:30 -0000	1.2
--- TestClassMembers.py	16 Jan 2004 00:49:16 -0000	1.3
***************
*** 17,21 ****
  
  #from pymerase.util import NameMangling
! 
  class ClassMemberTestCases(unittest.TestCase):
  
--- 17,21 ----
  
  #from pymerase.util import NameMangling
! TRANSLATOR=None
  class ClassMemberTestCases(unittest.TestCase):
  
***************
*** 33,37 ****
      # can we be named
      me = ClassMembers.ModelElement(self.config, "testModelElement")
!     self.failUnless(me.getName(None) == "testModelElement")
      
      # does the friendly name default properly?
--- 33,37 ----
      # can we be named
      me = ClassMembers.ModelElement(self.config, "testModelElement")
!     self.failUnless(me.getName(TRANSLATOR) == "testModelElement")
      
      # does the friendly name default properly?
***************
*** 71,77 ****
  
      # test naming utilities
!     self.failUnless(me.getGetterName(None) == 'gettestModelElement')
!     self.failUnless(me.getSetterName(None) == 'settestModelElement')
!     self.failUnless(me.getAppenderName(None) == 'appendtestModelElement')
  
  
--- 71,77 ----
  
      # test naming utilities
!     self.failUnless(me.getGetterName(TRANSLATOR) == 'gettestModelElement')
!     self.failUnless(me.getSetterName(TRANSLATOR) == 'settestModelElement')
!     self.failUnless(me.getAppenderName(TRANSLATOR) == 'appendtestModelElement')
  
  
***************
*** 130,133 ****
--- 130,145 ----
        self.fail("a key cannot be both a primary and foreign key")
  
+     # test accessors
+     # default is public access
+     self.failUnless(ca.isPublicAccess() and not ca.isProtectedAccess() and not ca.isPrivateAccess(), "default is public")
+     ca.setProtectedAccess()
+     self.failUnless(not ca.isPublicAccess() and ca.isProtectedAccess() and not ca.isPrivateAccess(), "should've been protected")
+     ca.setPrivateAccess()
+     self.failUnless(not ca.isPublicAccess() and not ca.isProtectedAccess() and ca.isPrivateAccess(), "should've been private")
+     ca.setPublicAccess()
+     self.failUnless(ca.isPublicAccess() and not ca.isProtectedAccess() and not ca.isPrivateAccess(), "should've been public")
+ 
+     
+ 
    def testAssociationEnd(self):
      """Test parts of an AssociationEnd that doesn't depend on being in an Association
***************
*** 136,145 ****
  
      ae.setAttributeName('attribute')
!     self.failUnless(ae.getAttributeName(None) == 'attribute')
  
      cmi = ClassMembers.ClassMetaInfo(self.config, 'ClassMetaInfo')
      ae.setType(cmi)
      self.failUnless(ae.getType() == cmi)
!     self.failUnless(ae.getClassName(None) == 'ClassMetaInfo')
  
      self.failUnless(ae.getMultiplicity() is None)
--- 148,157 ----
  
      ae.setAttributeName('attribute')
!     self.failUnless(ae.getAttributeName(TRANSLATOR) == 'attribute')
  
      cmi = ClassMembers.ClassMetaInfo(self.config, 'ClassMetaInfo')
      ae.setType(cmi)
      self.failUnless(ae.getType() == cmi)
!     self.failUnless(ae.getClassName(TRANSLATOR) == 'ClassMetaInfo')
  
      self.failUnless(ae.getMultiplicity() is None)
***************
*** 151,157 ****
      self.failUnless(ae.isNavigable())
  
!     self.failUnless(ae.getGetterName(None) == 'gettestAssociationEnd')
!     self.failUnless(ae.getSetterName(None) == 'settestAssociationEnd')
!     self.failUnless(ae.getAppenderName(None) == 'appendtestAssociationEnd')
  
  
--- 163,169 ----
      self.failUnless(ae.isNavigable())
  
!     self.failUnless(ae.getGetterName(TRANSLATOR) == 'gettestAssociationEnd')
!     self.failUnless(ae.getSetterName(TRANSLATOR) == 'settestAssociationEnd')
!     self.failUnless(ae.getAppenderName(TRANSLATOR) == 'appendtestAssociationEnd')
  
  
***************
*** 171,175 ****
      A = ClassMembers.createAssociation(self.config, leftAE, rightAE, "ends")
  
!     self.failUnless(A.getName(None) == "ends")
      self.failUnless(len(A) == 2)
      self.failUnless(leftAE.getAssociation() == A)
--- 183,187 ----
      A = ClassMembers.createAssociation(self.config, leftAE, rightAE, "ends")
  
!     self.failUnless(A.getName(TRANSLATOR) == "ends")
      self.failUnless(len(A) == 2)
      self.failUnless(leftAE.getAssociation() == A)
***************
*** 188,192 ****
      A = ClassMembers.createAssociation(self.config, leftAE, rightAE)
  
!     self.failUnless(A.getName(None) == 'leftAssociationEndrightAssociationEnd')
  
    def testClassMetaInfo(self):
--- 200,204 ----
      A = ClassMembers.createAssociation(self.config, leftAE, rightAE)
  
!     self.failUnless(A.getName(TRANSLATOR) == 'leftAssociationEndrightAssociationEnd')
  
    def testClassMetaInfo(self):
***************
*** 199,210 ****
      cmi = ClassMembers.ClassMetaInfo(self.config, "testClassMetaInfo")
  
!     testFilename = "/a/b/c/d"
!     cmi.setFilename(testFilename)
  
      self.failUnless(cmi.getFilename() == testFilename, "%s was not %s" % (cmi.getFilename(), testFilename) )
  
!     self.failUnless(not cmi.getAbstract())
      cmi.setAbstract(1)
!     self.failUnless(cmi.getAbstract())
  
      # FIXME: test adding an association end?
--- 211,223 ----
      cmi = ClassMembers.ClassMetaInfo(self.config, "testClassMetaInfo")
  
!     testPathname = "/a/b/c/d"
!     testPath, testFilename = os.path.split(testPathname)
!     cmi.setFilename(testPathname)
  
      self.failUnless(cmi.getFilename() == testFilename, "%s was not %s" % (cmi.getFilename(), testFilename) )
  
!     self.failUnless(not cmi.isAbstract())
      cmi.setAbstract(1)
!     self.failUnless(cmi.isAbstract())
  
      # FIXME: test adding an association end?
***************
*** 213,232 ****
      attrib2 = ClassMembers.ClassAttribute(self.config, 'attrib2')
  
!     self.failUnless(len(cmi.getAttributes() == 0))
      cmi.addAttribute(attrib1)
      cmi.addAttribute(attrib2)
!     self.failUnless(len(cmi.getAttributes() == 2))
!     self.failUnless(cmi.getAttributeByName('attrib1') == attrib1)
!     self.failUnless(len(cmi.getAttributeNames()) == 2)
!     self.failUnless('attrib1' in cmi.getAttributeNames())
      
      cmi.appendBaseClass(root1)
      cmi.appendBaseClass(root2)
      self.failUnless(root1 in cmi.getBaseClasses())
!     self.failUnless('root1' in cmi.getBaseClassNames(None))
      self.failUnless(root2 in cmi.getBaseClasses())
!     self.failUnless('root2' in cmi.getBaseClassNames(None))
      self.failUnless(len(cmi.getBaseClasses()) == 2)
!     self.failUnless(len(cmi.getBaseClassNames()) == 2)
  
      self.failUnless(not cmi.isRootClass())
--- 226,245 ----
      attrib2 = ClassMembers.ClassAttribute(self.config, 'attrib2')
  
!     self.failUnless(len(cmi.getAttributes()) == 0)
      cmi.addAttribute(attrib1)
      cmi.addAttribute(attrib2)
!     self.failUnless(len(cmi.getAttributes()) == 2)
!     self.failUnless(cmi.getAttributeByName('attrib1', TRANSLATOR) == attrib1)
!     self.failUnless(len(cmi.getAttributeNames(TRANSLATOR)) == 2)
!     self.failUnless('attrib1' in cmi.getAttributeNames(TRANSLATOR))
      
      cmi.appendBaseClass(root1)
      cmi.appendBaseClass(root2)
      self.failUnless(root1 in cmi.getBaseClasses())
!     self.failUnless('root1' in cmi.getBaseClassNames(TRANSLATOR))
      self.failUnless(root2 in cmi.getBaseClasses())
!     self.failUnless('root2' in cmi.getBaseClassNames(TRANSLATOR))
      self.failUnless(len(cmi.getBaseClasses()) == 2)
!     self.failUnless(len(cmi.getBaseClassNames(TRANSLATOR)) == 2)
  
      self.failUnless(not cmi.isRootClass())
***************
*** 235,240 ****
      self.failUnless(cmi.getRootClass() == root1)
  
!     self.failUnless(cmi.getBasePrimaryKeyName(None) == 'root1Attrib_pk')
!     self.failUnless(smi.getForeignKeyName(None) == 'testClassMetaInfo_fk')
      
  def suite():
--- 248,253 ----
      self.failUnless(cmi.getRootClass() == root1)
  
!     self.failUnless(cmi.getBasePrimaryKeyName(TRANSLATOR) == 'root1_pk')
!     self.failUnless(cmi.getForeignKeyName(TRANSLATOR) == 'testClassMetaInfo_fk')
      
  def suite():