From 574549e23b70c98820509b969e77bdbafe6813f0 Mon Sep 17 00:00:00 2001 From: jiaxilyu <49665969+jiaxilyu@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:52:56 -0600 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e52c153e..8a5d8d02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ + language: android jdk: oraclejdk8 From 4d9fbe9657b01aba78a8771e144721c33eb94b54 Mon Sep 17 00:00:00 2001 From: jiaxilyu <49665969+jiaxilyu@users.noreply.github.com> Date: Thu, 12 Mar 2020 14:51:17 -0600 Subject: [PATCH 2/4] update --- .gradle/5.4.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/5.4.1/fileHashes/fileHashes.bin | Bin 0 -> 18547 bytes .gradle/5.4.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/5.4.1/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 22439 bytes .gradle/vcs-1/gc.properties | 0 .idea/.gitignore | 2 + .idea/caches/build_file_checksums.ser | Bin 0 -> 535 bytes .idea/codeStyles/Project.xml | 116 ++++++++++++++ .idea/gradle.xml | 19 +++ ...droidx_annotation_annotation_1_0_0_jar.xml | 13 ++ ...androidx_appcompat_appcompat_1_0_2_aar.xml | 15 ++ ...droidx_arch_core_core_common_2_0_0_jar.xml | 11 ++ ...roidx_arch_core_core_runtime_2_0_0_aar.xml | 12 ++ ...inflater_asynclayoutinflater_1_0_0_aar.xml | 12 ++ ...droidx_collection_collection_1_0_0_jar.xml | 11 ++ ...raintlayout_constraintlayout_1_1_3_aar.xml | 10 ++ ...yout_constraintlayout_solver_1_1_3_jar.xml | 9 ++ ...atorlayout_coordinatorlayout_1_0_0_aar.xml | 15 ++ .../Gradle__androidx_core_core_1_0_1_aar.xml | 15 ++ ..._cursoradapter_cursoradapter_1_0_0_aar.xml | 12 ++ ...droidx_customview_customview_1_0_0_aar.xml | 12 ++ ...dx_documentfile_documentfile_1_0_0_aar.xml | 12 ++ ...dx_drawerlayout_drawerlayout_1_0_0_aar.xml | 15 ++ ...__androidx_fragment_fragment_1_0_0_aar.xml | 15 ++ ...dx_interpolator_interpolator_1_0_0_aar.xml | 12 ++ ...egacy_legacy_support_core_ui_1_0_0_aar.xml | 12 ++ ...cy_legacy_support_core_utils_1_0_0_aar.xml | 12 ++ ...x_lifecycle_lifecycle_common_2_0_0_jar.xml | 11 ++ ...lifecycle_lifecycle_livedata_2_0_0_aar.xml | 12 ++ ...ycle_lifecycle_livedata_core_2_0_0_aar.xml | 12 ++ ..._lifecycle_lifecycle_runtime_2_0_0_aar.xml | 12 ++ ...ifecycle_lifecycle_viewmodel_2_0_0_aar.xml | 12 ++ ...adle__androidx_loader_loader_1_0_0_aar.xml | 12 ++ ...anager_localbroadcastmanager_1_0_0_aar.xml | 12 ++ ...Gradle__androidx_print_print_1_0_0_aar.xml | 15 ++ ...panelayout_slidingpanelayout_1_0_0_aar.xml | 12 ++ ...eshlayout_swiperefreshlayout_1_0_0_aar.xml | 15 ++ ..._test_espresso_espresso_core_3_1_1_aar.xml | 14 ++ ...sso_espresso_idling_resource_3_1_1_aar.xml | 14 ++ ...radle__androidx_test_monitor_1_1_1_aar.xml | 14 ++ ...Gradle__androidx_test_runner_1_1_1_aar.xml | 14 ++ ...ectordrawable_vectordrawable_1_0_1_aar.xml | 12 ++ ...able_vectordrawable_animated_1_0_0_aar.xml | 12 ++ ...rcelable_versionedparcelable_1_0_0_aar.xml | 12 ++ ...androidx_viewpager_viewpager_1_0_0_aar.xml | 12 ++ ..._google_code_findbugs_jsr305_2_0_1_jar.xml | 9 ++ ...dle__com_squareup_javawriter_2_1_1_jar.xml | 13 ++ ...radle__javax_inject_javax_inject_1_jar.xml | 13 ++ .../Gradle__junit_junit_4_12_jar.xml | 13 ++ .../Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml | 13 ++ ..._apiguardian_apiguardian_api_1_0_0_jar.xml | 13 ++ ...le__org_hamcrest_hamcrest_core_1_3_jar.xml | 13 ++ ..._hamcrest_hamcrest_integration_1_3_jar.xml | 13 ++ ..._org_hamcrest_hamcrest_library_1_3_jar.xml | 13 ++ ...it_jupiter_junit_jupiter_api_5_3_1_jar.xml | 13 ++ ...tform_junit_platform_commons_1_3_1_jar.xml | 13 ++ ...e__org_opentest4j_opentest4j_1_1_1_jar.xml | 13 ++ .idea/misc.xml | 25 ++++ .idea/modules.xml | 9 ++ .idea/runConfigurations.xml | 12 ++ .idea/vcs.xml | 6 + ListyCity.iml | 19 +++ app/app.iml | 141 ++++++++++++++++++ .../simpleparadox/listycity/Citytest.java | 16 ++ local.properties | 8 + 68 files changed, 981 insertions(+) create mode 100644 .gradle/5.4.1/fileChanges/last-build.bin create mode 100644 .gradle/5.4.1/fileHashes/fileHashes.bin create mode 100644 .gradle/5.4.1/fileHashes/fileHashes.lock create mode 100644 .gradle/5.4.1/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 .idea/.gitignore create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml create mode 100644 .idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml create mode 100644 .idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml create mode 100644 .idea/libraries/Gradle__junit_junit_4_12_jar.xml create mode 100644 .idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml create mode 100644 .idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml create mode 100644 .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml create mode 100644 .idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 ListyCity.iml create mode 100644 app/app.iml create mode 100644 app/src/test/java/com/example/simpleparadox/listycity/Citytest.java create mode 100644 local.properties diff --git a/.gradle/5.4.1/fileChanges/last-build.bin b/.gradle/5.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..ba8eb82a2c01ef098a2503c272a3720e29e5e568 GIT binary patch literal 18547 zcmeI(!K#5l6ae61b4zq}OR&N0J5@?ot;0K(hUG-~quEoy+%h_Q&Pb$rf3fCA~cQ8~bd;kCd literal 0 HcmV?d00001 diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..0934d342c4bedd9957806781425412b3abefa491 GIT binary patch literal 17 TcmZP$@{ELM4|7Nl9sx#E?r;NXMM#_xxt9^XFOCS!bQ~vzF}j>G8bp`+a}E=Y3t=I2;rG zUh;$U_m8js{>VPD1Xuzr0hRzufF-~ZUbWMpn<7NL;Jh*D@d@cm)A=b0;PNc$8S?|pm#x0?TLVpD(32;UHJ*?sCx&Kk1vJ6+(4 zCh9ZK$+OdjYk>1>&^I}+bqIPpOcz|Rhx+cMiBDg7%m$agqrUgZwjBRna-O_G>Uke0 zMWk&bIg4A-e`$K*T%6)5fIiae)L)*}sBR9t1TG$dzB$Ny-Zn*EC%D7~ealVT(iQh@ z?}PIV&=dQrP4O#l*hf5vy8fzjM@sWgfb#~SZ(aNFY-y2zEEmZ>>fK%Q&v*CP4fS5L z(38&wwA75daS>dUM7?1_WX9^gH^F7W=-VU9(#Iw%t-(F~(0BS|^d0Irm*gzgqn`WX zeda!n6*;a2`Yvr1VR@V~k@TVWcXwKJ?ETh)7vP>HSik%2R}G^QU)h6m>2>W}5-{Dh zqkS;AU@X?B*wwhZtgXKX?v;kVKkBYS&WBVR(q9KXO=s%XVO2V0J&OaWk9-*|II8kJ z)Qftk-`2U3+!130&Mihi#ML;qps8XxIc^*E5aYr6-QSV(5xb)w-m)s?{K10fr2k~< zrI(%R;`vv>J(AJWUpFc=o<9r)m(zTXnA*L4G1KuIaG4s`XH3>r+LYZT=P#xEIwR=& z4b#-^MNrQ#rS;3+bgpYXKOUT$iGHk)X`58{DLGHcTk7_Y9qVTac0j#{6ZM1FcgRsKX2^B;3f_w1MbM+z% z(k?safy?Or%B}o(RyerwIJkTh*5}P#ro*+w`z5kM&p+|dHao1d9_l6ZJ{I`YjX&4b z97m3e<-G;->~)pz>c|{W48d;{O&^i!S2E6koDV(EqWP(D7wS~6gNqDleMqfJmHMQA zJ*7Atp#c5-&x-}Y4U-;|uYT_u~7TAx11 zcZ^z;54Z=N=l7Bva`#o4^TEC79H`aH+t}R9BXdTgjeY7Cr%Zjj;n*nB#|FK=RdZJR z6f1pj;ZgJl)664Rgbe)^T)dfj5`Wi%>D+R1+(h&San^dlT~D%ZrG@AZXAYjc`{ug^ zP%pSaJ-i{-VWdmO&Lpe@B$CuH67zC(XiZ0lY* z(3H$KxeoP5w$=M3j^sJ0cticqx(}0DB7t-tM^nDPzT|AnsL$425 z-+9obaal~N1nQ;h(7R2GN59LfTn{cfLp@5kC)Ofw9Jqqsm!2Q4O=$G4C(lQ&4C_Bx zyz;e3DSis|f>7!=4cl#Y#e0K`mFQ~UoU3?pxyTmWb0PJkN!OC2^E<#jD$q5wwH(qO zc#i~E?x4PHVEF@MO){UQ^u12&&p!J7Bd#Vvy;ly_Yg-+fIpema3b;Isx_yONzfiYL z;F6W-I&slzACs)pzZSBN zjdmJ-I(NV;jPx(YdgEsMoX6@b27-$xP;VVkeD&+h9&n{Px{0ODk!MC$v%v)t>U$$! zeY~gi0+-T#G-%`WlHwT>+`ntEeyEK^GsWcKM5yO`qnoOYF|5^jagy|DL?3PweJ1eC zwAaKns8=Pv&*EJC1TKp~H#>MG+2(GdKj}~Bq*-08P2anJkoQkdSFAUW&#uotf`p|u35&5lm_tx#s;M@dSe=cyeZ-);LT+oDWwL0j@DX(JOkMw%2 zHC65ujEZT1dJzxnt+OgN-s(&b2bVjbj|p#@9y2%H4qP#odcI-s<_`W~a$NenwhK6Z zd`kWclA8y84%)Xw^t1R*O9$%tv#^i-(~Vk>c1y2-d&@YsOP7lyG)RcUz?&N^UWh2-7WPn_x1X*Wc_&2b?&ZXbw_`W zDtSKp(mzy_SU+Cd$yo+w;g!aU^dSaTwIOLOXibRD*NrdxbJN(!eFN?j>=0TxCX&d63zyjo^F>Jg)N8 z_gUGS-k$~cGNAr3?dq_C1hQX*#^|%%H?R8LFNDl(8FKF&qq&QpNng%^KB8Lu#+;xM z)tF3&-@%n3)R+5f=6H3I^Hf2-+lX>g155m2wZWXWq! zB-g8mN1w~h-)Yi2g#0~;^cD4Ll^GL9T9H3DdC)nwXnp>rkPQCYOA4MKAd`ww?&U{J()|wtLQpTnn8_dg};neT`md}Our>Km6ALA@dr{imH~!uvIb_`Vv19uncGTY1O;-{0D) zw-r|9H}BVmKHRtHp^kH&Tx!-XBIoZ){iNSTEkAwoeCIWy|NPT|R zON&mOcHa*!v%&hXJ}ZqiPdB!K^V_I*aIGGTmjr=xUC>usFWxaeY6^MZR{Eod+l)0Z zdiS2VLJNIOwEiB;zG`Hh3x=TMuN=-mGPB@F>?=!vCBPD339tlM0xSWR084-+z!G2y zumo5FECH4POMoT75?~3i1Xuzr0hRzufF5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10Sz@Eym8Zo1rXUqSZs81=2uPa`KZCb3mb0kXlrdnOa;5SA6<< zhx + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..440480e5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml new file mode 100644 index 00000000..37407517 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml new file mode 100644 index 00000000..278836b2 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml new file mode 100644 index 00000000..83e1a45b --- /dev/null +++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml new file mode 100644 index 00000000..be70ce30 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml new file mode 100644 index 00000000..9e966d99 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml new file mode 100644 index 00000000..2fee65b9 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml new file mode 100644 index 00000000..0df28881 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml new file mode 100644 index 00000000..f92fb426 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml new file mode 100644 index 00000000..e398f828 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml new file mode 100644 index 00000000..fd46fc5a --- /dev/null +++ b/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml new file mode 100644 index 00000000..397c1999 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml new file mode 100644 index 00000000..70a8bd7b --- /dev/null +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml new file mode 100644 index 00000000..0094a00e --- /dev/null +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml new file mode 100644 index 00000000..d1fca72c --- /dev/null +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml new file mode 100644 index 00000000..1a5cefd4 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml new file mode 100644 index 00000000..ef850d7f --- /dev/null +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml new file mode 100644 index 00000000..08a8460e --- /dev/null +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml new file mode 100644 index 00000000..1a29cf88 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml new file mode 100644 index 00000000..f2e418b7 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml new file mode 100644 index 00000000..c70064e8 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml new file mode 100644 index 00000000..4f8903bf --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml new file mode 100644 index 00000000..55a63117 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml new file mode 100644 index 00000000..1a4d17c5 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml new file mode 100644 index 00000000..689c541a --- /dev/null +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml new file mode 100644 index 00000000..c867c450 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml new file mode 100644 index 00000000..25cf2e00 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml new file mode 100644 index 00000000..2951ccdd --- /dev/null +++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml new file mode 100644 index 00000000..ce66afb2 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml new file mode 100644 index 00000000..43182504 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml new file mode 100644 index 00000000..e36b8f31 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml new file mode 100644 index 00000000..53d88baf --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml new file mode 100644 index 00000000..b7ec50af --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml new file mode 100644 index 00000000..b6dfafd7 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml new file mode 100644 index 00000000..6879dd9a --- /dev/null +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml new file mode 100644 index 00000000..9465fd99 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml new file mode 100644 index 00000000..53a442d7 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml new file mode 100644 index 00000000..947e2512 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml new file mode 100644 index 00000000..f97c138c --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml new file mode 100644 index 00000000..5ac7d7b4 --- /dev/null +++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml new file mode 100644 index 00000000..24e5b72d --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml new file mode 100644 index 00000000..ddd26354 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml b/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml new file mode 100644 index 00000000..ed00dd42 --- /dev/null +++ b/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml new file mode 100644 index 00000000..6b1e2e76 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml new file mode 100644 index 00000000..a8015c9b --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml new file mode 100644 index 00000000..00bb125e --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml new file mode 100644 index 00000000..6913f786 --- /dev/null +++ b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml new file mode 100644 index 00000000..8db4ce51 --- /dev/null +++ b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml b/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml new file mode 100644 index 00000000..4a5344bb --- /dev/null +++ b/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..91595407 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..d69d24a6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ListyCity.iml b/ListyCity.iml new file mode 100644 index 00000000..307ea763 --- /dev/null +++ b/ListyCity.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 00000000..9975634a --- /dev/null +++ b/app/app.iml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java new file mode 100644 index 00000000..6528583a --- /dev/null +++ b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java @@ -0,0 +1,16 @@ +package com.example.simpleparadox.listycity; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class Citytest { + private City get_city(){ + return new City("j","k"); + } + @Test + public void test_city(){ + City city = get_city(); + assertEquals("j",city.getCityName()); + } +} diff --git a/local.properties b/local.properties new file mode 100644 index 00000000..2c26efa3 --- /dev/null +++ b/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Thu Mar 12 14:43:11 MDT 2020 +sdk.dir=/Users/jclkh/Library/Android/sdk From 1cf30a67c2e1c7a4891b29bf38fdd3416befb08d Mon Sep 17 00:00:00 2001 From: jiaxilyu <49665969+jiaxilyu@users.noreply.github.com> Date: Fri, 13 Mar 2020 15:50:50 -0600 Subject: [PATCH 3/4] s --- .../test/java/com/example/simpleparadox/listycity/Citytest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java index 6528583a..b1ab4395 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java @@ -11,6 +11,6 @@ private City get_city(){ @Test public void test_city(){ City city = get_city(); - assertEquals("j",city.getCityName()); + assertEquals("jkk",city.getCityName()); } } From 1a235324921f1797c176dad83bfd4254403d6c20 Mon Sep 17 00:00:00 2001 From: jiaxilyu <49665969+jiaxilyu@users.noreply.github.com> Date: Fri, 13 Mar 2020 15:54:23 -0600 Subject: [PATCH 4/4] s --- .../simpleparadox/listycity/CityListTest.java | 96 ------------------- .../simpleparadox/listycity/Citytest.java | 2 +- 2 files changed, 1 insertion(+), 97 deletions(-) delete mode 100644 app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java deleted file mode 100644 index 787eab7e..00000000 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.example.simpleparadox.listycity; - -import org.junit.jupiter.api.Test; - - -import static org.junit.jupiter.api.Assertions.*; - -class CityListTest { - - private CityList mockCityList() { - CityList cityList = new CityList(); - cityList.add(mockCity()); - return cityList; - } - - private City mockCity() { - return new City("Edmonton", "Alberta"); - } - - @Test - void testAdd() { - CityList cityList = mockCityList(); - - assertEquals(1, cityList.countCities()); - - cityList.add(new City("Regina", "Saskatchewan")); - - assertEquals(2, cityList.countCities()); - assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); - } - - @Test - void testAddException() { - CityList cityList = mockCityList(); - - City city = new City("Yellowknife", "Northwest Territories"); - cityList.add(city); - - assertThrows(IllegalArgumentException.class, () -> { - cityList.add(city); - }); - } - - @Test - void testHasCity() { - CityList cityList = mockCityList(); - - assertTrue(cityList.hasCity(mockCity())); - } - - @Test - void testGetCities() { - CityList cityList = mockCityList(); - - assertEquals(0, mockCity().compareTo(cityList.getCities().get(0))); - - City city = new City("Charlottetown", "Prince Edward Island"); - cityList.add(city); - - assertEquals(0, city.compareTo(cityList.getCities().get(0))); - assertEquals(0, mockCity().compareTo(cityList.getCities().get(1))); - } - - @Test - void testDeleteCity() { - CityList cityList = mockCityList(); - - City city = new City("Victoria", "British Columbia"); - cityList.add(city); - - assertEquals(2, cityList.countCities()); - - cityList.delete(mockCity()); - - assertEquals(1, cityList.countCities()); - assertEquals(0, city.compareTo(cityList.getCities().get(0))); - } - - @Test - void testDeleteException() { - CityList cityList = mockCityList(); - - cityList.delete(mockCity()); - - assertThrows(IllegalArgumentException.class, () -> { - cityList.delete(mockCity()); - }); - } - - @Test - void testCountCities() { - CityList cityList = mockCityList(); - - assertEquals(1, cityList.countCities()); - } -} \ No newline at end of file diff --git a/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java index b1ab4395..6528583a 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/Citytest.java @@ -11,6 +11,6 @@ private City get_city(){ @Test public void test_city(){ City city = get_city(); - assertEquals("jkk",city.getCityName()); + assertEquals("j",city.getCityName()); } }