From c3631e216bae2173ffa6150a4f2d1430b020e5b8 Mon Sep 17 00:00:00 2001 From: Abel Braaksma Date: Sat, 20 Jun 2020 22:35:38 +0200 Subject: [PATCH] Fix compile errors in OperatorsModule1/2.fs, fix tests. Note tanh test comment. --- .../FSharp.Core/OperatorsModule1.fs | 284 +++++++++--------- .../FSharp.Core/OperatorsModule2.fs | 237 ++++++++------- tests/FSharp.Core.UnitTests/LibraryTestFx.fs | 1 + 3 files changed, 266 insertions(+), 256 deletions(-) diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule1.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule1.fs index 5aacff670ab..4a15c00f43d 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule1.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule1.fs @@ -3,10 +3,10 @@ // Various tests for the: // Microsoft.FSharp.Core.Operators module -namespace SystematicUnitTests.FSharp_Core.Microsoft_FSharp_Core +namespace FSharp.Core.UnitTests.Operators open System -open SystematicUnitTests.LibraryTestFx +open FSharp.Core.UnitTests.LibraryTestFx open NUnit.Framework open Microsoft.FSharp.Core.Operators.Checked @@ -17,15 +17,15 @@ type OperatorsModule1() = member this.Checkedbyte() = // int type let intByte = Operators.Checked.byte 100 - Assert.AreEqual(intByte,(byte)100) + Assert.AreEqual((byte)100, intByte) // char type let charByte = Operators.Checked.byte '0' - Assert.AreEqual(charByte,(byte)48) + Assert.AreEqual((byte)48, charByte) // boundary value let boundByte = Operators.Checked.byte 255.0 - Assert.AreEqual(boundByte, (byte)255) + Assert.AreEqual((byte)255, boundByte) // overflow exception try @@ -43,15 +43,15 @@ type OperatorsModule1() = // number let numberChar = Operators.Checked.char 48 - Assert.AreEqual(numberChar,'0') + Assert.AreEqual('0', numberChar) // letter let letterChar = Operators.Checked.char 65 - Assert.AreEqual(letterChar,'A') + Assert.AreEqual('A', letterChar) // boundary value let boundchar = Operators.Checked.char 126 - Assert.AreEqual(boundchar, '~') + Assert.AreEqual('~', boundchar) // overflow exception try @@ -66,16 +66,16 @@ type OperatorsModule1() = // char let charInt = Operators.Checked.int '0' - Assert.AreEqual(charInt,48) + Assert.AreEqual(48, charInt) // float let floatInt = Operators.Checked.int 10.0 - Assert.AreEqual(floatInt,10) + Assert.AreEqual(10, floatInt) // boundary value let boundInt = Operators.Checked.int 32767.0 - Assert.AreEqual(boundInt, (int)32767) + Assert.AreEqual((int)32767, boundInt) // overflow exception try @@ -92,15 +92,15 @@ type OperatorsModule1() = // char let charInt16 = Operators.Checked.int16 '0' - Assert.AreEqual(charInt16,(int16)48) + Assert.AreEqual((int16)48, charInt16) // float let floatInt16 = Operators.Checked.int16 10.0 - Assert.AreEqual(floatInt16,(int16)10) + Assert.AreEqual((int16)10, floatInt16) // boundary value let boundInt16 = Operators.Checked.int16 32767.0 - Assert.AreEqual(boundInt16, (int16)32767) + Assert.AreEqual((int16)32767, boundInt16) // overflow exception try @@ -116,15 +116,15 @@ type OperatorsModule1() = // char let charInt32 = Operators.Checked.int32 '0' - Assert.AreEqual(charInt32,(int32)48) + Assert.AreEqual((int32)48, charInt32) // float let floatInt32 = Operators.Checked.int32 10.0 - Assert.AreEqual(floatInt32,(int32)10) + Assert.AreEqual((int32)10, floatInt32) // boundary value let boundInt32 = Operators.Checked.int32 2147483647.0 - Assert.AreEqual(boundInt32, (int32)2147483647) + Assert.AreEqual((int32)2147483647, boundInt32) // overflow exception try @@ -141,16 +141,16 @@ type OperatorsModule1() = // char let charInt64 = Operators.Checked.int64 '0' - Assert.AreEqual(charInt64,(int64)48) + Assert.AreEqual((int64)48, charInt64) // float let floatInt64 = Operators.Checked.int64 10.0 - Assert.AreEqual(floatInt64,(int64)10) + Assert.AreEqual((int64)10, floatInt64) // boundary value let boundInt64 = Operators.Checked.int64 9223372036854775807I let a = 9223372036854775807L - Assert.AreEqual(boundInt64, 9223372036854775807L) + Assert.AreEqual(9223372036854775807L, boundInt64) // overflow exception try @@ -166,15 +166,15 @@ type OperatorsModule1() = // char let charnativeint = Operators.Checked.nativeint '0' - Assert.AreEqual(charnativeint,(nativeint)48) + Assert.AreEqual((nativeint)48, charnativeint) // float let floatnativeint = Operators.Checked.nativeint 10.0 - Assert.AreEqual(floatnativeint,(nativeint)10) + Assert.AreEqual((nativeint)10, floatnativeint) // boundary value let boundnativeint = Operators.Checked.nativeint 32767.0 - Assert.AreEqual(boundnativeint, (nativeint)32767) + Assert.AreEqual((nativeint)32767, boundnativeint) // overflow exception try @@ -190,15 +190,15 @@ type OperatorsModule1() = // char let charsbyte = Operators.Checked.sbyte '0' - Assert.AreEqual(charsbyte,(sbyte)48) + Assert.AreEqual((sbyte)48, charsbyte) // float let floatsbyte = Operators.Checked.sbyte -10.0 - Assert.AreEqual(floatsbyte,(sbyte)(-10)) + Assert.AreEqual((sbyte)(-10), floatsbyte) // boundary value let boundsbyte = Operators.Checked.sbyte -127.0 - Assert.AreEqual(boundsbyte, (sbyte)(-127)) + Assert.AreEqual((sbyte)(-127), boundsbyte) // overflow exception try @@ -215,15 +215,15 @@ type OperatorsModule1() = // char let charuint16 = Operators.Checked.uint16 '0' - Assert.AreEqual(charuint16,(uint16)48) + Assert.AreEqual((uint16)48, charuint16) // float let floatuint16 = Operators.Checked.uint16 10.0 - Assert.AreEqual(floatuint16,(uint16)(10)) + Assert.AreEqual((uint16)(10), floatuint16) // boundary value let bounduint16 = Operators.Checked.uint16 65535.0 - Assert.AreEqual(bounduint16, (uint16)(65535)) + Assert.AreEqual((uint16)(65535), bounduint16) // overflow exception try @@ -239,20 +239,20 @@ type OperatorsModule1() = // char let charuint32 = Operators.Checked.uint32 '0' - Assert.AreEqual(charuint32,(uint32)48) + Assert.AreEqual((uint32)48, charuint32) // float let floatuint32 = Operators.Checked.uint32 10.0 - Assert.AreEqual(floatuint32,(uint32)(10)) + Assert.AreEqual((uint32)(10), floatuint32) // boundary value let bounduint32 = Operators.Checked.uint32 429496729.0 - Assert.AreEqual(bounduint32, (uint32)(429496729)) + Assert.AreEqual((uint32)(429496729), bounduint32) // overflow exception try - let overflowuint32 = Operators.Checked.uint32 uint32.MaxValue+1u + let overflowuint32 = Operators.Checked.uint32 UInt32.MaxValue + 1u Assert.Fail("Expectt overflow exception but not.") with | :? System.OverflowException -> () @@ -264,15 +264,15 @@ type OperatorsModule1() = // char let charuint64 = Operators.Checked.uint64 '0' - Assert.AreEqual(charuint64,(uint64)48) + Assert.AreEqual((uint64)48, charuint64) // float let floatuint64 = Operators.Checked.uint64 10.0 - Assert.AreEqual(floatuint64,(uint64)(10)) + Assert.AreEqual((uint64)(10), floatuint64) // boundary value let bounduint64 = Operators.Checked.uint64 429496729.0 - Assert.AreEqual(bounduint64, (uint64)(429496729)) + Assert.AreEqual((uint64)(429496729), bounduint64) // overflow exception try @@ -288,15 +288,15 @@ type OperatorsModule1() = // char let charunativeint = Operators.Checked.unativeint '0' - Assert.AreEqual(charunativeint,(unativeint)48) + Assert.AreEqual((unativeint)48, charunativeint) // float let floatunativeint = Operators.Checked.unativeint 10.0 - Assert.AreEqual(floatunativeint,(unativeint)10) + Assert.AreEqual((unativeint)10, floatunativeint) // boundary value let boundunativeint = Operators.Checked.unativeint 65353.0 - Assert.AreEqual(boundunativeint, (unativeint)65353) + Assert.AreEqual((unativeint)65353, boundunativeint) // overflow exception try @@ -317,11 +317,11 @@ type OperatorsModule1() = // string int let stringint = funcKeyValue ( new System.Collections.Generic.KeyValuePair("string",1)) - Assert.AreEqual(stringint,("string",1)) + Assert.AreEqual(("string",1), stringint) // float char let floatchar = funcKeyValue ( new System.Collections.Generic.KeyValuePair(1.0,'a')) - Assert.AreEqual(floatchar,(1.0,'a')) + Assert.AreEqual((1.0,'a'), floatchar) // null let nullresult = funcKeyValue ( new System.Collections.Generic.KeyValuePair(null,' ')) @@ -341,15 +341,15 @@ type OperatorsModule1() = // int let intslice = Operators.OperatorIntrinsics.GetArraySlice [|1;2;3;4;5;6|] param1 param2 - Assert.AreEqual(intslice,[|2;3|]) + Assert.AreEqual([|2;3|], intslice) // string let stringslice = Operators.OperatorIntrinsics.GetArraySlice [|"1";"2";"3"|] param1 param2 - Assert.AreEqual(stringslice,[|"2";"3"|]) + Assert.AreEqual([|"2";"3"|], stringslice) // null let stringslice = Operators.OperatorIntrinsics.GetArraySlice [|null;null;null|] param1 param2 - Assert.AreEqual(stringslice,[|null;null|]) + Assert.AreEqual([|null;null|], stringslice) () @@ -366,17 +366,17 @@ type OperatorsModule1() = let intArray2D = Array2D.init 2 3 (fun i j -> i*100+j) let intslice = Operators.OperatorIntrinsics.GetArraySlice2D intArray2D param1D1 param1D2 param2D1 param2D2 - Assert.AreEqual(intslice.[1,1],101) + Assert.AreEqual(101, intslice.[1,1]) // string let stringArray2D = Array2D.init 2 3 (fun i j -> (i*100+j).ToString()) let stringslice = Operators.OperatorIntrinsics.GetArraySlice2D stringArray2D param1D1 param1D2 param2D1 param2D2 - Assert.AreEqual(stringslice.[1,1],(101).ToString()) + Assert.AreEqual((101).ToString(), stringslice.[1,1]) // null let nullArray2D = Array2D.init 2 3 (fun i j -> null) let nullslice = Operators.OperatorIntrinsics.GetArraySlice2D nullArray2D param1D1 param1D2 param2D1 param2D2 - Assert.AreEqual(nullslice.[1,1],null) + Assert.AreEqual(null, nullslice.[1,1]) () @@ -387,7 +387,7 @@ type OperatorsModule1() = // string let stringslice = Operators.OperatorIntrinsics.GetStringSlice "abcdefg" param1 param2 - Assert.AreEqual(stringslice,"efg") + Assert.AreEqual("efg", stringslice) // null CheckThrowsNullRefException(fun () -> Operators.OperatorIntrinsics.GetStringSlice null param1 param2 |> ignore) @@ -403,13 +403,13 @@ type OperatorsModule1() = let intArray1 = [|1;2;3|] let intArray2 = [|4;5;6|] Operators.OperatorIntrinsics.SetArraySlice intArray1 param1 param2 intArray2 - Assert.AreEqual(intArray1,[|1;4;5|]) + Assert.AreEqual([|1;4;5|], intArray1) // string let stringArray1 = [|"1";"2";"3"|] let stringArray2 = [|"4";"5";"6"|] Operators.OperatorIntrinsics.SetArraySlice stringArray1 param1 param2 stringArray2 - Assert.AreEqual(stringArray1,[|"1";"4";"5"|]) + Assert.AreEqual([|"1";"4";"5"|], stringArray1) // null let nullArray1 = [|null;null;null|] @@ -429,13 +429,13 @@ type OperatorsModule1() = let intArray1 = Array2D.init 2 3 (fun i j -> i*10+j) let intArray2 = Array2D.init 2 3 (fun i j -> i*100+j) Operators.OperatorIntrinsics.SetArraySlice2D intArray1 param1D1 param1D2 param2D1 param2D2 intArray2 - Assert.AreEqual(intArray1.[1,1],101) + Assert.AreEqual(101, intArray1.[1,1]) // string let stringArray2D1 = Array2D.init 2 3 (fun i j -> (i*10+j).ToString()) let stringArray2D2 = Array2D.init 2 3 (fun i j -> (i*100+j).ToString()) Operators.OperatorIntrinsics.SetArraySlice2D stringArray2D1 param1D1 param1D2 param2D1 param2D2 stringArray2D2 - Assert.AreEqual(stringArray2D1.[1,1],(101).ToString()) + Assert.AreEqual((101).ToString(), stringArray2D1.[1,1]) // null let nullArray2D1 = Array2D.init 2 3 (fun i j -> null) @@ -449,15 +449,15 @@ type OperatorsModule1() = let intArray1 = Array3D.init 2 3 4 (fun i j k -> i*10+j) let intArray2 = Array3D.init 2 3 4 (fun i j k -> i*100+j) Operators.OperatorIntrinsics.SetArraySlice3D intArray1 (Some 0) (Some 1) (Some 0) (Some 1) (Some 0) (Some 1) intArray2 - Assert.AreEqual(intArray1.[1,1,1],101) + Assert.AreEqual(101, intArray1.[1,1,1]) () [] member this.OptimizedRangesSetArraySlice4D() = let intArray1 = Array4D.init 2 3 4 5 (fun i j k l -> i*10+j) let intArray2 = Array4D.init 2 3 4 5 (fun i j k l -> i*100+j) - Operators.OperatorIntrinsics.SetArraySlice4D intArray1 (Some 0) (Some 1) (Some 0) (Some 1) (Some 0) (Some 1) intArray2 - Assert.AreEqual(intArray1.[1,1,1,1],101) + Operators.OperatorIntrinsics.SetArraySlice4D intArray1 (Some 0) (Some 1) (Some 0) (Some 1) (Some 0) (Some 1) (Some 0) (Some 1) intArray2 + Assert.AreEqual(101, intArray1.[1,1,1,1]) () [] @@ -465,7 +465,7 @@ type OperatorsModule1() = // int let intdefault = Operators.Unchecked.defaultof - Assert.AreEqual(intdefault, 0) + Assert.AreEqual(0, intdefault) // string let stringdefault = Operators.Unchecked.defaultof @@ -473,7 +473,7 @@ type OperatorsModule1() = // null let structdefault = Operators.Unchecked.defaultof - Assert.AreEqual( structdefault.Day,1) + Assert.AreEqual(1, structdefault.Day) () @@ -482,15 +482,15 @@ type OperatorsModule1() = // int let intabs = Operators.abs (-7) - Assert.AreEqual(intabs, 7) + Assert.AreEqual(7, intabs) // float let floatabs = Operators.abs (-100.0) - Assert.AreEqual(floatabs, 100.0) + Assert.AreEqual(100.0, floatabs) // decimal let decimalabs = Operators.abs (-1000M) - Assert.AreEqual(decimalabs, 1000M) + Assert.AreEqual(1000M, decimalabs) () @@ -499,15 +499,15 @@ type OperatorsModule1() = // min value let minacos = Operators.acos (0.0) - Assert.AreEqual(minacos, 1.5707963267948966) + Assert.AreEqual(1.5707963267948966, minacos) // normal value let normalacos = Operators.acos (0.3) - Assert.AreEqual(normalacos, 1.2661036727794992) + Assert.AreEqual(1.2661036727794992, normalacos) // max value let maxacos = Operators.acos (1.0) - Assert.AreEqual(maxacos, 0.0) + Assert.AreEqual(0.0, maxacos) () [] @@ -515,15 +515,15 @@ type OperatorsModule1() = // min value let minasin = Operators.asin (0.0) - Assert.AreEqual(minasin, 0) + Assert.AreEqual(0.0, minasin) // normal value let normalasin = Operators.asin (0.5) - Assert.AreEqual(normalasin, 0.52359877559829893) + Assert.AreEqual(0.52359877559829893, normalasin) // max value let maxasin = Operators.asin (1.0) - Assert.AreEqual(maxasin, 1.5707963267948966) + Assert.AreEqual(1.5707963267948966, maxasin) () @@ -533,15 +533,15 @@ type OperatorsModule1() = // min value let minatan = Operators.atan (0.0) - Assert.AreEqual(minatan, 0) + Assert.AreEqual(0.0, minatan) // normal value let normalatan = Operators.atan (1.0) - Assert.AreEqual(normalatan, 0.78539816339744828) + Assert.AreEqual(0.78539816339744828, normalatan) // biggish value let maxatan = Operators.atan (infinity) - Assert.AreEqual(maxatan, 1.5707963267948966) + Assert.AreEqual(1.5707963267948966, maxatan) () [] @@ -549,15 +549,15 @@ type OperatorsModule1() = // min value let minatan2 = Operators.atan2 (0.0) (1.0) - Assert.AreEqual(minatan2, 0) + Assert.AreEqual(0.0, minatan2) // normal value let normalatan2 = Operators.atan2 (1.0) (1.0) - Assert.AreEqual(normalatan2, 0.78539816339744828) + Assert.AreEqual(0.78539816339744828, normalatan2) // biggish value let maxatan2 = Operators.atan2 (1.0) (0.0) - Assert.AreEqual(maxatan2, 1.5707963267948966) + Assert.AreEqual(1.5707963267948966, maxatan2) () [] @@ -565,11 +565,11 @@ type OperatorsModule1() = // int value let intbox = Operators.box 1 - Assert.AreEqual(intbox, 1) + Assert.AreEqual(1, intbox) // string value let stringlbox = Operators.box "string" - Assert.AreEqual(stringlbox, "string") + Assert.AreEqual("string", stringlbox) // null value let nullbox = Operators.box null @@ -580,15 +580,15 @@ type OperatorsModule1() = member this.byte() = // int type let intByte = Operators.byte 100 - Assert.AreEqual(intByte,(byte)100) + Assert.AreEqual(100uy, intByte) // char type let charByte = Operators.byte '0' - Assert.AreEqual(charByte,(byte)48) + Assert.AreEqual(48uy, charByte) // boundary value let boundByte = Operators.byte 255.0 - Assert.AreEqual(boundByte, (byte)255) + Assert.AreEqual(255uy, boundByte) // overflow exception try @@ -602,39 +602,39 @@ type OperatorsModule1() = member this.ceil() = // min value let minceil = Operators.ceil 0.1 - Assert.AreEqual(minceil,1.0) + Assert.AreEqual(1.0, minceil) // normal value let normalceil = Operators.ceil 100.0 - Assert.AreEqual(normalceil,100.0) + Assert.AreEqual(100.0, normalceil) // max value let maxceil = Operators.ceil 1.7E+308 - Assert.AreEqual(maxceil, 1.7E+308) + Assert.AreEqual(1.7E+308, maxceil) [] member this.char() = // int type let intchar = Operators.char 48 - Assert.AreEqual(intchar,'0') + Assert.AreEqual('0', intchar) // string type let stringchar = Operators.char " " - Assert.AreEqual(stringchar, ' ') + Assert.AreEqual(' ', stringchar) [] member this.compare() = // int type let intcompare = Operators.compare 100 101 - Assert.AreEqual(intcompare,-1) + Assert.AreEqual(-1, intcompare) // char type let charcompare = Operators.compare '0' '1' - Assert.AreEqual(charcompare,-1) + Assert.AreEqual(-1, charcompare) // null value let boundcompare = Operators.compare null null - Assert.AreEqual(boundcompare, 0) + Assert.AreEqual(0, boundcompare) [] @@ -642,15 +642,15 @@ type OperatorsModule1() = // min value let mincos = Operators.cos (0.0) - Assert.AreEqual(mincos, 1) + Assert.AreEqual(1.0, mincos) // normal value let normalcos = Operators.cos (1.0) - Assert.AreEqual(normalcos, 0.54030230586813977) + Assert.AreEqual(0.54030230586813977, normalcos) // biggish value let maxcos = Operators.cos (1.57) - Assert.AreEqual(maxcos, 0.00079632671073326335) + Assert.AreEqual(0.00079632671073326335, maxcos) () [] @@ -658,15 +658,15 @@ type OperatorsModule1() = // min value let mincosh = Operators.cosh (0.0) - Assert.AreEqual(mincosh, 1.0) + Assert.AreEqual(1.0, mincosh) // normal value let normalcosh = Operators.cosh (1.0) - Assert.AreEqual(normalcosh, 1.5430806348152437) + Assert.AreEqual(1.5430806348152437, normalcosh) // biggish value let maxcosh = Operators.cosh (1.57) - Assert.AreEqual(maxcosh, 2.5073466880660993) + Assert.AreEqual(2.5073466880660993, maxcosh) () @@ -678,11 +678,11 @@ type OperatorsModule1() = // int value let mindecimal = Operators.decimal (1) - Assert.AreEqual(mindecimal, 1) + Assert.AreEqual(1M, mindecimal) // float value let maxdecimal = Operators.decimal (1.0) - Assert.AreEqual(maxdecimal, 1) + Assert.AreEqual(1M, maxdecimal) () [] @@ -690,44 +690,44 @@ type OperatorsModule1() = // zero let zeroref = ref 0 Operators.decr zeroref - Assert.AreEqual(zeroref,(ref -1)) + Assert.AreEqual((ref -1), zeroref) // big number let bigref = ref 32767 Operators.decr bigref - Assert.AreEqual(bigref,(ref 32766)) + Assert.AreEqual((ref 32766), bigref) // normal value let normalref = ref 100 Operators.decr (normalref) - Assert.AreEqual(normalref,(ref 99)) + Assert.AreEqual((ref 99), normalref) [] member this.defaultArg() = // zero let zeroOption = Some(0) let intdefaultArg = Operators.defaultArg zeroOption 2 - Assert.AreEqual(intdefaultArg,0) + Assert.AreEqual(0, intdefaultArg) // big number let bigOption = Some(32767) let bigdefaultArg = Operators.defaultArg bigOption 32766 - Assert.AreEqual(bigdefaultArg,32767) + Assert.AreEqual(32767, bigdefaultArg) // normal value let normalOption = Some(100) let normalfaultArg = Operators.defaultArg normalOption 100 - Assert.AreEqual(normalfaultArg, 100) + Assert.AreEqual(100, normalfaultArg) [] member this.double() = // int type - let intdouble = Operators.double 100 - Assert.AreEqual(intdouble,100.0) + let intdouble = Operators.float 100 + Assert.AreEqual(100.0, intdouble) // char type - let chardouble = Operators.double '0' - Assert.AreEqual(chardouble,48) + let chardouble = Operators.float '0' + Assert.AreEqual(48.0, chardouble) () [] @@ -735,17 +735,17 @@ type OperatorsModule1() = // zero let intarg : int32 = 0 let intenum = Operators.enum intarg - Assert.AreEqual(intenum,System.ConsoleColor.Black) + Assert.AreEqual(System.ConsoleColor.Black, intenum) // big number let bigarg : int32 = 15 let charenum = Operators.enum bigarg - Assert.AreEqual(charenum,System.ConsoleColor.White) + Assert.AreEqual(System.ConsoleColor.White, charenum) // normal value let normalarg : int32 = 9 let boundenum = Operators.enum normalarg - Assert.AreEqual(boundenum, System.ConsoleColor.Blue) + Assert.AreEqual(System.ConsoleColor.Blue, boundenum) #if IGNORED [] @@ -756,30 +756,30 @@ type OperatorsModule1() = () with | _ -> () - //Assert.AreEqual(intexit,-1) + //Assert.AreEqual(-1, intexit) // big number let charexit = Operators.exit 32767 - //Assert.AreEqual(charexit,-1) + //Assert.AreEqual(-1, charexit) // normal value let boundexit = Operators.exit 100 - Assert.AreEqual(boundexit, 0) + Assert.AreEqual(0, boundexit) #endif [] member this.exp() = // zero let zeroexp = Operators.exp 0.0 - Assert.AreEqual(zeroexp,1.0) + Assert.AreEqual(1.0, zeroexp) // big number let bigexp = Operators.exp 32767.0 - Assert.AreEqual(bigexp,infinity) + Assert.AreEqual(infinity, bigexp) // normal value let normalexp = Operators.exp 100.0 - Assert.AreEqual(normalexp, 2.6881171418161356E+43) + Assert.AreEqual(2.6881171418161356E+43, normalexp) [] member this.failwith() = @@ -796,11 +796,11 @@ type OperatorsModule1() = member this.float() = // int type let intfloat = Operators.float 100 - Assert.AreEqual(intfloat,(float)100) + Assert.AreEqual((float)100, intfloat) // char type let charfloat = Operators.float '0' - Assert.AreEqual(charfloat,(float)48) + Assert.AreEqual((float)48, charfloat) () @@ -809,11 +809,11 @@ type OperatorsModule1() = member this.float32() = // int type let intfloat32 = Operators.float32 100 - Assert.AreEqual(intfloat32,(float32)100) + Assert.AreEqual((float32)100, intfloat32) // char type let charfloat32 = Operators.float32 '0' - Assert.AreEqual(charfloat32,(float32)48) + Assert.AreEqual((float32)48, charfloat32) () @@ -821,65 +821,65 @@ type OperatorsModule1() = [] member this.floor() = // float type - let intfloor = Operators.floor 100.0 - Assert.AreEqual(intfloor,100) + let intfloor = Operators.floor 100.9 + Assert.AreEqual(100.0, intfloor) // float32 type - let charfloor = Operators.floor ((float32)100.0) - Assert.AreEqual(charfloor,100) + let charfloor = Operators.floor ((float32)100.9) + Assert.AreEqual(100.0f, charfloor) [] member this.fst() = // int type let intfst = Operators.fst (100,101) - Assert.AreEqual(intfst,100) + Assert.AreEqual(100, intfst) // char type let charfst = Operators.fst ('0','1') - Assert.AreEqual(charfst,'0') + Assert.AreEqual('0', charfst) // null value let boundfst = Operators.fst (null,null) - Assert.AreEqual(boundfst, null) + Assert.AreEqual(null, boundfst) [] member this.hash() = // int type let inthash = Operators.hash 100 - Assert.AreEqual(inthash,100) + Assert.AreEqual(100, inthash) // char type let charhash = Operators.hash '0' - Assert.AreEqual(charhash,3145776) + Assert.AreEqual(3145776, charhash) // string value let boundhash = Operators.hash "A" - Assert.AreEqual(boundhash, -842352673) + Assert.AreEqual(-842352673, boundhash) [] member this.id() = // int type let intid = Operators.id 100 - Assert.AreEqual(intid,100) + Assert.AreEqual(100, intid) // char type let charid = Operators.id '0' - Assert.AreEqual(charid,'0') + Assert.AreEqual('0', charid) // string value let boundid = Operators.id "A" - Assert.AreEqual(boundid, "A") + Assert.AreEqual("A", boundid) [] member this.ignore() = // value type let result = Operators.ignore 10 - Assert.AreEqual(result,null) + Assert.AreEqual(null, result) // reference type let result = Operators.ignore "A" - Assert.AreEqual(result,null) + Assert.AreEqual(null, result) () @@ -889,7 +889,7 @@ type OperatorsModule1() = // legit value let result = ref 10 Operators.incr result - Assert.AreEqual(!result,11) + Assert.AreEqual(11, !result) // overflow let result = ref (Operators.Checked.int System.Int32.MaxValue) @@ -907,15 +907,15 @@ type OperatorsModule1() = // arithmetic operation let result = infinity + 3.0 - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) let result = infinity - 3.0 - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) let result = infinity * 3.0 - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) let result = infinity / 3.0 - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) let result = infinity / 3.0 - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) () @@ -929,15 +929,15 @@ type OperatorsModule1() = // arithmetic operation let result = infinityf + 3.0f - Assert.AreEqual(result,infinity) + Assert.AreEqual(Single.PositiveInfinity, result) let result = infinityf - 3.0f - Assert.AreEqual(result,infinity) + Assert.AreEqual(Single.PositiveInfinity, result) let result = infinityf * 3.0f - Assert.AreEqual(result,infinity) + Assert.AreEqual(Single.PositiveInfinity, result) let result = infinityf / 3.0f - Assert.AreEqual(result,infinity) + Assert.AreEqual(Single.PositiveInfinity, result) let result = infinityf / 3.0f - Assert.AreEqual(result,infinityf) + Assert.AreEqual(Single.PositiveInfinity, result) () diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs index 8ac0ebfd9c6..40d290b7ed9 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule2.fs @@ -3,10 +3,10 @@ // Various tests for the: // Microsoft.FSharp.Core.Operators module -namespace SystematicUnitTests.FSharp_Core.Microsoft_FSharp_Core +namespace FSharp.Core.UnitTests.Operators open System -open SystematicUnitTests.LibraryTestFx +open FSharp.Core.UnitTests.LibraryTestFx open NUnit.Framework open Microsoft.FSharp.Core.Operators.Checked @@ -18,23 +18,23 @@ type OperatorsModule2() = member this.int() = // int let result = Operators.int 10 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // string let result = Operators.int "10" - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // double let result = Operators.int 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // negative let result = Operators.int -10 - Assert.AreEqual(result,-10) + Assert.AreEqual(-10, result) // zero let result = Operators.int 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // overflow CheckThrowsOverflowException(fun() -> Operators.int System.Double.MaxValue |>ignore) @@ -47,23 +47,23 @@ type OperatorsModule2() = member this.int16() = // int let result = Operators.int16 10 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // double let result = Operators.int16 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // negative let result = Operators.int16 -10 - Assert.AreEqual(result,-10) + Assert.AreEqual(-10, result) // zero let result = Operators.int16 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // string let result = Operators.int16 "10" - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // overflow CheckThrowsOverflowException(fun() -> Operators.int16 System.Double.MaxValue |>ignore) @@ -75,23 +75,23 @@ type OperatorsModule2() = member this.int32() = // int let result = Operators.int32 10 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // double let result = Operators.int32 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // negative let result = Operators.int32 -10 - Assert.AreEqual(result,-10) + Assert.AreEqual(-10, result) // zero let result = Operators.int32 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // string let result = Operators.int32 "10" - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // overflow CheckThrowsOverflowException(fun() -> Operators.int32 System.Double.MaxValue |>ignore) @@ -103,23 +103,23 @@ type OperatorsModule2() = member this.int64() = // int let result = Operators.int64 10 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // double let result = Operators.int64 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // negative let result = Operators.int64 -10 - Assert.AreEqual(result,-10) + Assert.AreEqual(-10, result) // zero let result = Operators.int64 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // string let result = Operators.int64 "10" - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // overflow CheckThrowsOverflowException(fun() -> Operators.int64 System.Double.MaxValue |>ignore) @@ -142,16 +142,16 @@ type OperatorsModule2() = System.Threading.Thread.Sleep(1) !k ) } let arr = Async.RunSynchronously (Async.Parallel(Seq.map comp [1..50])) - Assert.AreEqual((Array.sort compare arr; arr), [|1..50|]) + Assert.AreEqual([|1..50|], Array.sort arr) // without lock let syncRoot = System.Object() let k = ref 0 let comp _ = async { do incr k - do! System.Threading.Thread.AsyncSleep(10) + do! Async.Sleep (10) return !k } let arr = Async.RunSynchronously (Async.Parallel(Seq.map comp [1..100])) - Assert.AreNotEqual ((Array.sort compare arr; arr) , [|1..100|]) + Assert.AreNotEqual ([|1..100|], Array.sort arr) () @@ -159,15 +159,15 @@ type OperatorsModule2() = member this.log() = // double let result = Operators.log 10.0 - Assert.AreEqual(result.ToString(),"2.30258509299405") + Assert.AreEqual(2.3025850929940459, result) // negative let result = Operators.log -10.0 - Assert.AreEqual(result.ToString(),System.Double.NaN.ToString()) + Assert.AreEqual(Double.NaN, result) // zero let result = Operators.log 0.0 - Assert.AreEqual(result,-infinity) + Assert.AreEqual(Double.NegativeInfinity , result) () @@ -175,15 +175,15 @@ type OperatorsModule2() = member this.log10() = // double let result = Operators.log10 10.0 - Assert.AreEqual(result,1) + Assert.AreEqual(1.0, result) // negative let result = Operators.log10 -10.0 - Assert.AreEqual(result.ToString(),System.Double.NaN.ToString()) + Assert.AreEqual(System.Double.NaN, result) // zero let result = Operators.log10 0.0 - Assert.AreEqual(result,-infinity) + Assert.AreEqual(Double.NegativeInfinity, result) () @@ -191,19 +191,19 @@ type OperatorsModule2() = member this.max() = // value type let result = Operators.max 10 8 - Assert.AreEqual(result,10) + Assert.AreEqual(10, result) // negative let result = Operators.max -10.0 -8.0 - Assert.AreEqual(result,-8.0) + Assert.AreEqual(-8.0, result) // zero let result = Operators.max 0 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // reference type let result = Operators.max "A" "ABC" - Assert.AreEqual(result,"ABC") + Assert.AreEqual("ABC", result) // overflow CheckThrowsOverflowException(fun() -> Operators.max 10 System.Int32.MaxValue+1 |>ignore) @@ -214,19 +214,19 @@ type OperatorsModule2() = member this.min() = // value type let result = Operators.min 10 8 - Assert.AreEqual(result,8) + Assert.AreEqual(8, result) // negative let result = Operators.min -10.0 -8.0 - Assert.AreEqual(result,-10.0) + Assert.AreEqual(-10.0, result) // zero let result = Operators.min 0 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // reference type let result = Operators.min "A" "ABC" - Assert.AreEqual(result,"A") + Assert.AreEqual("A", result) // overflow CheckThrowsOverflowException(fun() -> Operators.min 10 System.Int32.MinValue - 1 |>ignore) @@ -237,7 +237,7 @@ type OperatorsModule2() = member this.nan() = // value type let result = Operators.nan - Assert.AreEqual(result.ToString(),System.Double.NaN.ToString()) + Assert.AreEqual(System.Double.NaN, nan) () @@ -245,7 +245,7 @@ type OperatorsModule2() = member this.nanf() = // value type let result = Operators.nanf - Assert.AreEqual(result,System.Single.NaN) + Assert.AreEqual(System.Single.NaN, result) () @@ -254,23 +254,23 @@ type OperatorsModule2() = member this.nativeint() = // int let result = Operators.nativeint 10 - Assert.AreEqual(result,10n) + Assert.AreEqual(10n, result) // double let result = Operators.nativeint 10.0 - Assert.AreEqual(result,10n) + Assert.AreEqual(10n, result) // int64 let result = Operators.nativeint 10L - Assert.AreEqual(result,10n) + Assert.AreEqual(10n, result) // negative let result = Operators.nativeint -10 - Assert.AreEqual(result,-10n) + Assert.AreEqual(-10n, result) // zero let result = Operators.nativeint 0 - Assert.AreEqual(result,0n) + Assert.AreEqual(0n, result) // overflow CheckThrowsOverflowException(fun() -> Operators.nativeint System.Double.MaxValue |>ignore) @@ -298,31 +298,31 @@ type OperatorsModule2() = member this.pown() = // int let result = Operators.pown 10 2 - Assert.AreEqual(result,100) + Assert.AreEqual(100, result) // double let result = Operators.pown 10.0 2 - Assert.AreEqual(result,100) + Assert.AreEqual(100.0, result) // int64 let result = Operators.pown 10L 2 - Assert.AreEqual(result,100) + Assert.AreEqual(100L, result) // decimal let result = Operators.pown 10M 2 - Assert.AreEqual(result,100) + Assert.AreEqual(100M, result) // negative let result = Operators.pown -10 2 - Assert.AreEqual(result,100) + Assert.AreEqual(100, result) // zero let result = Operators.pown 0 2 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) // overflow let result = Operators.pown System.Double.MaxValue System.Int32.MaxValue - Assert.AreEqual(result,infinity) + Assert.AreEqual(Double.PositiveInfinity, result) CheckThrowsOverflowException(fun() -> Operators.pown System.Int32.MaxValue System.Int32.MaxValue |>ignore) @@ -369,11 +369,11 @@ type OperatorsModule2() = member this.round() = // double let result = Operators.round 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10.0, result) // decimal let result = Operators.round 10M - Assert.AreEqual(result,10) + Assert.AreEqual(10M, result) () @@ -381,19 +381,19 @@ type OperatorsModule2() = member this.sbyte() = // int let result = Operators.sbyte 10 - Assert.AreEqual(result,10) + Assert.AreEqual(10y, result) // double let result = Operators.sbyte 10.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10y, result) // negative let result = Operators.sbyte -10 - Assert.AreEqual(result,-10) + Assert.AreEqual(-10y, result) // zero let result = Operators.sbyte 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0y, result) () @@ -401,19 +401,19 @@ type OperatorsModule2() = member this.sign() = // int let result = Operators.sign 10 - Assert.AreEqual(result,1) + Assert.AreEqual(1, result) // double let result = Operators.sign 10.0 - Assert.AreEqual(result,1) + Assert.AreEqual(1, result) // negative let result = Operators.sign -10 - Assert.AreEqual(result,-1) + Assert.AreEqual(-1, result) // zero let result = Operators.sign 0 - Assert.AreEqual(result,0) + Assert.AreEqual(0, result) () @@ -421,23 +421,23 @@ type OperatorsModule2() = member this.sin() = let result = Operators.sin 0.5 - Assert.AreEqual(result.ToString(),"0.479425538604203") + Assert.AreEqual(0.479425538604203, result) () [] member this.single() = // int - let result = Operators.single 10 - Assert.AreEqual(result,10) + let result = Operators.float32 10 + Assert.AreEqual(10f, result) // double - let result = Operators.single 10.0 - Assert.AreEqual(result,10) + let result = Operators.float32 10.0 + Assert.AreEqual(10f, result) // string - let result = Operators.single "10" - Assert.AreEqual(result,10) + let result = Operators.float32 "10" + Assert.AreEqual(10f, result) () @@ -445,7 +445,7 @@ type OperatorsModule2() = member this.sinh() = let result = Operators.sinh 1.0 - Assert.AreEqual(result.ToString(),"1.1752011936438") + Assert.AreEqual(1.1752011936438014, result) () @@ -453,19 +453,19 @@ type OperatorsModule2() = member this.sizeof() = // value type let result = Operators.sizeof - Assert.AreEqual(result,4) + Assert.AreEqual(4, result) // System.Int64 let result = Operators.sizeof - Assert.AreEqual(result,8) + Assert.AreEqual(8, result) // reference type let result = Operators.sizeof - Assert.AreEqual(result,4) + Assert.AreEqual(4, result) // null let result = Operators.sizeof - Assert.AreEqual(result,4) + Assert.AreEqual(4, result) () @@ -473,15 +473,15 @@ type OperatorsModule2() = member this.snd() = // value type let result = Operators.snd ("ABC",100) - Assert.AreEqual(result,100) + Assert.AreEqual(100, result) // reference type let result = Operators.snd (100,"ABC") - Assert.AreEqual(result,"ABC") + Assert.AreEqual("ABC", result) // null let result = Operators.snd (100,null) - Assert.AreEqual(result,null) + Assert.AreEqual(null, result) () @@ -489,28 +489,28 @@ type OperatorsModule2() = member this.sqrt() = // double let result = Operators.sqrt 100.0 - Assert.AreEqual(result,10) + Assert.AreEqual(10.0, result) () [] member this.stderr() = let result = Operators.stderr - Assert.AreEqual(result.WriteLine("go"),null) + Assert.AreEqual(null, result.WriteLine("go")) () [] member this.stdin() = let result = Operators.stdin - Assert.AreEqual(result.Dispose(),null) + Assert.AreEqual(null, result.Dispose()) () [] member this.stdout() = let result = Operators.stdout - Assert.AreEqual(result.WriteLine("go"),null) + Assert.AreEqual(null, result.WriteLine("go")) () @@ -518,14 +518,11 @@ type OperatorsModule2() = member this.string() = // value type let result = Operators.string 100 - Assert.AreEqual(result,"100") + Assert.AreEqual("100", result) // reference type let result = Operators.string "ABC" - Assert.AreEqual(result,"ABC") - - // unit - CheckThrowsNullRefException(fun () -> Operators.string null |>ignore) + Assert.AreEqual("ABC", result) () @@ -533,31 +530,43 @@ type OperatorsModule2() = member this.tan() = // double let result = Operators.tan 1.0 - Assert.AreEqual(result.ToString(),"1.5574077246549") + Assert.AreEqual(1.5574077246549023, result) () [] member this.tanh() = - // double - let result = Operators.tanh 0.8 - Assert.AreEqual(result,0.664036770267849) + // this doesn't work, even though the values are roundtrippable correct + // it also works correctly in FSI, so what gives? + //let result = Operators.tanh 0.8 + //Assert.AreEqual(0.66403677026784891, result) + let result = Operators.tanh 0.8 + // why does the following not compile? + //Assert.IsTrue(result = 0.66403677026784891) + // but the following does? + // Assert.IsTrue(0.5 = 0.66403677026784891) + // this works in FSI, but fails just like Assert.AreEqual, what is wrong here? + Assert.IsTrue(result.Equals(0.66403677026784891)) + + // double + let result = Operators.tanh 0.5 + Assert.AreEqual(0.46211715726000974, result) () [] member this.truncate() = // double let result = Operators.truncate 10.101 - Assert.AreEqual(result,10) + Assert.AreEqual(10.0, result) // decimal let result = Operators.truncate 10.101M - Assert.AreEqual(result,10M) + Assert.AreEqual(10M, result) // zero let result = Operators.truncate 0.101 - Assert.AreEqual(result,0) + Assert.AreEqual(0.0, result) () @@ -565,15 +574,15 @@ type OperatorsModule2() = member this.typedefof() = // value type let result = Operators.typedefof - Assert.AreEqual(result.FullName,"System.Int32") + Assert.AreEqual("System.Int32", result.FullName) // reference type let result = Operators.typedefof - Assert.AreEqual(result.FullName,"System.String") + Assert.AreEqual("System.String", result.FullName) // unit let result = Operators.typedefof - Assert.AreEqual(result.FullName,"Microsoft.FSharp.Core.Unit") + Assert.AreEqual("Microsoft.FSharp.Core.Unit", result.FullName) () @@ -581,15 +590,15 @@ type OperatorsModule2() = member this.typeof() = // value type let result = Operators.typeof - Assert.AreEqual(result.FullName,"System.Int32") + Assert.AreEqual("System.Int32", result.FullName) // reference type let result = Operators.typeof - Assert.AreEqual(result.FullName,"System.String") + Assert.AreEqual("System.String", result.FullName) // unit let result = Operators.typeof - Assert.AreEqual(result.FullName,"Microsoft.FSharp.Core.Unit") + Assert.AreEqual("Microsoft.FSharp.Core.Unit", result.FullName) () @@ -597,15 +606,15 @@ type OperatorsModule2() = member this.uint16() = // int let result = Operators.uint16 100 - Assert.AreEqual(result,100us) + Assert.AreEqual(100us, result) // double let result = Operators.uint16 (100.0:double) - Assert.AreEqual(result,100us) + Assert.AreEqual(100us, result) // decimal let result = Operators.uint16 100M - Assert.AreEqual(result,100us) + Assert.AreEqual(100us, result) () @@ -613,15 +622,15 @@ type OperatorsModule2() = member this.uint32() = // int let result = Operators.uint32 100 - Assert.AreEqual(result,100ul) + Assert.AreEqual(100ul, result) // double let result = Operators.uint32 (100.0:double) - Assert.AreEqual(result,100ul) + Assert.AreEqual(100ul, result) // decimal let result = Operators.uint32 100M - Assert.AreEqual(result,100ul) + Assert.AreEqual(100ul, result) () @@ -629,15 +638,15 @@ type OperatorsModule2() = member this.uint64() = // int let result = Operators.uint64 100 - Assert.AreEqual(result,100UL) + Assert.AreEqual(100UL, result) // double let result = Operators.uint64 (100.0:double) - Assert.AreEqual(result,100UL) + Assert.AreEqual(100UL, result) // decimal let result = Operators.uint64 100M - Assert.AreEqual(result,100UL) + Assert.AreEqual(100UL, result) () @@ -645,11 +654,11 @@ type OperatorsModule2() = member this.unativeint() = // int let result = Operators.unativeint 100 - Assert.AreEqual(result,100un) + Assert.AreEqual(100un, result) // double let result = Operators.unativeint (100.0:double) - Assert.AreEqual(result,100un) + Assert.AreEqual(100un, result) () @@ -658,17 +667,17 @@ type OperatorsModule2() = // value type let oint = box 100 let result = Operators.unbox oint - Assert.AreEqual(result,100) + Assert.AreEqual(100, result) // reference type let ostr = box "ABC" let result = Operators.unbox ostr - Assert.AreEqual(result,"ABC") + Assert.AreEqual("ABC", result) // null let onull = box null let result = Operators.unbox onull - Assert.AreEqual(result,null) + Assert.AreEqual(null, result) () diff --git a/tests/FSharp.Core.UnitTests/LibraryTestFx.fs b/tests/FSharp.Core.UnitTests/LibraryTestFx.fs index f17daba432e..6d8a67ac4d8 100644 --- a/tests/FSharp.Core.UnitTests/LibraryTestFx.fs +++ b/tests/FSharp.Core.UnitTests/LibraryTestFx.fs @@ -37,6 +37,7 @@ let private CheckThrowsExn2<'a when 'a :> exn> s (f : unit -> unit) = // attribute to flag these exception's usage as a bug. let CheckThrowsNullRefException f = CheckThrowsExn f let CheckThrowsIndexOutRangException f = CheckThrowsExn f +let CheckThrowsObjectDisposedException f = CheckThrowsExn f // Legit exceptions let CheckThrowsNotSupportedException f = CheckThrowsExn f