[Erp5-report] r21618 - in /erp5/trunk/products/ERP5Form/tests: ./ data/

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jun 16 15:10:27 CEST 2008 

Author: fabien
Date: Mon Jun 16 15:10:27 2008
New Revision: 21618

URL: http://svn.erp5.org?rev=21618&view=rev
Log:
bring some modifications on test and scribus sla files :
  - sla file has a field my_other_date with an empty infobulle, so it was not
  possible to have something working with this. So I complete it.
  - correct some mistakes in test file
Now it should be possible to pass this test

Modified:
    erp5/trunk/products/ERP5Form/tests/data/Authorisation.sla
    erp5/trunk/products/ERP5Form/tests/testScribusUtils.py

Modified: erp5/trunk/products/ERP5Form/tests/data/Authorisation.sla
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/data/Authorisation.sla?rev=21618&r1=21617&r2=21618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/data/Authorisation.sla (original)
+++ erp5/trunk/products/ERP5Form/tests/data/Authorisation.sla Mon Jun 16 15:10:27 2008
@@ -1,4 +1,4 @@
-<SCRIBUSUTF8NEW Version="1.3.3.10cvs" >
+<SCRIBUSUTF8NEW Version="1.3.3.12svn" >
  <DOCUMENT HalfRes="1" MAGMAX="3200" TextPenShade="100" MAJGRID="100" ABSTSPALTEN="11" ScratchBottom="20" AUTOCHECK="0" LANGUAGE="French" DPIn2="sRGB IEC61966-2.1" DPgam="0" HCMS="1" UnderlineWidth="-1" TabFill="" DGAP="14.4" ORIENTATION="0" PASPECT="1" WIDTH="1" POLYR="0" SHOWLINK="0" MINWORDLEN="3" UnderlinePos="-1" VTIEFSC="66" DOCLANGINFO="" COMMENTS="" AutoSaveTime="600000" POLYS="0" GuideRad="10" rulerMode="1" TITLE="" KEYWORDS="" TabWidth="36" DSIZE="12" AUTOSPALTEN="1" PAGESIZE="A4" STIL="1" TextBackGroundShade="100" PEN="Black" POLYC="4" SnapToGuides="0" GROUPC="10" DOCFORMAT="" DOCDATE="" BORDERTOP="40" currentProfile="PostScript" MARGC="#0000ff" EndArrow="0" SHOWBASE="0" SHOWGRID="0" SnapToGrid="0" GUIDELOCK="0" DIMo="1" DIPr="0" StrikeThruPos="-1" WIDTHLINE="1" TextStrokeShade="100" DPuse="0" DPSo="0" DOCSOURCE="" FIRSTNUM="1" GuideC="#000080" BRUSH="Black" StartArrow="0" ScratchRight="100" POLYF="0.5" SHOWMARGIN="1" DPbla="1" StrikeThruWidth="-1" VHOCHSC="66" DOCTYPE="" BORDERBOTTOM="40" BRUSHSHADE="100" StrokeText="Black" BASEGRID="14.4" VTIEF="33" DOCCONTRIB="" DOCRELATION="" PICTSCX="1" CPICT="None" PENLINE="Black" AutoSave="0" BASEO="0" DOCIDENT="" BOOK="0" PICTSCY="1" MAGSTEP="200" TextLineColor="None" ScratchTop="20" POLYFD="0" AUTOL="20" PUBLISHER="" ANZPAGES="1" PSCALE="1" LINESHADE="100" HYCOUNT="2" DIMo2="1" AUTHOR="" UNITS="0" BORDERRIGHT="40" RANDF="0" MAJORC="#00ff00" PENSHADE="100" PENTEXT="Black" GRAB="4" showcolborders="0" SHOWGUIDES="1" DPInCMYK="Fogra27L CMYK Coated Press" DPPr="Fogra27L CMYK Coated Press" DPMo="sRGB IEC61966-2.1" PAGEHEIGHT="841.89" PAGEWIDTH="595.28" BACKG="1" GuideZ="10" TextBackGround="None" MINGRID="20" VHOCH="33" DOCCOVER="" DCOL="1" EmbeddedPath="0" rulerYoffset="0" SHOWPICT="1" SHOWFRAME="1" AUTOMATIC="1" ALAYER="0" DOCRIGHTS="" PICTSHADE="100" ScratchLeft="100" rulerXoffset="0" showrulers="1" DPIn="sRGB IEC61966-2.1" VKAPIT="75" DFONT="Bitstream Vera Sans Roman" BORDERLEFT="40" PAGEC="#ffffff" BaseC="#c0c0c0" MINORC="#00ff00" MAGMIN="10" STILLINE="1" TextLineShade="100" SHOWControl="0" >
   <CheckProfile checkTransparency="1" autoCheck="1" minResolution="144" checkOverflow="1" ignoreErrors="0" checkRasterPDF="1" checkResolution="1" checkGlyphs="1" Name="PDF 1.3" checkAnnotations="0" checkPictures="1" checkOrphans="1" />
   <CheckProfile checkTransparency="0" autoCheck="1" minResolution="144" checkOverflow="1" ignoreErrors="0" checkRasterPDF="1" checkResolution="1" checkGlyphs="1" Name="PDF 1.4" checkAnnotations="0" checkPictures="1" checkOrphans="1" />
@@ -557,6 +557,7 @@
    <Fonts Name="Bitstream Vera Sans Roman" />
    <Subset Name="DejaVu Sans Bold" />
    <Effekte pageViewDuration="1" Di="0" pageEffectDuration="1" effectType="0" Dm="0" M="0" />
+   <LPI Angle="0" Frequency="0" SpotFunction="0" Color="" />
    <LPI Angle="45" Frequency="75" SpotFunction="2" Color="Black" />
    <LPI Angle="105" Frequency="75" SpotFunction="2" Color="Cyan" />
    <LPI Angle="75" Frequency="75" SpotFunction="2" Color="Magenta" />
@@ -612,7 +613,7 @@
    <ITEXT CAB="0" CCOLOR="Black" CBASE="0" CSTW="-0.1" CSIZE="12" CULP="-0.1" CH="here we have an other date" CSHADE2="100" CKERN="0" CSCALE="100" CSHADE="100" COUT="1" CSCALEV="100" CSTP="-0.1" CULW="-0.1" CSTYLE="0" CFONT="DejaVu Sans Bold" CSHX="5" CSHY="-5" CSTROKE="Black" />
    <PageItemAttributes/>
   </PAGEOBJECT>
-  <PAGEOBJECT OnMasterPage="" BottomLine="0" REXTRA="0" ANACTYP="0" ALIGN="0" gHeight="146" gWidth="6.90014e-314" LANGUAGE="French" NUMPO="16" ANBSTY="0" PLINEART="1" TXTSCALE="100" RightLine="0" LOCALSCX="1" LINESP="14.4" ROT="0" TXTSHX="5" TXTSTROKE="Black" WIDTH="139" ImageRes="1" GROUPS="" LOCKR="0" ANMC="-1" ANZIEL="0" ANKACT="" IFONT="Bitstream Vera Sans Roman" LOCALSCY="1" NAMEDLST="" TXTSHY="-5" isInline="0" AUTOTEXT="0" FLIPPEDV="0" PCOLOR="None" RADRECT="0" REVERS="0" ANTOOLTIP="" PRINTABLE="1" RATIO="1" FLIPPEDH="0" COLGAP="14.4" PCOLOR2="None" NEXTITEM="-1" NUMGROUP="0" TransValue="0" ANICON="0" ANCHK="0" PLINEEND="0" TXTSTW="-0.1" FRTYPE="0" PTYPE="4" ImageClip="" isTableItem="0" TEXTFLOW2="0" ANHTML="0" ANXACT="" ANTYPE="3" SHADE2="100" TXTBASE="0" PWIDTH="1" HEIGHT="28" DASHOFF="0" PFILE2="" PFILE="" TEXTFLOW3="0" ANFLAG="0" ANEXTERN="../../../../../Téléchargement/thibaut" ANFACT="" ANBLACT="" ISIZE="12" PLTSHOW="0" LINESPMode="0" TXTSTYLE="0" CLIPEDIT="0" BACKITEM="-1" TransValueS="0" EMBEDDED="1" PFILE3="" ANNAME="my_other_date" ANCHKS="0" ANVACT="" ANFOACT="" ANEACT="" SHADE="100" TXTULP="-0.1" fillRule="1" COCOOR="0 0 0 0 139 0 139 0 139 0 139 0 139 28 139 28 139 28 139 28 0 28 0 28 0 28 0 28 0 0 0 0 " ANSCALE="0" ANROLL="" ANDACT="" BASEOF="0" PICART="1" TXTKERN="0" COLUMNS="1" OwnPage="0" LAYER="0" BOOKMARK="0" gYpos="5.33672e-315" startArrowIndex="0" TopLine="0" LOCK="0" EPROF="" ANBCOL="Black" ANFONT="4" ANFEED="1" ANCACT="" gXpos="1.4822e-323" DASHS="" IRENDER="1" TEXTFLOW="0" ANBWID="1" TXTFILLSH="100" YPOS="286" ANAA="0" ANNOTATION="1" LOCALX="0" GRTYP="0" XPOS="342" NUMCO="16" POCOOR="0 0 0 0 139 0 139 0 139 0 139 0 139 28 139 28 139 28 139 28 0 28 0 28 0 28 0 28 0 0 0 0 " EXTRA="0" ANFORMAT="0" LOCALY="0" NUMDASH="0" LeftLine="0" PRFILE="" TEXTRA="0" ANPLACE="1" ANVIS="0" ANDOWN="" SCALETYPE="1" TXTOUT="1" TXTFILL="Black" endArrowIndex="0" BEXTRA="0" ANACTION="" PLINEJOIN="0" TXTSTP="-0.1" TXTULW="-0.1" TXTSCALEV="100" TXTSTRSH="100" >
+  <PAGEOBJECT OnMasterPage="" BottomLine="0" REXTRA="0" ANACTYP="0" ALIGN="0" gHeight="146" gWidth="6.90014e-314" LANGUAGE="French" NUMPO="16" ANBSTY="0" PLINEART="1" TXTSCALE="100" RightLine="0" LOCALSCX="1" LINESP="14.4" ROT="0" TXTSHX="5" TXTSTROKE="Black" WIDTH="139" ImageRes="1" GROUPS="" LOCKR="0" ANMC="-1" ANZIEL="0" ANKACT="" IFONT="Bitstream Vera Sans Roman" LOCALSCY="1" NAMEDLST="" TXTSHY="-5" isInline="0" AUTOTEXT="0" FLIPPEDV="0" PCOLOR="None" RADRECT="0" REVERS="0" ANTOOLTIP="nb:004#type:DateTimeField#title:Stop Date#order:right" PRINTABLE="1" RATIO="1" FLIPPEDH="0" COLGAP="14.4" PCOLOR2="None" NEXTITEM="-1" NUMGROUP="0" TransValue="0" ANICON="0" ANCHK="0" PLINEEND="0" TXTSTW="-0.1" FRTYPE="0" PTYPE="4" ImageClip="" isTableItem="0" TEXTFLOW2="0" ANHTML="0" ANXACT="" ANTYPE="3" SHADE2="100" TXTBASE="0" PWIDTH="1" HEIGHT="28" DASHOFF="0" PFILE2="" PFILE="" TEXTFLOW3="0" ANFLAG="0" ANEXTERN="../../../../../Téléchargement/thibaut" ANFACT="" ANBLACT="" ISIZE="12" PLTSHOW="0" LINESPMode="0" TXTSTYLE="0" CLIPEDIT="0" BACKITEM="-1" TransValueS="0" EMBEDDED="1" PFILE3="" ANNAME="my_other_date" ANCHKS="0" ANVACT="" ANFOACT="" ANEACT="" SHADE="100" TXTULP="-0.1" fillRule="1" COCOOR="0 0 0 0 139 0 139 0 139 0 139 0 139 28 139 28 139 28 139 28 0 28 0 28 0 28 0 28 0 0 0 0 " ANSCALE="0" ANROLL="" ANDACT="" BASEOF="0" PICART="1" TXTKERN="0" COLUMNS="1" OwnPage="0" LAYER="0" BOOKMARK="0" gYpos="5.33672e-315" startArrowIndex="0" TopLine="0" LOCK="0" EPROF="" ANBCOL="Black" ANFONT="4" ANFEED="1" ANCACT="" gXpos="1.4822e-323" DASHS="" IRENDER="1" TEXTFLOW="0" ANBWID="1" TXTFILLSH="100" YPOS="286" ANAA="0" ANNOTATION="1" LOCALX="0" GRTYP="0" XPOS="342" NUMCO="16" POCOOR="0 0 0 0 139 0 139 0 139 0 139 0 139 28 139 28 139 28 139 28 0 28 0 28 0 28 0 28 0 0 0 0 " EXTRA="0" ANFORMAT="0" LOCALY="0" NUMDASH="0" LeftLine="0" PRFILE="" TEXTRA="0" ANPLACE="1" ANVIS="0" ANDOWN="" SCALETYPE="1" TXTOUT="1" TXTFILL="Black" endArrowIndex="0" BEXTRA="0" ANACTION="" PLINEJOIN="0" TXTSTP="-0.1" TXTULW="-0.1" TXTSCALEV="100" TXTSTRSH="100" >
    <PageItemAttributes/>
   </PAGEOBJECT>
  </DOCUMENT>

Modified: erp5/trunk/products/ERP5Form/tests/testScribusUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testScribusUtils.py?rev=21618&r1=21617&r2=21618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testScribusUtils.py (original)
+++ erp5/trunk/products/ERP5Form/tests/testScribusUtils.py Mon Jun 16 15:10:27 2008
@@ -319,13 +319,15 @@
     # add property sheet Task in portal type Authorisation
     self.portal.portal_types.Authorisation.setPropertySheetList('Task')
     authorisation_module = self.portal.authorisation_module
-    authorisation = authorisation_module.newContent(portal_type='Authorisation')
-    # fill Authorisation
-    authorisation.setTitle('Mum Dad')
     start_date = DateTime('2000/01/01')
     stop_date = DateTime('2001/01/01 12:00 GMT')
-    authorisation.setStartDate(start_date)
-    authorisation.setStopDate(stop_date)
+    authorisation = authorisation_module.newContent(\
+          portal_type='Authorisation',
+          title = 'Mum Dad',
+          start_date = start_date,
+          stop_date = stop_date
+        )
+
     form = self.portal.portal_skins.erp5_authorisation.Authorisation_view
     # test property input_order on all DateTimeField
     input_order_other_date = form.my_other_date.get_value('input_order')
@@ -351,7 +353,7 @@
     result_other_date = expr_other_date(getExprContext(authorisation, authorisation))
     result_start_date = expr_start_date(getExprContext(authorisation, authorisation))
     result_stop_date = expr_stop_date(getExprContext(authorisation, authorisation))
-    self.assertEquals(result_other_date, None)
+    self.assertEquals(result_other_date, '')
     self.assertEquals(result_start_date, start_date.strftime('%d/%m/%Y'))
     self.assertEquals(result_stop_date, stop_date.strftime('%Y/%m/%d %H:%M'))

More information about the Erp5-report mailing list