From 16fe84704b14b7396a1ad4fd84404368f414b906 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 23 Sep 2021 13:02:24 +0100
Subject: [PATCH] add test for accellog

---
 apps/accellog/app.js                    |   1 -
 tests/Layout/bin/espruino               | Bin 4459888 -> 4459888 bytes
 tests/Layout/bin/runalltests.sh         |   5 ++--
 tests/Layout/bin/runtest.sh             |  31 +++++++++++++-----------
 tests/Layout/tests/accellog.bmp         | Bin 0 -> 15562 bytes
 tests/Layout/tests/accellog.js          |  13 ++++++++++
 tests/Layout/tests/padding_issue819.bmp | Bin 15562 -> 15562 bytes
 7 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 tests/Layout/tests/accellog.bmp
 create mode 100644 tests/Layout/tests/accellog.js

diff --git a/apps/accellog/app.js b/apps/accellog/app.js
index 0da56b6ea..dcc7702c9 100644
--- a/apps/accellog/app.js
+++ b/apps/accellog/app.js
@@ -105,7 +105,6 @@ function startRecord(force) {
       showMenu();
     }}
   ]);
-  layout.update();
   layout.render();
 
   // now start writing
diff --git a/tests/Layout/bin/espruino b/tests/Layout/bin/espruino
index 29d44789b75bfdcaf5272ae0b29dac5365e868e5..3a423c1859b9174b119f34b78b93491cc509553b 100755
GIT binary patch
delta 446
zcmZ9@yDvj=7{+nuwA$mRs<cJboz|@vw^DayGDv&;0S1c!n?Hb5a)`wuzedtnIyW6e
z2VFWz3=%eD2Xou4qwf(G!{>SPzIoo-{jFL<;ZpUSUS%KsA5Z(CO15yM<(2n*^*o(X
zjf|?moEBKo3>)mw&{E8(qOd1(DdCmJN#T?yDG}Go4eh#obLWz8N#V1kD-HRQ5(n}^
z|7-2)A}#~EaLZ4g%!ZNE1zL+a-EsJ!#0-1gfi^hN4i`Gm2{%0Oq6^*Vfe*d#qYwQU
zz#xV&j1i1t3;_f&jtNX+3eyN7j0mEb!EDi9pR2wuhuux8)uKjzhm%dQo!PYDvw8nA
nL;FefU(<+|=CObn7O{jlma&3WtYIA+*u)kR*e*s(I|=<8BwV0S

delta 452
zcmXxaJ4ixt6vuJBn)mk4%u*|RzqF@X*+Y9<K`o(oYbm0&A&j<YGLVp<MXt0s<kTcB
z4!Iaa(9m3CL{mcw4UT=4Jn%U`&f!<Qxt5B^UP$)0t^3c%&2u^Rd*a-Ue%~FRMbojA
z6i-QdRMG$=>R^Hl1@*a<B(gi&ZA93#y@;?FVjpGgC?W#l%KW5b5=pD}8Wv9NIU@Fz
zLRq;iB$9URfLFD<t%`u=QiVf%4+~2?qY5<SGOGD7t@p>}k{OM#pb1tqqXjnD;Xo_e
z&<-a$(1|W|qX)g{Lq7&Eh#|P(#xO=OiZP610v>qb!z8A1a%uYKCFr&3B%?w4508aQ
xZ#p$8?uW|%tFn~pu2pKyxG(R=3}!Khc?1x|0v54^WvpNoYY1UI=gV(|)IW@wp<Vz0

diff --git a/tests/Layout/bin/runalltests.sh b/tests/Layout/bin/runalltests.sh
index 99a834d90..3a7aac50b 100755
--- a/tests/Layout/bin/runalltests.sh
+++ b/tests/Layout/bin/runalltests.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-cd `dirname $0`
-cd ../tests
-ls *.js | xargs ../bin/runtest.sh 
+cd `dirname $0`/..
+ls tests/*.js | xargs -I{} bin/runtest.sh {}
diff --git a/tests/Layout/bin/runtest.sh b/tests/Layout/bin/runtest.sh
index 72071a63b..5ce2ab21f 100755
--- a/tests/Layout/bin/runtest.sh
+++ b/tests/Layout/bin/runtest.sh
@@ -2,35 +2,38 @@
 # Requires Linux x64 (for ./espruino)
 # Also imagemagick for display
  
-cd `dirname $0`
+cd `dirname $0`/..
 if [ "$#" -ne 1 ]; then
     echo "USAGE:"
-    echo "  bin/runtest.sh testxyz.js"
+    echo "  bin/runtest.sh tests/testxyz.js"
     exit 1
 fi
 
 # temporary test files
-TESTJS=tmp.js
-TESTBMP=tmp.bmp
+TESTJS=bin/tmp.js
+TESTBMP=bin/tmp.bmp
 # actual source files
-SRCDIR=../tests/
+SRCDIR=tests
 SRCJS=$1
-SRCBMP=`basename $SRCJS .js`.bmp
+SRCBMP=$SRCDIR/`basename $SRCJS .js`.bmp
 echo "TEST $SRCJS ($SRCBMP)"
 
-cat  ../../../modules/Layout.js > $TESTJS
+cat  ../../modules/Layout.js > $TESTJS
+echo 'Bangle = {};BTN1=0;process.env = process.env;process.env.HWVERSION=2;' >> $TESTJS
 echo 'g = Graphics.createArrayBuffer(176,176,4);' >> $TESTJS
-cat $SRCDIR/$SRCJS >> $TESTJS  || exit 1
+cat $SRCJS >> $TESTJS  || exit 1
 echo 'layout.render()' >> $TESTJS
-echo 'layout.debug()' >> $TESTJS
+#echo 'layout.debug()' >> $TESTJS
 echo 'require("fs").writeFileSync("'$TESTBMP'",g.asBMP())' >> $TESTJS
 
-./espruino $TESTJS || exit 1
-if ! cmp $TESTBMP $SRCDIR/$SRCBMP >/dev/null 2>&1
+bin/espruino $TESTJS || exit 1
+if ! cmp $TESTBMP $SRCBMP >/dev/null 2>&1
 then
-  echo Files differ
-  convert "+append" $TESTBMP $SRCDIR/$SRCBMP ../testresult.bmp
-  display ../testresult.bmp
+  echo =============================================
+  echo $TESTBMP $SRCBMP differ
+  echo ==============================================
+  convert "+append" $TESTBMP $SRCBMP testresult.bmp
+  display testresult.bmp
   exit 1
 else
   echo Files are the same
diff --git a/tests/Layout/tests/accellog.bmp b/tests/Layout/tests/accellog.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7ebe01b2100f193da43872cbb697f9bb9fbc0931
GIT binary patch
literal 15562
zcmeI0F>a(V6o%hQDI@tRIY5eNwbe?wLy9@f9AS=-a?2@Gu2x9X?lCASkjVdd7ziff
z+1SZMd7c?#jQQvH=V!qDeEfG$efo|37Qa9E{Gc1Id-(NmJRZ;I^WEV@cTaR6dZy+?
ze~GYvqK4={9U5wzrbXG35ikNqzz7%tBVYuKfDtePM&P;$R3*|2Q3=_~bOq~|=WuDO
z>e601q_)C_cl)BR$97&bv{?pKz@e}%yMpiD``er=ha=O`rQI-oCoO;WR0BR>lSg+=
z-PeIF{z(R5;rKniY)Y)H&`8pq2g0Z>5h4(T3v0_~;Z$}*zom5Hk$rd$Ql910xN(3F
zEd$S?-%`4s!*ag)dhW?=2CC<qKR>f>Kq{>w;F~5BoMpO#<O^~jOGe<c2{>FfyIOL>
zrsfR!-c(AL$iW={mZjZ}3+f8l!E;Y}uiJsas0AWpd5^ZMh3!C><6(a=z)-Sox6vEN
z!O9-xAG91CZFH-YuJDwxiWsp?ziGM=4mQT&gAR9F@sQ@j(N;Ws4_zw6H;ta^tc`iB
z(pYO$L{~fC5RbSkI~Oq?D!<Tm1YK;kDNZ+Y{7in8j+K`OsCBqv)}XB7fXlC@A%<5a
zH#So0a(g8Jk&e(Ey{HOxlns@nH8KL%L;#a`u_Vglu9U8S{AHK&Ae_hVTrI!uv|M5B
zJgHY2Z?U;_!=+0ux85Od`}Ia9;b2L0-MVQ@7e$|D@i0b(;xubw1dKp3fozv^ap3Tv
z-qoD2-<M+_ve$c3^CLaWvK&g>Dvx!%PGw!z!~%oguC6<XtL;@LUG^R)@J?%}K)REq
tCcj1GZ-(?nC6Cp>mA`=o2du&f7y%<-1dM<YFak!v2p9n)U<Aq&cm*o^S~&m!

literal 0
HcmV?d00001

diff --git a/tests/Layout/tests/accellog.js b/tests/Layout/tests/accellog.js
new file mode 100644
index 000000000..4ae865f4f
--- /dev/null
+++ b/tests/Layout/tests/accellog.js
@@ -0,0 +1,13 @@
+// Based on accellog usage
+var layout = new Layout({ type: "v", c: [
+    {type:"txt", font:"6x8", label:"Samples", pad:2},
+    {type:"txt", id:"samples", font:"6x8:2", label:"  -  ", pad:5},
+    {type:"txt", font:"6x8", label:"Time", pad:2},
+    {type:"txt", id:"time", font:"6x8:2", label:"  -  ", pad:5},
+    {type:"txt", font:"6x8:2", label:"RECORDING", bgCol:"#f00", pad:5, fillx:1},
+  ]
+},[ // Buttons...
+  {label:"STOP", cb:()=>{}}
+]);
+layout.samples.label = "123";
+layout.time.label = "123s";
diff --git a/tests/Layout/tests/padding_issue819.bmp b/tests/Layout/tests/padding_issue819.bmp
index 82bcb9acb8b1394e44245bfa2f76efbc4df18308..22d59c5ecb71deed883fd6a99d8857d858d6599a 100644
GIT binary patch
literal 15562
zcmeH_F;2rk5Jd-x63JKL02C3TLgEe-IZTd_BT!Q22#6DKjFc`Sh5u)E9j9<21axnb
zY{u*FzklEQ@#XU&vYs{G>G!VBP275J^|ab-HoM*Ke!Y$R*H}lq#kh@+2wiVujQEQ6
z7>98@sHY$R0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009V`6Bv#W!%-C;
z_7VQ6G+nI)G2~>nU0~62+49V{%+oj96x1@+cEPfz@BEjqHrY3y0JPz@Tkl=%Twv`a
zxSUsynVmh$Px1+Mwk1eWwVu6NGhZEC${n&p%)It&i);M`{EGA3cSsU`Dg1SQFOgT7
zaXPmj<}DKTRl0gh^sjO@2XI@fT}fN=#@7$4O?U5qiswn+s@1Ia#N~2~lds!+?6{Y2
zzetBP)m*ACdo~YiGiWW5zRLPb-$t@B7e41a`C3p3wD?JobIU`AD6igj$iB8u8(Qmw
zOhC(?c}M4~>R!F|;gzqudE2!4ECU1}009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
N5P$##An>;Yz5xuHS?>S<

literal 15562
zcmeI3F;2rk5Jd+GDNQ6_B?q905ET-4pvVEz(QtqqAxEI3Oqmj)9DrlEOo3$P|B0=M
zlE|^0fQ0^%IOEOw@66lpwLs$j>GRIm9{o7>_q+ex*e&{|57WhBv0AN`v&r+sY-aXm
zw%nS1Oz^S%GTY8<`|Ypo=1OgiOfKKX>&t6GQM$oZ9K<0Ah=Vv}0`fzqp?y+*kRLJu
z`61KL{vbcd51D}ckZEXtkRRlSOhA6fG_*e)^TX)nQtfq}X^-;Bpjf(rPaMP{-$?R<
z{P2f<==<Q9*Eyf?Z{G*U|I;lhv!e25IFx31d-LuHF~ACTGGuQn2T1PehB$Q@azIQI
zA$$K!*Nd!+Cjc*aS1oGyFb}}k=xxo{F9SPhh91#+t$~@k7{Ea_=gPY1`og&=^-t)Q
zn4gq8=@!fpnc{`~!GUL7xMtlt<{KoS>s5zK{L>q%05F6xTc>;jGu6ShNzd`}tC-Et
zy5`H(VQN+Bx}gVAZxr<-de7A@O0Ru)v42F#19f*Kkwt`|2a=I5deLGD$+v9xSq;%O
z>X5l}d19ToSWSq9JVTeO#9V1y<i#`_T@JvMq{GC0z#IYEZ}00pe}8GqH;Nf>Ji%dr
zVq7X+amXf;ALIx5Arm<2hn|m#!^`&Xx5Ih+_UP}EK~5aRA>TvtgZv;rWCHR-rlI{o
qevltB0r?@*(EcDl$Pbx-{E%sAe~=&KhfF|z$TY6DKV0eGgf~Cu;R{Is