--- a/RegressionTests__IntegerTest.st	Tue May 11 14:32:19 1999 +0200
+++ b/RegressionTests__IntegerTest.st	Tue May 11 14:55:11 1999 +0200
@@ -6,10 +6,10 @@
 !
 
 
-!IntegerTest class methodsFor:'orivate'!
+!IntegerTest class methodsFor:'private'!
 
 test:aBlock
-    aBlock value ifFalse:[
+    aBlock value == true ifFalse:[
         self halt:'test failed'
     ]
 ! !
@@ -19,7 +19,13 @@
 test1
     "general conversion & tests"
 
-    |maxValPlus1 minValMinus1 t|
+    |minVal maxVal maxValPlus1 minValMinus1 halfMin halfMax t t1 t2|
+
+    minVal := SmallInteger perform:('minVal' asSymbol).
+    maxVal := SmallInteger perform:('maxVal' asSymbol).
+
+    self test:[minVal == SmallInteger minVal].
+    self test:[maxVal == SmallInteger maxVal].
 
     self test:[10 printString = '10'].
     self test:[100 printString = '100'].
@@ -31,38 +37,125 @@
     self test:[100000000 printString = '100000000'].
     self test:[1000000000 printString = '1000000000'].
     self test:[10000000000 printString = '10000000000'].
+    self test:[100000000000 printString = '100000000000'].
+    self test:[1000000000000 printString = '1000000000000'].
+    self test:[10000000000000 printString = '10000000000000'].
+    self test:[100000000000000 printString = '100000000000000'].
+    self test:[1000000000000000 printString = '1000000000000000'].
+    self test:[10000000000000000 printString = '10000000000000000'].
+    self test:[100000000000000000 printString = '100000000000000000'].
 
     SmallInteger maxBytes == 4 ifTrue:[
-        self test:[SmallInteger minVal hexPrintString = '-40000000'].
-        self test:[SmallInteger maxVal hexPrintString = '3FFFFFFF'].
-        self test:[SmallInteger minVal == -1073741824].
-        self test:[SmallInteger maxVal == 1073741823].
+        self test:[minVal hexPrintString = '-40000000'].
+        self test:[maxVal hexPrintString = '3FFFFFFF'].
+        self test:[minVal == -1073741824].
+        self test:[maxVal == 1073741823].
         maxValPlus1 := 1073741824.
         minValMinus1 := -1073741825.
         self test:[minValMinus1 hexPrintString = '-40000001'].
         self test:[maxValPlus1 hexPrintString = '40000000'].
+        halfMin := -16r20000000.
+        halfMax := 16r20000000.
     ].
     SmallInteger maxBytes == 8 ifTrue:[
-        self test:[SmallInteger minVal hexPrintString = '-4000000000000000'].
-        self test:[SmallInteger maxVal hexPrintString = '3FFFFFFFFFFFFFFF'].
-        self test:[SmallInteger minVal == -4611686018427387904].
-        self test:[SmallInteger maxVal == 4611686018427387903].
+        self test:[minVal hexPrintString = '-4000000000000000'].
+        self test:[maxVal hexPrintString = '3FFFFFFFFFFFFFFF'].
+        self test:[minVal == -4611686018427387904].
+        self test:[maxVal == 4611686018427387903].
         maxValPlus1 := 4611686018427387904.
         minValMinus1 := -4611686018427387905.
         self test:[minValMinus1 hexPrintString = '-4000000000000001'].
         self test:[maxValPlus1 hexPrintString = '4000000000000000'].
+        halfMin := -16r2000000000000000.
+        halfMax := 16r2000000000000000.
     ].
 
     "arithmetic overFlow checks"
 
-    self test:[SmallInteger maxVal + 1 = maxValPlus1].
-    self test:[SmallInteger minVal - 1 = minValMinus1].
+    self test:[maxVal + 1 = maxValPlus1].
+    self test:[minVal - 1 = minValMinus1].
+
+    self test:[(halfMax + halfMax) = maxValPlus1].
+    self test:[(halfMin + halfMin) == minVal].
+    self test:[(halfMax * 2) = maxValPlus1].
+    self test:[(halfMin * 2) == minVal].
+    self test:[maxValPlus1 // 2 == halfMax].
+    self test:[(halfMax bitShift:1) = maxValPlus1].
+    self test:[(halfMin bitShift:1) == minVal].
+
+    "LargeInt op -> SmallInt result"
+    t := maxVal + 1.
+    self test:[t - 1 == maxVal].
+    t := minVal - 1.
+    self test:[t + 1 == minVal].
+
+    "multiplication"
+    t1 := 100.
+    self test:[t1 * t1 == 10000].
+    t1 := 1000.
+    self test:[t1 * t1 == 1000000].
+    t1 := 10000.
+    self test:[t1 * t1 == 100000000].
+    t1 := 100000.
+    SmallInteger maxBytes == 4 ifTrue:[
+        self test:[t1 * t1 ~~ 10000000000].
+    ].
+    SmallInteger maxBytes == 8 ifTrue:[
+        self test:[t1 * t1 == 10000000000].
+    ].
+    self test:[(t1 * t1) printString = '10000000000'].
+    t1 := 1000000.
+    self test:[(t1 * t1) printString = '1000000000000'].
+    t1 := 10000000.
+    self test:[(t1 * t1) printString = '100000000000000'].
+    t1 := 100000000.
+    self test:[(t1 * t1) printString = '10000000000000000'].
+    t1 := 1000000000.
+    self test:[(t1 * t1) printString = '1000000000000000000'].
 
-    t := SmallInteger maxVal + 1.
-    self test:[t - 1 == SmallInteger maxVal].
-    t := SmallInteger minVal - 1.
-    self test:[t + 1 == SmallInteger minVal].
+    "Large * SmallInt multiplication"
+    self test:[10 factorial printString = '3628800'].
+    self test:[20 factorial printString = '2432902008176640000'].
+    self test:[100 factorial printString = '93326215443944152681699238856266700490715968264381621468592963895217599993229915608941463976156518286253697920827223758251185210916864000000000000000000000000'].
+    self test:[1000 factorial printString = '402387260077093773543702433923003985719374864210714632543799910429938512398629020592044208486969404800479988610197196058631666872994808558901323829669944590997424504087073759918823627727188732519779505950995276120874975462497043601418278094646496291056393887437886487337119181045825783647849977012476632889835955735432513185323958463075557409114262417474349347553428646576611667797396668820291207379143853719588249808126867838374559731746136085379534524221586593201928090878297308431392844403281231558611036976801357304216168747609675871348312025478589320767169132448426236131412508780208000261683151027341827977704784635868170164365024153691398281264810213092761244896359928705114964975419909342221566832572080821333186116811553615836546984046708975602900950537616475847728421889679646244945160765353408198901385442487984959953319101723355556602139450399736280750137837615307127761926849034352625200015888535147331611702103968175921510907788019393178114194545257223865541461062892187960223838971476088506276862967146674697562911234082439208160153780889893964518263243671616762179168909779911903754031274622289988005195444414282012187361745992642956581746628302955570299024324153181617210465832036786906117260158783520751516284225540265170483304226143974286933061690897968482590125458327168226458066526769958652682272807075781391858178889652208164348344825993266043367660176999612831860788386150279465955131156552036093988180612138558600301435694527224206344631797460594682573103790084024432438465657245014402821885252470935190620929023136493273497565513958720559654228749774011413346962715422845862377387538230483865688976461927383814900140767310446640259899490222221765904339901886018566526485061799702356193897017860040811889729918311021171229845901641921068884387121855646124960798722908519296819372388642614839657382291123125024186649353143970137428531926649875337218940694281434118520158014123344828015051399694290153483077644569099073152433278288269864602789864321139083506217095002597389863554277196742822248757586765752344220207573630569498825087968928162753848863396909959826280956121450994871701244516461260379029309120889086942028510640182154399457156805941872748998094254742173582401063677404595741785160829230135358081840096996372524230560855903700624271243416909004153690105933983835777939410970027753472000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'].
 
+    "Large * Large multiplication"
+    self test:[(20 factorial * 20 factorial) printString = '5919012181389927685417441689600000000'].
+    t := 20 factorial.
+    t := t // 20.
+    self test:[t printString = 19 factorial printString].
+    t := t // 19.
+    self test:[t printString = 18 factorial printString].
+    t := t // 18.
+    self test:[t printString = 17 factorial printString].
+    t := t // 17.
+    self test:[t printString = 16 factorial printString].
+    t := t // 16.
+    self test:[t printString = 15 factorial printString].
+    t := t // 15.
+    self test:[t printString = 14 factorial printString].
+    t := t // 14.
+    self test:[t printString = 13 factorial printString].
+    t := t // 13.
+    self test:[t printString = 12 factorial printString].
+    t := t // 12.
+    self test:[t printString = 11 factorial printString].
+    t := t // 11.
+    self test:[t printString = 10 factorial printString].
+    self test:[t == 10 factorial].
+
+    "Large // Large division"
+    self test:[(20 factorial / 19 factorial) == 20].
+
+    "Large + Large addition"
+    self test:[(20 factorial + 20 factorial) printString = '4865804016353280000'].
+    self test:[(20 factorial + 1) printString = '2432902008176640001'].
+    self test:[(20 factorial + 1000) printString = '2432902008176641000'].
+
+
+    "Large - small subtraction"
+    self test:[(20 factorial + 20 factorial - 1) printString = '4865804016353279999'].
+    self test:[(20 factorial - 10 factorial + 3628800) printString = '2432902008176640000'].
 
     "
      self test1