From b67841a3dd8e82034e6b9aaf72153a876cc3637a Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Fri, 4 Mar 2022 23:07:11 +0100 Subject: [PATCH] Additional Gnumeric Reader array formula unit tests --- .../Reader/Gnumeric/ArrayFormulaTest.php | 8 +++++++- .../Reader/Gnumeric/ArrayFormulaTest.gnumeric | Bin 1856 -> 1941 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/ArrayFormulaTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/ArrayFormulaTest.php index 99d12a613..60a0496b7 100644 --- a/tests/PhpSpreadsheetTests/Reader/Gnumeric/ArrayFormulaTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/ArrayFormulaTest.php @@ -34,7 +34,7 @@ class ArrayFormulaTest extends TestCase $cell = $worksheet->getCell($cellAddress); self::assertTrue($cell->isArrayFormula()); self::assertSame($expectedRange, $cell->arrayFormulaRange()); - self::assertSame($expectedFormula, $cell->getValue()); + self::assertSame($expectedFormula, strtoupper($cell->getValue())); self::assertSame($expectedValue, $cell->getCalculatedValue(true, true)); // self::assertSame(8, $cell->getCalculatedValue()); // self::assertSame(8, $cell->getCalculatedValue()); @@ -52,6 +52,12 @@ class ArrayFormulaTest extends TestCase '=A1:B1*A1:A2', [[4, 6], [8, 12]], ], + [ + 'G1', + 'G1:J1', + '=SIN({-1,0,1,2})', + [[-0.8414709848078965, 0.0, 0.8414709848078965, 0.9092974268256817]], + ], [ 'D4', 'D4:E5', diff --git a/tests/data/Reader/Gnumeric/ArrayFormulaTest.gnumeric b/tests/data/Reader/Gnumeric/ArrayFormulaTest.gnumeric index d2bc20d3bcd6cb609fcd89019135c89fdd388585..b4f7c1a2e7e095202773be47a66f49e708195a70 100644 GIT binary patch literal 1941 zcmV;G2Wt2qiwFP!000001I<`%Z{s!+{=UCL)d58tY+_4(i`CeLk~oP0#|dmDd)-4J z&=O;_kwlfE6Q@Q0`wdA+mgQBVGzau{0f!vU3?B}M4~IJWc@qZO6J`ma(Lgtjn!1J~ zkNPB94)id~4N0coa zPe${|=f0lmZW6Mi``nURX0vHD{(U`}dn+8GLlPw%MIHvLgjk6bPN;{t#8x>~|7er= z`tXycNtpL)G1@4m-U^naYuD&E%AjRJlSH!F)3u9r5Qr5U<`HxoxxLLfBa1c1i4c{A zN|s6^6yjkPmV1JqEh|~kXLm&z`GZCr1#aRo8Uzc(P8zvI(Zv%A)_Ca5?nX*M_0`0U zZ_NBR(7^6;;{AVMi73ZH?AF@s=u9Q&^VxUeVl zS_n!anY}0U;emJ<7VW`_iTGiNIZDr@8XD+p7FiS}B#{Ubi+dK0ag>=@MQuwGM0%zJ z5rfD@z%QU{8G_ui5TY~Z!mb7(P zHZ=NHr)zb3VE7HibZ<)_a>33v=7e>I0&g8iFF`fn{7_hWgH;V9rlMn3J#U%~|h;S>k-`5W??!VU6!l8^-n2!9#qm(y!^el;37?)`W^J{?cS z&M&Gt8R?pU28hJv*0kWizC$H4ipAJY%VYyN0p`QL8cus91z6wEXyqEBTh#bUX*f*% z%XS$-l1YlFa#4{hZyAZWYs1;t=f)C0{%bb6_->CM3u-Y(_ZY0?QGAcZ1BDB@o<(*DO5sz4 z0_2M|{t^R)#+Z3P*k}p2&bF;Mw^6ct5~DD`ObbCFWrfvS3QHh?>QVfJBbPk5Gzwna zguethsa6hY1m!aWUai*g8G=2m9OmM1yfOt;Vo(l383f_3){?_6+(^qDiD1Ip*?8)> z_L(!jA1PYgv!o36f9Sh>1?x_0UL`B*5wR`uc*K-(h6vBJwrQCYp2MA8u|kMS@{pJ4&sm^(awD? z>>!MQ6Gu>>1v^X4QwvU#qANo(sKq()E0TjJ=5lHZg9*%%IN!#Xt%;MaZ+l5Xb9$b7ZIS3;s6{ya23H$NMn&A)!E;m@dy zOZy$x`*G>iur{}A8Es-VJ{OLLgAi?gC@rMUN?MgGsk29|%9YfKL+kY&Zd<4A1NgP; zM5SH1j`vvaucKSTy8EGQ=zb_0y06EuXPx#A;MYE`;j34W{p){d z|N3t*O%tf5c_9AUhEeBySJP&lP#D#`S!Wjw^F!O1oBzFi%+0HU*@9rU4#Z#Es7035 z3{@){)fCm=H{VKjZ%O$UpP(1I=9)ueRg2q3`F^Lt6IANg)W?CEMm}rlBEVtZzeXE} zgwXCb^Dk@ieFxnsjiz`hv7VE}Q{RQ`HK+24n7Lar6wV4aeBo19>C0D=f5o~RpCgVm bRRmz)L5tLZ($2m$4?q1EMsj!|;TZq`&|I!J literal 1856 zcmV-G2fz3qiwFP!000001I<`%Q{y%e{(is0b!Ym48HkvTMd zEfN*ka%F{=`}JK(w&OTw2&FSEAA+>nl^(5jAFX`+%X37HN6b^g;(=)&S*C&GfQ2Mp z4$NEc{P45+%kb0jGLD=tj6Wp%#{#{(`YAy9&PI= z6rq{vKBr_$_o=0{nwDiZe!ZH^gB6a@A&FCg;sAqHN}N;)CoDihVXIxLfApM&=J1nY zD42J8GsY-k!3wry8dvB~#-Y`OCW%$EXBy{gO6892<`Hxog}o~TCyTYfsT5U(T9!#; z6yag+mOFx<94B3|Cx68_`Nm>_sGkO$QMy3Re&7KafQD9cGbG%(jZb{I-Yst}}(2ppE+I5%<1+KwWKET<`nAHJ8> zcE8_msL@~sauA`7%LW%>Kb%THSLD(n?|;o z674n3%&*yyoVhrRFmOTyPHtMw=AqR(wAxBkqB9KX4n7CRjAFE)cq}l_XjJjxb0J7U zVu4;E@ECY78PY3ooftTxfTyMmhk0yFRke=)w0P)N@2wmYVAiOF&$ z24=5qS3#y#aK;%)6N+BW8IQo1sq)<=3Gr9VS<$)RBrH0xjZ2I|%nJ$Zq$J5^yj}}P z1)M6+XPx;=v;ZfZV9K7pBcEy9AipCiSrAIZ%fP&tUitIO(a7`f#`E#Xcrx~W)6L1q zG$b@YBri9JOUE*|s6=_O?AvLTY#=7UeAw2*S+Al1`y1M=LPK`T8ebWUhS~h8T}6=Q zk}|47ROZSXPGaG^kQ=+)SmDPXXQT5UcKETRmavq_z#h68wnDH$v*VLD5h`c;9uXA3 z3Gt`D)=d1Y-LKpKI^K;W-EzBfEutt?R^eOTsR9!n51WSw?2BtD>n-I)59N*u@ z1fnvEbTVz}FPIQ4dY1{s_o6W9HQ&_dGAZ6;uu`e`9*cVh7xI1x3M^8P*O9nH;Yy0hJh(gHQ&6yX&>oun#xVvOpr4@MboidcJ$=jqgU9 z7I!Qehw~qXzF5J&vzk}Ss(M5oi%O4#alsK0x%Osc+eY)eF@Yc+nDSW>h7^$fgrel< z-#z!_57Wq4d_I6sS6@ z?6}kGtEVX<6d9%||9VM3qM9198X*Hv9=~A+c zHT+9=GQODl7o+KD=1$;_Esfpjv6E}hyS_4wFB~Nveimxg`3ko4;IVU}`!go8l1dFi zJgAneOk%A8Z`TJLs*4=T0}v}Ilo&X_q>U34Kn;Bke@^iOtb+uENW68QOFM8Q;KVT$ zXmo3QC=VJXu+es*QqGZ;XM(k zn$|d7^OSKFBrP-RWzkcOxZJ1|Z>^emYi**b?e@$D^QN~=LGWkx=C9^iM9+B|h< zv;kyO&ni{lw6=GwTko)L$w-zJcvA^fV>oba=fpmMUw0oQcI`ge@37w8M`sV~R_)sR zc%fCh_CCm4ulum=oU{+%*WG6y?b?03$9i`k-94 z)vMjdK3?e6?xVMdb^k->*Z_Ft2lF3!K?HkpEqKFM6wIsJ*;VPf`6{^NnQt9#W6b33_2`VR$Uj#iwgmZ%{@b zp)|c>A*Om6^^Ri;ild?rFMp3j(C%8rrzG{Df$o&WQ@m7I&qx~R4Dx}_Q%_oawz(ajA%P5i&En8Qi);d|oqt>%e)=2u9Y#6Q7ytllnwB;I