поправлен тесты формул.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59710 954022d7-b5bf-4e40-9824-e11837661b57

поправлен тесты формул.
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59710 954022d7-b5bf-4e40-9824-e11837661b57
a6673b14 · Dmitry.Shahtanov · Alexander.Trofimov · 33cfb644 · a6673b14 · a6673b14
Commit a6673b14 authored Nov 17, 2014 by Dmitry.Shahtanov Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 3 deletions

Excel/.unit-tests/FormulaTests.html Excel/.unit-tests/FormulaTests.html +17 -0

Excel/.unit-tests/FormulaTests.js Excel/.unit-tests/FormulaTests.js +3 -3

No files found.
--- a/Excel/.unit-tests/FormulaTests.html
+++ b/Excel/.unit-tests/FormulaTests.html
@@ -154,12 +154,15 @@
        <script src="../../Word/Editor/Styles.js"></script>
        <script src="../../Word/Editor/Numbering.js"></script>
        <script src="../../Word/Editor/ParagraphContent.js"></script>
+        <script src="../../Word/Editor/ParagraphContentBase.js"></script>
+        <script src="../../Word/Editor/Math.js"></script>
 		<script src="../../Word/Editor/Run.js"></script>
 		<script src="../../Word/Editor/Hyperlink.js"></script>

        <script src="../../Word/Editor/Comments.js"></script>
        <script src="../../Word/Editor/FlowObjects.js"></script>
        <script src="../../Word/Editor/Paragraph.js"></script>
+        <script src="../../Word/Editor/Paragraph_Recalculate.js"></script>
        <script src="../../Word/Editor/Document.js"></script>
        <script src="../../Word/Editor/DocumentContent.js"></script>
        <script src="../../Word/Editor/HeaderFooter.js"></script>
@@ -167,6 +170,20 @@
        <script src="../../Word/Editor/Spelling.js"></script>
        <script src="../../Word/Editor/FontClassification.js"></script>

+        <script type="text/javascript" src="../../Word/Math/mathTypes.js"></script>
+        <script type="text/javascript" src="../../Word/Math/mathText.js"></script>
+        <script type="text/javascript" src="../../Word/Math/mathContent.js"></script>
+        <script type="text/javascript" src="../../Word/Math/base.js"></script>
+        <script type="text/javascript" src="../../Word/Math/fraction.js"></script>
+        <script type="text/javascript" src="../../Word/Math/degree.js"></script>
+        <script type="text/javascript" src="../../Word/Math/matrix.js"></script>
+        <script type="text/javascript" src="../../Word/Math/limit.js"></script>
+        <script type="text/javascript" src="../../Word/Math/nary.js"></script>
+        <script type="text/javascript" src="../../Word/Math/radical.js"></script>
+        <script type="text/javascript" src="../../Word/Math/operators.js"></script>
+        <script type="text/javascript" src="../../Word/Math/accent.js"></script>
+        <script type="text/javascript" src="../../Word/Math/borderBox.js"></script>
+
 		<script type="text/javascript" src="FormulaTests.js"></script>
 	</head>
 	<body>

--- a/Excel/.unit-tests/FormulaTests.js
+++ b/Excel/.unit-tests/FormulaTests.js
@@ -4083,7 +4083,7 @@

        oParser = new parserFormula( "COUPDAYBS(DATE(2007,1,25),DATE(2008,11,15),2,1)", "A2", ws );
        ok( oParser.parse() );
-        strictEqual( oParser.calculate().getValue(), coupdaybs( new Date(2007,0,25), new Date(2008,10,15), 2, 1 ) );
+        strictEqual( oParser.calculate().getValue(), 71 );

        oParser = new parserFormula( "COUPDAYBS(DATE(2007,1,25),DATE(2008,11,15),2)", "A2", ws );
        ok( oParser.parse() );
@@ -4129,7 +4129,7 @@

        oParser = new parserFormula( "COUPDAYSNC(DATE(2007,1,25),DATE(2008,11,15),2,1)", "A2", ws );
        ok( oParser.parse() );
-        strictEqual( oParser.calculate().getValue(), coupdaysnc( new Date(2007,0,25), new Date(2008,10,15), 2, 1 ) );
+        strictEqual( oParser.calculate().getValue(), 110 );

        oParser = new parserFormula( "COUPDAYSNC(DATE(2007,1,25),DATE(2008,11,15),2)", "A2", ws );
        ok( oParser.parse() );
@@ -4799,7 +4799,7 @@
        oParser = new parserFormula( "BIN2DEC(\"Hello World!\")", "A2", ws );
        ok( oParser.parse() );
        ok( oParser.assemble() == "BIN2DEC(\"Hello World!\")" );
-        strictEqual( oParser.calculate().getValue(), "#VALUE!" );
+        strictEqual( oParser.calculate().getValue(), "#NUM!" );

    })