From 18d1d0d9f7ebdb7f66d4ce4c2e497e66858acfd1 Mon Sep 17 00:00:00 2001 From: Rechee Date: Thu, 9 Jan 2020 19:49:14 -0800 Subject: [PATCH] fixed screenshot tests --- .../NotesCard/render-empty-description.png | Bin 0 -> 1154 bytes .../habits/show/NotesCard/render.png | Bin 0 -> 5842 bytes .../org/isoron/uhabits/HabitFixtures.java | 1 + .../habits/show/views/NotesCardTest.java | 79 ++++++++++++++++++ .../habits/show/views/NotesCardTest.kt | 49 ----------- .../habits/show/views/SubtitleCardTest.java | 2 +- .../activities/habits/show/views/NotesCard.kt | 2 +- 7 files changed, 82 insertions(+), 51 deletions(-) create mode 100644 android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render-empty-description.png create mode 100644 android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render.png create mode 100644 android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardTest.java delete mode 100644 android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardTest.kt diff --git a/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render-empty-description.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render-empty-description.png new file mode 100644 index 0000000000000000000000000000000000000000..f9b378f6c890b746c0c964ef63bb2cf742cbce52 GIT binary patch literal 1154 zcmeAS@N?(olHy`uVBq!ia0y~yU{(OKPjIjSNrC=WDImpC?Bp530R%N1DIGwrrKgKy zNX4AD*9{pDC4sUfuG~GH8XF@GcY(j*e?szx94yJkd$O*Vqi$&;b35x pV5k6;J2omf8X%*IVI*b*zI6v#Ygg-(T>=&h44$rjF6*2UngAYYv?Blj literal 0 HcmV?d00001 diff --git a/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render.png new file mode 100644 index 0000000000000000000000000000000000000000..dafb53f4f48c0a3a3b3055ffaf1ab7b0f2c82b03 GIT binary patch literal 5842 zcmeHLS5#A5yNzHwR7C*=0nZUcK$H^$pKR6Qi|9Kw*k$M0(H+723WzkUK zPUKykOFsGc6whC6+pD{$=$@sL%i|Y=LXyu#^fTOs9fd9`k9xdc)7FoED5j(&Gj}s> z=*;rXy!t}Kfrn{O*4=>a6Z7rI6&)`riQ5PS-nb-Sok`=MdnUfVrWqLo9NOS*VZUvj zoz2I8Ya$Y6#}5sRkB^@OQ-Ww6ADEQnpDga&fe3)H?TEmB{NQ0m974BM_i_< zP}f_2z-N2AX9J%IF_Yf4J2hu!#-BVq%!x<&Y{@Xf&vK^H6|6Gt3XExNo@m4JUdJm} zo-MDeD8a9k*^ysr`)+v^$K1hQH6x!-@y8qbP)Iu>kQI>$H*cRH>RGG zC?}u+zY-1O^+UAK5P`Pd#i@3^XoeHI`}UnN;+Z#Z-n3Lts{wEd7VzxWUFz)x^j$nU zyT6jyy-y3Ny&HWJ!TtF#X!t*=#v5}d;Erx? zFH7wUs)vW2l$4dZ70IRD&)zmP=*yjpG-ngI`41mH{1Z2(1V5x~H_YQs)}+fPT)KY! zI*jV-;*u2<6f~}(HJP|#%c5efGdbTMX{th@R7B3}*D{371w0fv_ZJ|@;lqdDE=_kb zw>R0YK|vK4%*I3=1%@RiwqS99~bV;ip3UV~jP)Rf?lq|_bb;u@1z zF+TI0d6JNb$S^yZYiMC^9>?p68BhNFP*O-tY-B8qSOq@kU2UyHQBjeVmDSLvG~pM| zpZ{=)3F~u>-OihJx zA*-gL!9}xW@wSz{ZDoa=`m_hfRaI53q*PT^g?5AFT76cqWiBczI)V~QZ&%#}-0bS= zVjv^N#~S7kgys(*>saGWBo@IsTSLXbz}51}u|ZLT@d5f;>6517Jj2+am6_hW2~9OM zQchTFc}t5?m3v(WA|tJR>av5wQ^onVTY`L^tzuF-4UbP4*U8~_rWJPHfu-pWWdY5q zynS0h^6=rC0O*b7Y+{Hyvv-}rNV%B#M8TxGva-@H*4wM-&&k##kETe!vc-|wZDsrX z;pS*2a_PGTF1q=D;Dn*pPN}L|O|JLFBF7Lo6_B4678ca{z-J5wgOfA4buntT&p9L{ z1iglfn7;TTD@#>T(Y)ViC1atPsgahRj%jJ}@@xnh+^3LOI6m%0i|kf6o-Z~&Ku3%< z^a?3hXPq7#Z;FyUbf~zw8OoyJUB_@?l=YQatY5bjY-ekQwxDTf=n0UmsIGRoc=6ub zH6J3oWyKC289X*LEt@8g^4tQ&u)M!|0SPUyNrb|KG`!q~l$|K|w?LFq9%(SXyKF`{zfJ($ZyZ zZRbCCbOg;0mAuvq&QhEQY=+5%9gvn*&gm_E`SJ*p@brXbmw(+?|GFmc@zynJFj$YQ zUjHkgE|uEml)itjWnpO$m)}WUZeA-lK@!SK8BKW19zce){yO3@o7@Xik;zR%WJz z94ukjmvG{bKR6rAn&59A{9eOQ4f2VLrfGNYBFFqSraRFTOigQrX5y6a!v_xr-#HZP z2J{{C^Y`~){v54sPhdS-;lo|P`xy`k&6Cmb&lsup#(?tVeemGHhZz}8k&z#O00EMo zNN+D%Wl~VIY)zseL_~h~0f^v2ZKpixvBAXXJP#T0x`$D5j(dSHWIoYB$2f=Y&FHYP`e1_nAH5D0~!1%8RqOKHDi52G*Degy(Q zVzE%`+gZuA#Syx{K2xsJcYA;BRwvXR$S95$lheuKMf9+VJFTi}YD(D2sbwVPMn}fc z=K0c`%2n8Umuu^ryLWe^yAy5z{N>RG+S-E^?7?EoXnNNRjf%$C)YCLND*Mfxx79Nd_Ph*fphcm zv2%{AtE<%3Bzy;2q2}+u&2iC*>o*5(ozgsgx^hgI^8_)|tt`#su~TqYQTS`<`}YUl z!k;;Lc~$BJ^trKfLQ&aIq|3Mys2a*@3lGXh`^MPzNlQq)@eCu7gY$giruHN)e^r(_ z7x}i6p06>1I&u7X8}q}rx&TaJ;d!xiv)TRv?zdvBu&^+&2mtRaRX zbmEtP*fD=C;|1IPF@@~XI>q5cy!-g^BEGP z5IgfwaanyE2M33wiHRTDDO*dOnQy@hV!rux>8*WI2+_}3ZJyTVW(OZYUAS-|+de|p zII$6^k+ZvdAU4T|LwD$cY(0VqT>H{An~$mwB%LJi*2bvB6e7?NCl{AeAP=g#x=!Lo zi>XrT9&Z~P8%;g0Mn_`-p`sVY&%s&JogjrqEUx?d`j(X)T>qq8koZSA4{j#M7Kw`j zh6_goWKzVS{wmYB313+HbPck{>^FG!GhWm6n#Kdg|0=3yZY11sdkgK5wynjFNx<}*0iFU+!*7>MjmB{sFKfdFHB~&~$ zD5XwB2Ye)3RFyr`Y32vD?*J;3MVkNV`bw~*w6r6Eg%GjwX`In5fA?-~c{C>{rwX5# ze^POGI8P>V@;+oB%`9DP9#|)AWKTw zwan%fSO?1dgmLRIatx1bdA1DdZ!u+T6GRpy1Fu&3e*P;UU`aG{#2xLY{~z1K{O!=m zUm?Wmk3VDZgzmL%5X{fEat>+<*)}-k;zXn|vExI8pBH|Ptz7xt3 zGmn>}oJ-kGEThNZy@9z~xRP||_U%fFTtIIO+|I6{Ln&me!4_B?d2ZCgc$1yK&$#mP^1&x^hR?IJXR&rXx;kWdWCRG5 zy(4P#$r0^Oi1?KL?BE-1xw*&CvzU?+3nGsd1}c;G`qr$;B<2i61OaNMSy%44sKXKx zf0U8RK@QIS{8l$|hH|AOhDB8>Ps&f*j!8Ote;FFni6uq+TD%VYz(<+;npl$}H60yNv**gFFFKl9 zZ8EC{ypX*KuU>H;VCaDh%>$;Xl8(ha^_~FEmlNo@yx0kcz`*kS zq&4?F`}Se5Sh7a|uxBG)5`2u5&zx~2mDy8(bYN3aiACK!^NcjGDN~)_c806nla|#f25z@bx8+ zj-JBPs%1kPO%I*4S)|gwDs<+)eqHhA%^z}5{XEPH-Wl>*5t!NskyoN9KddQ z{z%3XpijjF6qiBZPLLWSra{;0?BH-+-G?u1O%5BVR{y@-a$xNcldazS#EuPoytA(g zF5TVTU8Qjk7-lkzJ3jr$Y>(DmKK;+t`S&_{dF292ChMb{`z0uNL&~SzF7%70^S8W%$G*6gY~bh5r)H^pmIjha12@-L(Ab6CE-(-JZ@>MP04lp4YAvLo!6J5*VHF$4`KyevO52i;ELcOTc=@2My&cOrfc-amMPL#|17<}U#Su^H9+b}c-jTOD^wS=ka8 zrck>5Yh5@W74KLYIlWjwYj}^Yfq~8)@zmcjpdkgC1?KV)NG{)?(Ekp*Q)L7!%)^I5 zdiwf7KfXMbF$nd_u5;x+C(S$g`IRu3Oi4L8^_Uqzp3VBX|(46 z + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +package org.isoron.uhabits.activities.habits.show.views; + +import android.view.LayoutInflater; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.MediumTest; + +import org.isoron.uhabits.BaseViewTest; +import org.isoron.uhabits.R; +import org.isoron.uhabits.core.models.Habit; +import org.isoron.uhabits.core.models.Reminder; +import org.isoron.uhabits.core.models.WeekdayList; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +@MediumTest +public class NotesCardTest extends BaseViewTest +{ + public static final String PATH = "habits/show/NotesCard/"; + + private NotesCard view; + + private Habit habit; + + @Before + @Override + public void setUp() + { + super.setUp(); + + habit = fixtures.createLongHabit(); + habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY)); + + view = LayoutInflater + .from(targetContext) + .inflate(R.layout.show_habit, null) + .findViewById(R.id.notesCard); + + view.setHabit(habit); + view.refreshData(); + + measureView(view, 800, 200); + } + + @Test + public void testRender() throws Exception + { + assertRenders(view, PATH + "render.png"); + } + + @Test + public void testRenderEmptyDescription() throws Exception + { + habit.setDescription(""); + view.refreshData(); + assertRenders(view, PATH + "render-empty-description.png"); + } +} diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardTest.kt deleted file mode 100644 index 24517aa4b..000000000 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardTest.kt +++ /dev/null @@ -1,49 +0,0 @@ -package org.isoron.uhabits.activities.habits.show.views - -import android.view.LayoutInflater -import android.view.View -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.MediumTest -import org.isoron.uhabits.BaseViewTest -import org.isoron.uhabits.R -import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.Reminder -import org.isoron.uhabits.core.models.WeekdayList -import org.junit.Before -import org.junit.Ignore -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -@MediumTest -class NotesCardTest: BaseViewTest() { - - val PATH = "habits/show/NotesCard/" - - private lateinit var view: SubtitleCard - - private lateinit var habit: Habit - - @Before - override fun setUp() { - super.setUp() - habit = fixtures.createLongHabit() - habit.setReminder(Reminder(8, 30, WeekdayList.EVERY_DAY)) - view = LayoutInflater - .from(targetContext) - .inflate(R.layout.show_habit, null) - .findViewById(R.id.subtitleCard) as SubtitleCard - view.apply { - habit = habit - refreshData() - measureView(this, 800f, 200f) - } - } - - @Ignore("how do I generate these shots?") - @Test - @Throws(Exception::class) - fun testRender() { - assertRenders(view, SubtitleCardTest.PATH + "render.png") - } -} \ No newline at end of file diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java index 8c0f3763e..63aa74407 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java @@ -49,7 +49,7 @@ public class SubtitleCardTest extends BaseViewTest habit = fixtures.createLongHabit(); habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY)); - view = (SubtitleCard) LayoutInflater + view = LayoutInflater .from(targetContext) .inflate(R.layout.show_habit, null) .findViewById(R.id.subtitleCard); diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCard.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCard.kt index 2743f43de..5e9d6864b 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCard.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCard.kt @@ -7,7 +7,7 @@ import android.widget.TextView import org.isoron.uhabits.R import org.isoron.uhabits.core.tasks.Task -internal class NotesCard(context: Context?, attrs: AttributeSet?) : HabitCard(context, attrs) { +class NotesCard(context: Context?, attrs: AttributeSet?) : HabitCard(context, attrs) { private val notesTextView: TextView