[Oorexx-svn] SF.net SVN: oorexx:[3195] test/trunk/ooRexx/base

[<bi...@us...>]

Revision: 3195
          http://oorexx.svn.sourceforge.net/oorexx/?rev=3195&view=rev
Author:   bigrixx
Date:     2008-09-06 15:10:57 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
[ 2093422 ] Clean up test cases for 64-bit ooRexx, host of small updates

Modified Paths:
--------------
    test/trunk/ooRexx/base/bif/DELWORD.testGroup
    test/trunk/ooRexx/base/bif/INSERT.testGroup
    test/trunk/ooRexx/base/bif/SPACE.testGroup
    test/trunk/ooRexx/base/bif/SUBWORD.testGroup
    test/trunk/ooRexx/base/bif/VERIFY.testGroup
    test/trunk/ooRexx/base/bif/WORD.testGroup
    test/trunk/ooRexx/base/bif/WORDINDEX.testGroup
    test/trunk/ooRexx/base/bif/WORDLENGTH.testGroup
    test/trunk/ooRexx/base/class/MutableBuffer/insert.testGroup

Modified: test/trunk/ooRexx/base/bif/DELWORD.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/DELWORD.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/DELWORD.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -86,10 +86,16 @@
     r = delWord('delWord1 delWord2',2.000000009,2.000000009)
 
 ::method 'test04'
-    self~assertSame('delWord2', delWord('delWord1 delWord2',1.000000004,1.000000004))
+    if digits() == 9 then
+        self~assertSame('delWord2', delWord('delWord1 delWord2',1.000000004,1.000000004))
+    else
+        self~assertSame('delWord2', delWord('delWord1 delWord2',1.000000000000000004,1.000000000000000004))
 
 ::method 'test05'
-    self~assertSame('delWord1 ', delWord('delWord1 delWord2',2.000000004,2.000000004))
+    if digits() == 9 then
+        self~assertSame('delWord1 ', delWord('delWord1 delWord2',2.000000004,2.000000004))
+    else
+        self~assertSame('delWord1 ', delWord('delWord1 delWord2',2.000000000000000004,2.000000000000000004))
 
 ::method 'test06'
     zeros1 = copies('0',10000)||'1'

Modified: test/trunk/ooRexx/base/bif/INSERT.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/INSERT.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/INSERT.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -194,7 +194,10 @@
 
 ::method 'test034'
     self~expectSyntax(40.12)
-    xre = insert('A','hasdghj',1E10)
+    if digits() == 9 then
+        xre = insert('A','hasdghj',1E10)
+    else
+        xre = insert('A','hasdghj',1E19)
 
 ::method 'test035'
     self~expectSyntax(40.12)

Modified: test/trunk/ooRexx/base/bif/SPACE.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/SPACE.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/SPACE.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -97,16 +97,28 @@
     xre = space('space1 space2',2.000000009)
 
 ::method 'test004'
-    self~assertSame('space1 space2', space('space1 space2',1.000000004))
+    if digits() == 9 then
+        self~assertSame('space1 space2', space('space1 space2',1.000000000000000004))
+    else
+        self~assertSame('space1 space2', space('space1 space2',1.000000000000000004))
 
 ::method 'test005'
-    self~assertSame('space1  space2', space('space1 space2',2.000000004))
+    if digits() == 9 then
+        self~assertSame('space1  space2', space('space1 space2',2.000000000000000004))
+    else
+        self~assertSame('space1  space2', space('space1 space2',2.000000000000000004))
 
 ::method 'test006'
-    self~assertSame('space1 space2', space('space1 space2',1.000000004,' '))
+    if digits() == 9 then
+        self~assertSame('space1 space2', space('space1 space2',1.000000000000000004,' '))
+    else
+        self~assertSame('space1 space2', space('space1 space2',1.000000000000000004,' '))
 
 ::method 'test007'
-    self~assertSame('space1  space2', space('space1 space2',2.000000004,'20'x))
+    if digits() == 9 then
+        self~assertSame('space1  space2', space('space1 space2',2.000000000000000004,'20'x))
+    else
+        self~assertSame('space1  space2', space('space1 space2',2.000000000000000004,'20'x))
 
 ::method 'test008'
     self~assertSame('', space(' ','30'x))

Modified: test/trunk/ooRexx/base/bif/SUBWORD.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/SUBWORD.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/SUBWORD.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -95,10 +95,16 @@
     xre = subWord('SUBWORD1 SUBWORD2',2.000000009)
 
 ::method 'test003'
-    self~assertSame('SUBWORD1 SUBWORD2', subWord('SUBWORD1 SUBWORD2',1.000000004))
+    if digits() == 9 then
+        self~assertSame('SUBWORD1 SUBWORD2', subWord('SUBWORD1 SUBWORD2',1.000000000000000004))
+    else
+        self~assertSame('SUBWORD1 SUBWORD2', subWord('SUBWORD1 SUBWORD2',1.000000000000000004))
 
 ::method 'test004'
-    self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000004))
+    if digits() == 9 then
+        self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000000000000004))
+    else
+        self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000000000000004))
 
 ::method 'test005'
     self~assertSame('J', subWord('4a'x,.zeros1))
@@ -346,10 +352,16 @@
     xre = subWord('SUBWORD1 SUBWORD2',2.000000009,2.000000009)
 
 ::method 'test077'
-    self~assertSame('SUBWORD1', subWord('SUBWORD1 SUBWORD2',1.000000004,1.000000004))
+    if digits() == 9 then
+       self~assertSame('SUBWORD1', subWord('SUBWORD1 SUBWORD2',1.000000000000000004,1.000000000000000004))
+    else
+       self~assertSame('SUBWORD1', subWord('SUBWORD1 SUBWORD2',1.000000000000000004,1.000000000000000004))
 
 ::method 'test078'
-    self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000004,2.000000004))
+    if digits() == 9 then
+        self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000000000000004,2.0000000000000000004))
+    else
+        self~assertSame('SUBWORD2', subWord('SUBWORD1 SUBWORD2',2.000000000000000004,2.0000000000000000004))
 
 ::method 'test079'
     self~assertSame('J', subWord('4a'x,.zeros1,2))

Modified: test/trunk/ooRexx/base/bif/VERIFY.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/VERIFY.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/VERIFY.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -153,7 +153,10 @@
     self~assertSame('0', verify('j',"ABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghij",,251))
 
 ::method 'test024'
-    self~assertSame('0', verify('j',"ABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghij",,251.00000001))
+    if digits() == 9 then
+        self~assertSame('0', verify('j',"ABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghij",,251.00000001))
+    else
+        self~assertSame('0', verify('j',"ABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghijABCDEfghij",,251.00000000000000001))
 
 ::method 'test025'
     self~expectSyntax(40.12)

Modified: test/trunk/ooRexx/base/bif/WORD.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/WORD.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/WORD.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -100,10 +100,16 @@
     xre = word('WORD1 WORD2',2.000000009)
 
 ::method 'test004'
-    self~assertSame('WORD1', word('WORD1 WORD2',1.000000004))
+    if digits() == 9 then
+        self~assertSame('WORD1', word('WORD1 WORD2',1.000000004))
+    else
+        self~assertSame('WORD1', word('WORD1 WORD2',1.000000000000000004))
 
 ::method 'test005'
-    self~assertSame('WORD2', word('WORD1 WORD2',2.000000004))
+    if digits() == 9 then
+        self~assertSame('WORD2', word('WORD1 WORD2',2.000000004))
+    else
+        self~assertSame('WORD2', word('WORD1 WORD2',2.000000000000000004))
 
 ::method 'test006'
     self~assertSame('J', word('4a'x,.zeros1))

Modified: test/trunk/ooRexx/base/bif/WORDINDEX.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/WORDINDEX.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/WORDINDEX.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -100,10 +100,16 @@
     xre = wordIndex('WORD1 WORD2',2.000000009)
 
 ::method 'test004'
-    self~assertSame('1', wordIndex('WORD1 WORD2',1.000000004))
+    if digits() == 9 then
+        self~assertSame('1', wordIndex('WORD1 WORD2',1.000000004))
+    else
+        self~assertSame('1', wordIndex('WORD1 WORD2',1.000000000000000004))
 
 ::method 'test005'
-    self~assertSame('7', wordIndex('WORD1 WORD2',2.000000004))
+    if digits() == 9 then
+        self~assertSame('7', wordIndex('WORD1 WORD2',2.000000000000000004))
+    else
+        self~assertSame('7', wordIndex('WORD1 WORD2',2.000000000000000004))
 
 ::method 'test006'
     self~assertSame('1', wordIndex('4a'x,.zeros1))

Modified: test/trunk/ooRexx/base/bif/WORDLENGTH.testGroup
===================================================================
--- test/trunk/ooRexx/base/bif/WORDLENGTH.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/bif/WORDLENGTH.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -99,10 +99,16 @@
     xre = wordLength('WORD1 WORD2',2.000000009)
 
 ::method 'test0004'
-    self~assertSame('5', wordLength('WORD1 WORD2',1.000000004))
+    if digits() == 9 then
+        self~assertSame('5', wordLength('WORD1 WORD2',1.000000004))
+    else
+        self~assertSame('5', wordLength('WORD1 WORD2',1.000000000000000004))
 
 ::method 'test0005'
-    self~assertSame('5', wordLength('WORD1 WORD2',2.000000004))
+    if digits() == 9 then
+        self~assertSame('5', wordLength('WORD1 WORD2',2.000000004))
+    else
+        self~assertSame('5', wordLength('WORD1 WORD2',2.000000000000000004))
 
 ::method 'test0006'
     self~assertSame('1', wordLength('4a'x,.zeros1))

Modified: test/trunk/ooRexx/base/class/MutableBuffer/insert.testGroup
===================================================================
--- test/trunk/ooRexx/base/class/MutableBuffer/insert.testGroup	2008-09-06 14:31:35 UTC (rev 3194)
+++ test/trunk/ooRexx/base/class/MutableBuffer/insert.testGroup	2008-09-06 15:10:57 UTC (rev 3195)
@@ -217,7 +217,10 @@
 ::method 'test034'
     mb = .mutablebuffer~new('hasdghj')
     self~expectSyntax(93.906)
-    xre = mb~insert('A',1E10)
+    if digits() == 9 then
+        xre = mb~insert('A',1E10)
+    else
+        xre = mb~insert('A',1E19)
 
 ::method 'test035'
     mb = .mutablebuffer~new('hasdghj')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.