From 73a54103e13a0111f082049e515b6a28880d3a38 Mon Sep 17 00:00:00 2001 From: James Hartley Date: Thu, 28 Apr 2016 21:35:12 +0100 Subject: [PATCH] Update Gmail workload to attached images to sample email Adds 5 image files to the email before sending. --- wlauto/workloads/gmail/__init__.py | 14 ++++++ .../gmail/com.arm.wlauto.uiauto.gmail.jar | Bin 8625 -> 9184 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 41 +++++++++++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/wlauto/workloads/gmail/__init__.py b/wlauto/workloads/gmail/__init__.py index dd8b93c6..748619b9 100755 --- a/wlauto/workloads/gmail/__init__.py +++ b/wlauto/workloads/gmail/__init__.py @@ -42,6 +42,20 @@ class Gmail(AndroidUiAutoBenchmark): super(Gmail, self).__init__(device, **kwargs) self.uiauto_params['recipient'] = self.recipient + def setup(self, context): + super(Gmail, self).setup(context) + + self.camera_dir = self.device.path.join(self.device.external_storage_directory, + 'DCIM/Camera/') + + for file in os.listdir(self.dependencies_directory): + if file.endswith(".jpg"): + self.device.push_file(os.path.join(self.dependencies_directory, file), + os.path.join(self.camera_dir, file), timeout=300) + + # Force a re-index of the mediaserver cache to pick up new files + self.device.execute('am broadcast -a android.intent.action.MEDIA_MOUNTED -d file:///sdcard') + def validate(self): super(Gmail, self).validate() self.output_file = os.path.join(self.device.working_directory, self.instrumentation_log) diff --git a/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar b/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar index 9e50ab70502b038bae6893933f5f92bc05ea126b..783a520536e81baba0c3ee4a12cd986452168590 100644 GIT binary patch delta 8917 zcmV;`A}ZanL*PdYP)h>@3IG5I002;|kqjvUPppwQiVje$oJjMS<4-gq008_)k zl-0HG+TZuhGs$E!fjoxSkOT;ikjOKb0C__o1SAPa@Q6e55k@96!^{MNZ56E+?88!@ zsMKOBR_w8Ij<&Z|YrWR?SnKszTW>wp-lM0Ub8L^T+M`~3TI>0*z4uHeA+&mbw}Jnx z{jIh3W39dR+IxQ!7_>*dbxW7i>5EQ(|908)S0yjLY3mm|f?r?V@w*3>R0K=z|KmEM z1QCsHTNWVwQxD!wq4;ZommEYLpf5OyW`c&iM0bMv^N8G_WqzVpSAZ5lZvjy!&;@)3 zxDmJoI02jlz6Lx3JPv#xcpCT#@N?i5;5FbsfOmlR0kM$C1xx{E1NA@y&a0Xu;a z;5cvxa2j|P_yzDX@G9^+@CNXoz`MX70I`V30eFA{AOMsCGk_|f3FreZ2fhlt0_4}g zJ|F?y0sIumUrf{jq=A#b)4-d6zm{kzuoZ{_hkzS^`+)BNKLLIXxax??frUUja3K%@ zJ_cM5oB{q3_$BZjFy%a=`M_#_;6fk@d=j_?xDS}Q1U>?KfI;8@Z~}M$@GT{p1vCK> z;A-F`a5wNM@IBxu;CbLB;9r5?0`CHU1RTqVrUF4=5wIS(1UL$O9=HLx4Y(J02zV6u zG4N}^Tn^s?D}YtNYM=$^05$-dfnHz-unX7?>;d)xDc~URG2k$8HSjQh@HVgzan}U& z0lR_AfE$4OfhU1ifZqV`0Ph2yl|&^#1+WBY0M-LNz&>CUxB|Ep_$u%%;Jd&NfH#0p zJyAEX9k78oa2WU;a1yu=cpUf<@V|k727U#+4!i~Y7htVI+yJG(3}6nh1n2<5Kom#< zmjg$EW599XOTgEF2Z5)5fnNge0M7G?ih-HHVxR$N1-gOlz-}N8d<-}WTn~H^xEFW= z_yzDL@Lz!0fb{^B0Oi0OUvRp0=N@64Lk@u0z3{p2fPUU8h8_U z2Y4TFG$Iy(Vju+60Ly?TU_EdF&<_j(!@wcn)4&bDSActfzXu+F0=^GC13VAB0{ja2 z9bm2|Dg;V_*+31j2G|T-2n+)IfF$q<;A-G{;8x%+;C|p?;0fTzz$?ISfDZu28jKy7 z0aOADfn`7|&;@J*E&)=&r-0jl`+!G*9|NxfzXN^`7)Y>Qzz>uI)j$KV4!8ig7#Ic) z1J?q_fV+UN0%gd5y%oS5085{+#0krku-phsgAnetlJhx$Fd3EpJ*ParTJWT z=rYnXVJo9Lt>f1GMY>!+UzPK7$^|)PpDrVPQz82glUZ~5} zT7QAopQp!vlobNipx<&!9XMwhv-&+76$D1T0u&*bpG zl~aB!r~G72`PrQE3pwSNbISEO?Z1Zdb-Mf}%AeQe_j1Y{8^?30^y`N^E}B{}7$1!LvR z+?}5j8x1+-MqM_sijtsStePGys61o}UO)M$X-b+eW0vWBO{1Fb*Yqml_0b^p3-Bkd z>0wQ;BwjO(Qtrc_N=>7h#)#L8K~HG<51K9#O#Rdd>gNcP)S%U%MHtN}F*V4L&ldTF zdRFp(T3RDGA1*ZlXSJFtLSM-o%HXLHc*jJG$3gURZDt4)oFU3rb{$kDpY%$HSGm;VfAr; zZe%<~U38zOk7+tnC|a-SDoIPJ8Puced5~3q76_ha_005sNs0bR)1PblqNXoNYSOEc zTJ&p49rPcXzOLzSB(2o#w@5#Esft$U{#FVlZ_%_>(>6^zB(0+@lFp?IB%P<}V%jQc zt)^?JPsV8l=9uFzLu;j7oU=WGshc)R+Dcu5<51}pXuSe>WTWJ_Nx4tUeOm6rj`%}= zNxf3fN9|It5OEif@mWDXkW|nwH2puCzNY01WxOhXbNv1}$(q(jiA!sRf1MasJ{BKBFO67vjDm9W{ruk*CcRTpy zu$TEkBw0llYg$OBBvty;u|qLGg!X<(ymzX3nhnc&ekydm3jCQWcn?+f&jtOTr1s8d zCH2ui>*sF4xv*a9&7-OGZApveyj9Z_`VlcLp?@RZGn?pPNrUvfq-8W+@YbMz`dNTo z{*64NMs7&zru83YC zMSn}Y_s*o>6X!RBngpNul>IBN$^O5N6LMN7xrQRFrq9XI^K2MNR4qlabd$K3B^NCXsJ}yid!0lgRf%{&6iY)Z@$T z|1jiV(Q?0*dvoN+Ab(2Bi?rOY<(~weg#3?M&a!`NQ}m5Cb!L1I^n*5%`xKYG@I^_x z9!L8ae=*AE=R9|!+}A$V#-Oef*Yt8tKd&^^Gb@>&BE!2 zJ2T8soQJ17DM=a#RF6uQ4%>oJ(SHI6OIE&*zR4uf$AL^P^&X^DnIO>E<9-pb> zy`d=+HLQ}_!4u^53H@9t{j4Yzdn$&%Lzr4}pIdzV42R(n1Ip#R!TNMt(tb00o zJd9fTohSf zeKB2V#Ojt~)%ftNV)OAPb-#UX3$GboftK)M->t-|bzv2%l_0Pdua+xdHm_WNKHCUS z&Oi^KS^jl@(Bu_ef)zcFRBWp;JUea-E9DqmdJHc#W!~4Q9D$N>qPJ-J`rtKH|BWW~ZsNHnWy4f51?O2)?qv>ouSvb1*)QMf`b~BKf zV*W9jO!TVE*ayx#<(qGT;~{ncPn#!*!ipf1iS^j3j7RsN}V(E zAe$no7x{y!OTK5wgQu5E3QI&~v#4wpmF=Q(ov7?|k=kef)TG`$1v&!D166_IfKefL zz^f=x*Fb(FB5z2{nW;Et1g$F0e8sUM@RQ=~R~$!#=U;N7isOu61_N6vac*LtZNkRO zUII0L*)O0LdjizKwu7REDfehKPiC`v=ai^Bgi)z|S?-<9$_LZ=-WunR5!G zNbBrIOELc)avo>N6P&uAa{DFCYQM?&pa5e(jNY205BOHZoGTRvKFHUcxZ=PEUJBGz z;yk!p}k&0 zQviETYI_=`jwM?n>S$JZwFKB%IR$I|6OiNqPZo zUXAsd@2YSF!B62vRKe#VkJ?*sM)C50-f~**Enkqk2Xd~n-Z>ZbM{q(3dj5d%9K&qn zdzf<*RsXiYbopJqy+6e0yfY}6_bG}seUVN#)LWd-4q#;UeA@93%Uv(#zmhnkU4c)p zr`}V8-f?&Is=dIA`XRX&JcO}mt-M(1Gy3^DXz&<6hB40b6nMDj$@-b+sdp%Uu7m2u z63G?B+ST7Jz~1t4#76bonUdr`kmaAAr1X=VlBfC~&~tC~69s1VHL$+7`YPGN^&HPQ zWy%=z;ig-~bAf*OU7!c|(smgS1@fJ~iRk5b`EwyZB%i0!<&u`u)si~odt4JWy;oGM zOpA)o3sG?+a651kI0f7*=zej3Ma6@HKffvdPI&ctJJq7Tj|i*?%n3{hn3o_7i;WUm zHhUTcnk$ReVAuT~Z8C%zG~QrpZE_1o(D)gbo%{V?;F(99Z6=q;N0s5p^)q_auY1Un z{XW*B-hBqF3Pa7QA?I_q+-<$GyhQKoNx9EoC-?cvR(0Nh4EtPV1^P38(VuBpf#RTb zkTzL{8K?|eE>&8(Nf;*gZs<`u-0BQ#@q3{b^}fFX=Y)V+xm2xzI=KcCat)B|`AX$pb7ZtK))el;ZL4n8jCceFgWMyvY%Ca~^oug;>t1(SN!Gv?KxF++g5 zvfd4C#hBsU{pYGD^|P~oQT-ap`wx$0TI*le&+f_mjPW}3`Hsi1qE&sDRe=nY2(4!i z`}sSn-NKNk6AP!}Hk`Z{iV*SXnZM5}LMuC{hpK-c3-vL5Cl=bq^sQKEJJa7(hzfXP zn0S@XmhZYqsLbsmb=N7BXFc`q#3fH^M12@bWzJYa*|8w!gxaxxF1?~&U_Y!YpaDl_ zEWBrpN#Fe-R_BAX`Ymo(ozLTc!A8e9Y%HchX``PhY%F358v{%~qK#??Av)Ho_U|Bd ziU=gR`^Qa?O_lpcclLe8l$?En-~ZJ@%HMbFY?>zP`gN{2fw~9SMvHfaG`&p~&N7tZ z)B%fbf^NPi>A#hKv%Vwgzn*PI=DvuM{u}sq;hN<-59Q;$f4FD43sI*FahivGy^$$m zZv#`R$XAh?5A9o6+cV2EUqiZxBmd0qTzUj$HtvWB=nHTg- z)$Q-$_Op_ckW}SL92v=}yb9bKD?I83R|V;+`6`zAUZbGFwweJ%eTP z=Gf%$nyZl4Doht@%pkr8w$eN^cMbea8^5RK8=jhf%Vw;xAjWVfS{S4%GhePXnahzKYNn)GhRH9^&(|s?x{BQdls4ThoN`5jjQ+X)@++sxR1Hh{jZ%VpoK(zeV`=Dj_?KSxrR-}f_} zujv9!mukvqF#i3#<(jV0bfu=%MKtbbnSRdXe2$kk@VX}On>7ET3H&zAk4|WJR6l2a z7lVI?Kzo1w_nqpnr7P0*v-FFajZ!FE(yzbX?lsKVNHiL-K%Lt(@Qmf z-KQzHZD`ELA9;Tzb%(;N$Y)EIeew;s`i@+^3!kOyg;0a(9GWBfbu{*SDXQJo*}EiT zwdM=mj#EE7^|PDCzQbTzuIV&QXJ|Sz+rH4$(6n5Rf4(d!omxG{IxSm{=S8}mHF{n| z_D|+J7#!zCh*nqi9E_v~_HGI%ss`eJ!&TwraMi(RcqARK8i`2KH@d}6?&*s(<6$_Q zj>KbCZIPrsz$J23ZENo8YwsaZO=k7{ZDatRnwn@hZN~-MMV2YDToTbp?#6*=Bo;}pA!nna#+nAQ)-<4-yykQ|Jg_%^v?mg^ zGY=gor)X+RIA!OKc=4s-17Q-a>%T?pC3;YgIqTH_;$~SzYZNy<~JjsSA=WX5#@LU666n!JnNJ>pqZ2Cbn?V%`RqyLo9yA; zTET|Oj7d~_B15q-d$IwmpGJJ=KYM}D7c-c0_ zsUJ$E?Fk0UhzRe0j*hiFl14x`CzIhrsqD;3UT2!O2DUCf3AZta#~W{ZES)^mc=ljF z>MC7>Kba|)jdw+2`|QE>;S}%h8Pm^}WT#$>Qt8apXBiDtHGwn9c-Lh8HQuxa+VNMj zc-+u?Yz%Z(4g;I?z(_J_$I`W2p$|t0-oehP5FbhBgmtce!=mw_A&juL%RXR7v#~f{ z1j=z_b@yRAF6oYk1~UmhluFnGkv$Q6kj%|}z2w-^+1R*7uUDr)}e| z&TcNWw{Grk>mg@PJ9h4NvU=>;AlM^viIA^nB)KO%V0YkrgkH()ZC*$I-taypSW zJhV<8Xo9_edn2h3{)R)mA%+IzaVH{=CnXbP!&p!_bkJP(#9#=%2ptSV6{nUxIL5%d zfp8kCqiJ;{a>zL#qc@Hs(q@!=eVuLX+d5m@clB)V+|tg^n_D)txAy91qi+ipoqaGX z&71{zF!F@O2ZHlM5X5-Bu{lXQWv4TzCn_5gq}k+ua8^=!cC6^r9}cJ6a8%lc(~+?a zho@~gJZ5HX@PQN5Hajk z>Ba4TgOPME;(>w_1oHISGLlXs%qCXi#V{!->R}@W4I}MkmS~_|9-jCMIt< zd(g+2a}NDl(1{gIzTM;YXL9XUIiB(ct@?ji&Gs7#XP*x+_7j*fV;+djB|9XEpbLCTjBJa6KqS16x&)oMqeemrJN zf}6)Y%;(~vczh^oFU~k(X!v}bV#9-jyOc4*$V*gvPDOPENy%B?6@_?qziQJ>267(O?HTQi?TJ%)4sSv(^{{ALI67jJC2yDB zJ=wDwxw#zUpmE|N7)k8~jVFgWK4jW|f^rhl6poQFbWcj2*{B2o-WEwEqTxfWY=phu zjtuQh)6|Ll?UBLsUh-mA0^k`aH^ZNM1;H% zPCF_cW2_p96kSuP^l9A(!+3ACS@#H>z6#uv1Mj__od{Ft9{>z6tW>P zM6P&pFcQO_YjOj5_`sC!Qtv_%DtF2OITB%HHS+RMhi#aVB4|%d8 zlPV8;u-GGsi0m_IBbL#IL+Esne?q-AV!>>g*zMutMh zN@W5Q(rnT#MB}ZwiH#Zh5TzI{Fl0ksF2ohnk&4=O0z}2PBr*koV<%FSpUQ2*kvbT` z8O|d~Tl`>57rX2|+$t?hKD<2q}jq?d5f zh+e-vS#!p-q*;M+EM?w!HGbDZh2vPT96D-st78i5WLaa?@<&F05uJN>$#(|iIG~ol zB%Ak;Qx;NW$^FiCP;JCipbPD43nZ?oIBL>S!*xV|Of90c@g-v-@2D`oeHOD?+-10Y5n3d!0^MkeV}@g&Y20Wm5F!8c znI`=}%%Qu5@pI!v$WPIixyuLX0U^GQ=h2N1ZcH`PBl_vVjgh`)`o4aOYxBsiB*vdDK|d8%!9(Ia+vS^ST0arfW|{OgQFg?1A2+HSH<~WEqTgYe z4v041?I2S?3O_j64~<`QIECR5PMYa(I9v|5Y5qu5I;~r3R@ba?n8yAY4suvd;dD5i zPM6c&705<3Tyw3k?{j#7~85LqtpsSj3KN#NdSANwn2GC7v-L zoFQfun&NW^*0MsaL&JhBm-6!wlm1q)Zw>f%E&4HnGfe@<(GGD+xOPNDd2Z8F(DX)w zo6c>2*q>?m7GZo(#xla|PQ%}51RiKK;xjhk$4GvPo)XqGQsE0@Do55fmLH)r!hGh> zRxRgnDaA+ADY{V@-!+~StZMy}nAUGPKVy_1wH&_}wUlRyLxpa|Ez92^c?NZZQx<_(LW013v*k4 zxZlv+O*y*8V}|PklTH{58XH+=l!&K{>7vY)DO4B%6w3TYv2ll}a{I3|W~yR&)0IZ) zEMqFGS*2S_{iWxZ7OO{5>d4WVovYIToiR}&SJbFQmVo3F#uOE6XS@U0>?VXk8*%t4oW2u`Wu42wi#DI$k+jJW(mcYrxSeA?^X5tun=X zps&pl;)S_FJUI_#;N@!Q%opMe@Yx060Z%Lx;^ZR8YJ~VB@akeA4%Z6tSgrgL^LS|0 z(ZkluwNC!6x!XeG*27{V&WFNd=ZUKhTdyrKJcpMG&s|F`sC&k%uZ7x^OIhuITg!y! zS>WwutX42ytrcp=m$TZ@6^7^J3gLNT1zEyTgbac|$3p92^lK|R#f>X5NZj8`HZ{TFBT`)!7ZIayuLwyh(|U$#b>*OxN#HO0)E<^`FCR?hi3jy9RB_^^Z(-T zcc_{F8^@xt{~w3HN4=BO|B>UQvHvH>^s9gW!r!@zkZR{R%Fd9|;eUfC{OWss{`cQT zNcGGAua2qp`QMCLA@#j5{~I>ab>+X^^Q*D)|KaoBP)h*<6axwX00;mB08p%x^B_3_ jPpp$JAwUjLtei;mnBz}0A^-sVN0WRZF9sAN00000+c|*A delta 8353 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 diff --git a/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index afeafcec..e3455c33 100644 --- a/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -14,8 +14,9 @@ import com.arm.wlauto.uiauto.UxPerfUiAutomation; import java.io.BufferedWriter; import java.io.FileWriter; -import java.util.LinkedHashMap; +import java.util.concurrent.TimeUnit; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -24,6 +25,7 @@ public class UiAutomation extends UxPerfUiAutomation { public static String TAG = "uxperf_gmail"; private Bundle parameters; + private long networkTimeout = TimeUnit.SECONDS.toMillis(20); private LinkedHashMap timingResults = new LinkedHashMap(); public void runUiAutomation() throws Exception { @@ -38,6 +40,7 @@ public class UiAutomation extends UxPerfUiAutomation { setToField(); setSubjectField(); setComposeField(); + attachFiles(); clickSendButton(); result.end(); @@ -53,6 +56,12 @@ public class UiAutomation extends UxPerfUiAutomation { gotItBox.clickAndWaitForNewWindow(); UiObject takeMeToBox = getUiObjectByText("Take me to Gmail", "android.widget.TextView"); takeMeToBox.clickAndWaitForNewWindow(); + UiObject converationView = new UiObject(new UiSelector() + .resourceId("com.google.android.gm:id/conversation_list_view") + .className("android.widget.ListView")); + if (!converationView.waitForExists(networkTimeout)) { + throw new UiObjectNotFoundException("Could not find \"converationView\"."); + }; } public void clickNewMail() throws Exception { @@ -104,6 +113,36 @@ public class UiAutomation extends UxPerfUiAutomation { timingResults.put("Send", result); } + public void attachFiles() throws Exception { + Timer result = new Timer(); + UiObject attachIcon = getUiObjectByResourceId("com.google.android.gm:id/add_attachment", + "android.widget.TextView"); + + String [] imageFiles = {"1.jpg", "2.jpg", "3.jpg", "4.jpg", "5.jpg"}; + + result.start(); + + for ( int i=0; i < imageFiles.length; i++) { + attachIcon.clickAndWaitForNewWindow(timeout); + UiObject attachFile = getUiObjectByText("Attach file", "android.widget.TextView"); + attachFile.clickAndWaitForNewWindow(timeout); + UiObject imagesEntry = getUiObjectByText("Images", "android.widget.TextView"); + imagesEntry.clickAndWaitForNewWindow(timeout); + UiObject listView = new UiObject(new UiSelector().textContains("List view") + .className("android.webkit.WebView")); + if (listView.exists()) { + listView.clickAndWaitForNewWindow(timeout); + } + UiObject cameraEntry = getUiObjectByText("Camera", "android.widget.TextView"); + cameraEntry.clickAndWaitForNewWindow(timeout); + UiObject oneJpg = getUiObjectByText(imageFiles[i], "android.widget.TextView"); + oneJpg.clickAndWaitForNewWindow(timeout); + } + result.end(); + timingResults.put("AttachFiles", result); + } + + private void writeResultsToFile(LinkedHashMap timingResults, String file) throws Exception { // Write out the key/value pairs to the instrumentation log file FileWriter fstream = new FileWriter(file);