<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12589] twext/trunk/twext/who/test/test_directory.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12589">12589</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-06 10:32:15 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add tests for constant containers as valueType specialness.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (12588 => 12589)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py 2014-02-06 17:52:49 UTC (rev 12588)
+++ twext/trunk/twext/who/test/test_directory.py 2014-02-06 18:32:15 UTC (rev 12589)
</span><span class="lines">@@ -25,7 +25,9 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface.verify import verifyObject, BrokenMethodImplementation
</span><span class="cx">
</span><del>-from twisted.python.constants import Names, NamedConstant
</del><ins>+from twisted.python.constants import (
+ Names, NamedConstant, Values, ValueConstant, Flags, FlagConstant
+)
</ins><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="lines">@@ -730,6 +732,71 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_initWithContainerClassFieldType_valid(self):
+ """
+ If C{valueType} is L{Names}, L{Values} or L{Flags}, the expected type
+ is L{NamedConstant}, L{ValueConstant} or L{FlagConstant}, respectively.
+ Check that these can be used as fields.
+ """
+
+ class ConstantHavingDirectoryService(self.serviceClass):
+ fieldName = ConstantsContainer((
+ self.serviceClass.fieldName, ConstantHavingFieldName
+ ))
+
+ service = self.service(subClass=ConstantHavingDirectoryService)
+
+ baseFields = {
+ FieldName.uid: u"UID:sam",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: (u"sam",),
+ }
+
+ for fieldName, validValue in (
+ (service.fieldName.eyeColor, Color.blue),
+ (service.fieldName.language, Language.English),
+ (service.fieldName.access, Access.read),
+ ):
+ fields = baseFields.copy()
+ fields.update({fieldName: validValue})
+ record = self.makeRecord(fields=fields, service=service)
+ self.assertEquals(record.fields[fieldName], validValue)
+
+
+ def test_initWithContainerClassFieldType_invalid(self):
+ """
+ If C{valueType} is L{Names}, L{Values} or L{Flags}, the expected type
+ is L{NamedConstant}, L{ValueConstant} or L{FlagConstant}, respectively.
+ Check that other types raise.
+ """
+
+ class ConstantHavingDirectoryService(self.serviceClass):
+ fieldName = ConstantsContainer((
+ self.serviceClass.fieldName, ConstantHavingFieldName
+ ))
+
+ service = self.service(subClass=ConstantHavingDirectoryService)
+
+ baseFields = {
+ FieldName.uid: u"UID:sam",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: (u"sam",),
+ }
+
+ for fieldName, validValue in (
+ (service.fieldName.eyeColor, Color.blue),
+ (service.fieldName.language, Language.English),
+ (service.fieldName.access, Access.read),
+ ):
+ for invalidValue in (u"string", None, object()):
+ fields = baseFields.copy()
+ fields.update({fieldName: invalidValue})
+ self.assertRaises(
+ InvalidDirectoryRecordError,
+ self.makeRecord, fields=fields, service=service
+ )
+
+
</ins><span class="cx"> def test_repr(self):
</span><span class="cx"> """
</span><span class="cx"> L{DirectoryRecord.repr} returns the expected string.
</span><span class="lines">@@ -1001,3 +1068,47 @@
</span><span class="cx"> Wacky operands.
</span><span class="cx"> """
</span><span class="cx"> WHUH = NamedConstant()
</span><ins>+
+
+
+class Color(Names):
+ """
+ Some colors.
+ """
+ red = NamedConstant()
+ green = NamedConstant()
+ blue = NamedConstant()
+ black = NamedConstant()
+
+
+
+class Language(Values):
+ """
+ Some languages.
+ """
+ English = ValueConstant(u"en")
+ Spanish = ValueConstant(u"sp")
+
+
+
+class Access(Flags):
+ """
+ Some access types.
+ """
+ read = FlagConstant()
+ write = FlagConstant()
+
+
+
+class ConstantHavingFieldName(Names):
+ """
+ Field names with constants values.
+ """
+ eyeColor = NamedConstant()
+ eyeColor.valueType = Color
+
+ language = NamedConstant()
+ language.valueType = Language
+
+ access = NamedConstant()
+ access.valueType = Access
</ins></span></pre>
</div>
</div>
</body>
</html>