From a4cd57b6a24e2b6e38c48a9624d306500db7359f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 24 Feb 2018 11:48:11 +0000 Subject: [PATCH v2 19/28] tests: add PluginHandlerJOSMTooOldTest this test is a good example which exercises ExtendedDialogMocker and HelpAwareOptionPaneMocker. also consolidate dummy plugins together in __files/ directory --- test/data/__files/plugin/baz_plugin.v6.jar | Bin 0 -> 2890 bytes test/data/__files/plugin/baz_plugin.v7.jar | Bin 0 -> 2999 bytes test/data/__files/plugin/dummy_plugin.v31701.jar | Bin 0 -> 3130 bytes .../{dummy_plugin.jar => dummy_plugin.v31772.jar} | Bin test/data/plugin/dummy_plugin.jar | Bin 3043 -> 0 bytes .../downloadtasks/PluginDownloadTaskTest.java | 4 +- .../preferences/plugin/PluginPreferenceTest.java | 2 +- .../josm/plugins/PluginHandlerJOSMTooOldTest.java | 276 +++++++++++++++++++++ 8 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 test/data/__files/plugin/baz_plugin.v6.jar create mode 100644 test/data/__files/plugin/baz_plugin.v7.jar create mode 100644 test/data/__files/plugin/dummy_plugin.v31701.jar rename test/data/__files/plugin/{dummy_plugin.jar => dummy_plugin.v31772.jar} (100%) delete mode 100644 test/data/plugin/dummy_plugin.jar create mode 100644 test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java diff --git a/test/data/__files/plugin/baz_plugin.v6.jar b/test/data/__files/plugin/baz_plugin.v6.jar new file mode 100644 index 0000000000000000000000000000000000000000..5e4210de44b2646bbc56ea847ce3dbc507e191e7 GIT binary patch literal 2890 zcmWIWW@Zs#;Nak3$Ss`f!+-=h8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1ggJHB{O5v^el~ zeE;Pz&B;&8-#>o0_TWw3phxc|PFAJQ5L=}q^_@SHX^ZWqo~I8N@6hi)yW#bk$NnC< zTNLL;>ilFmT##^kZnk=kgHl_y#Nh^=IVv|Rr&q}v|NXKl&20ALb^lf~cJO@OC~UW2 zv54Sh4#%2msiQY19#NM$D%3aI`+)23JAQFxEqtE0{wPN3e!J@A_vOK^nLF5C*FAp| zwX*V4(%t^VTCc{QDbt-@Ub}NHe`p}LPx6IX2zd*!Tea=rY`GgGJ8 z+z~$|YFbv#xSib`nH;h73-fi+^R!8b=LB zN(Ye7S>O>_%)r2R1cVuqwA}3QL|+ISr=OKcph0x1svG)=(kPZqu`wm z8yLP9a!Ut99;-L&>s<9MUB#Nm_eaND<&!F{Oz$4)9GhMwW8QVR-5_quYoTL*j$5i4 zhQ<7uxMX9>{S7j?GxXI~@|zd(#T)&RzM#Bp{q#TGbDB>lE!uUVv%8{O)I#swo5HO7 z{2|H0dQVbq*Uxxq_w#SgG4D6$B3274$Ijon(N7>VI_?Y0tPA?9d>_wR@o2r6>>-9* z?g9^_)si*ymRw6q%DWY(DKT?uplMp_jc8W(OEpmVrVd|lGi39TwpM;(?Jh8Fg$7CI*N=S;!8HuH+0nn^brwI!>$D(0K5 zJNlL9d1-}8$Fw7IHs?18--(<%^<~4uP~L@$DW%3bAOzqyS!2LJjVjm z1x#;984g{A5L88eL26!cNl|KQNp4~R9`)i_)o0}w=i<>Mk6TkgPHB23NpkP3w1vLXp=(ti z*q1IX@Mucp)PE7YE0m#F_)?_m`-VSEH$OeQ=D*?gpS#O1pI>aZFzymtntSAmhoR?! zj)}ZF;wYR@b>?epQCG_9`+*r^^$WgCS?8B3ZF%>R#>a{4y42D-j@^yBeAe{lsf(NW zL0REu#Qk5(fK^X8Gbk%CGKnytHU(hyJg6yv3gC4+s9}Jv6}eUeH3SgA7RZEaMQRp+ zOyFX`UHc(S=mI(yUKirl1gZ@YU_C+;tZu}u6;wMSz%6vGu(}cvTAjaHALig%OZ+ literal 0 HcmV?d00001 diff --git a/test/data/__files/plugin/baz_plugin.v7.jar b/test/data/__files/plugin/baz_plugin.v7.jar new file mode 100644 index 0000000000000000000000000000000000000000..e00bd97b820bfbc096eff5ab30b3b32cc98e1d02 GIT binary patch literal 2999 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 RWdj++1B59+Cm#TJ0szu62Ic?& literal 0 HcmV?d00001 diff --git a/test/data/__files/plugin/dummy_plugin.jar b/test/data/__files/plugin/dummy_plugin.v31772.jar similarity index 100% rename from test/data/__files/plugin/dummy_plugin.jar rename to test/data/__files/plugin/dummy_plugin.v31772.jar diff --git a/test/data/plugin/dummy_plugin.jar b/test/data/plugin/dummy_plugin.jar deleted file mode 100644 index 0a1f4086917323129dc8fda92a29389be0d053ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3043 zcmb7Gc|6ql8z1Km#x@M%r`*Xsj`gEL&S4B@NIAn`7(b(iF6-m;mytW)K_B$liM!V1J_4$7OdEW2m^L?Jr^LalQ6c;x?2m}U!cz%(! z0)1k9Aa0PYg`>r>A6&s8ZopLlzY?a;0Rl|`O9X&@bhS0HLn15=IcnG< zj$%yEZJOfE@X^>Ap&if0WbNqT*E#Iv&5#eBV3o*=5@1Xf zvxe{jMl(T^_&s;aF+H3K``v9QrubX)o`L~+{)X;W;phT_ZR<5D>< zyC=rHN!D@x6Z-^c@yb+&XeaePI$uS3Q0(ddnCecrc)zmA(SlY)T`4Cm>P#bdL*kI$ z7=P?(`4HQKf+-Tc;N5%D6+@OyUb-M8dgjJo{0uqiiLJHkW;vEk$=JZ7MFYDqkD9Ro zi}GQUp1GK+_}dGTG?y0mpA9(wfJkd`Z-v?y<9=Sak@35ko>`oGbRD6_k2~@_XY?0& zHZuLsqVNEj_Qi%^;aj_K11>?q{@Zv6fA9z*<4BZ{U>q)lh$V01zw@j9fk71FHX!M( zL1aRxe*lTH4Os5mV87sP@O%Fi9!K^G_(%d?Yk*}nn*TlktOqOzu-0;oBWVz@B!3^x zzpQSedU|f6oVwA6$g0*%R6m9+Nd8Oh2+OJ$&O{;AN^6)sXuF%I&}!;E-SA$ulELLw z=}#Jm-D4g{9@#8#0^Hw$Kt{mEuGQz2Sj+52l7RnQJEsM3SUW5chX@KLVnaf3!5TgU zEQONm=!S-wh^$;tA9qN)6AUxqfwMSqhaIadrsOQr9E70fJF^RR_qK)AX*4M=i^OtN zzUQ=uN$bw-SWwIx6?;5XMgKp=umAZ%Kea_i=U`0q3cnXv2WzecHNCU-yg=l`W`(;P)zd=-x=@qomrE*KOO>AJ zhSC#v!B3qI$fzd@s4`h;p0I@!o&t)SP70&^${9~hgXCdTb#hKwur>{v(O>cQo%@{z zd&iwblupvq8_1nz-KD&m^Q&C@&CEq2aA{e@wrcOYDSt{IFXU zu1zxFu~V^V?cK+&iR4vWN;aqs&F6I;7#NfvK-*B_WhWM_ zq3Lwm zCj33@0q$ukUyXw)^nuJzDZ+OZ7nx_AglEeX%7xRaQ8Q#@e<3WZBtglc-c;vcMH*GA z^`TL;5QfFbcWc#Mj90F2LEBq48@)-3eo2~~XYwXB#^oFq>g-u$kTsUt--I?2npB!% zM;2M}9@Ga;IMsnk|H9B=bJRKG9}mLHFDklrY1J4}@2pC0Jb>$ctErh?=LRTIJJ49{ z-u(|vg;{%z*1IXg!4}nS42{kiLip6y2D)AQUMiu~izNpZg$LS$Ein92b)k}VilbMM z%bs~E{41c?bbTbx(*isd8|FXqZkpL271JCID)#9!{eBOuPYiO&+1X;$yu&<0ma4)f zk*l?9co*ZSo1i%q;res;6RxI8(+5)FmsR6gEy!EX@-Nohk}o;lNy?F>RY-B0wf-81 z?})LSIdFeY$syP=i$<)#O|EiR51fZc%*H;R4RC`r{@J3S(|cE@s^}iX^0ol3igfr= zQ=u|U^n~YFyix3QM0Pe#|E#HF@>1d1HPYK_ekeV=qw@K+%F zlW9w4RaEhJX1*T3Mi*prBtMta_U%ik%s-|weF)wm^UI0!YO6|qWr|jZdNdaX#lb1U zwe_e06b&#a=!FS;|2R#o4;~xPua6#V0NaY?8Nem_Ag~)j z|Ea=kiQR~&+8;g5gC_d&onNWU)O8?;4n99*9Z`sVMgBfnJUO{6b? s+#=x{x%!4qe;Mn`2WvA{1Mh!|_3874LGb`!_T&Nqv5y=8jP)SU-wCz|b^rhX diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java index 39de9a2b3..f9e3a0668 100644 --- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java +++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java @@ -55,7 +55,7 @@ public class PluginDownloadTaskTest extends AbstractDownloadTaskTestParent { */ @Test public void testUpdatePluginValid() throws Exception { - this.pluginPath = "plugin/dummy_plugin.jar"; + this.pluginPath = "plugin/dummy_plugin.v31772.jar"; this.mockHttp(); final File srcPluginFile = new File( @@ -73,7 +73,7 @@ public class PluginDownloadTaskTest extends AbstractDownloadTaskTestParent { } // get PluginInformation from jar file - final PluginInformation pluginInformation = new PluginInformation(srcPluginFile); + final PluginInformation pluginInformation = new PluginInformation(srcPluginFile, "dummy_plugin"); // ...and grafting on the downloadlink pluginInformation.downloadlink = this.getRemoteFileUrl(); diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java index 7c89cd081..dc2c05575 100644 --- a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java +++ b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java @@ -50,7 +50,7 @@ public class PluginPreferenceTest { */ public static PluginInformation getDummyPluginInformation() throws PluginException { return new PluginInformation( - new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin"); + new File(TestUtils.getTestDataRoot() + "__files/plugin/dummy_plugin.v31772.jar"), "dummy_plugin"); } /** diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java new file mode 100644 index 000000000..66499ec93 --- /dev/null +++ b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java @@ -0,0 +1,276 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.plugins; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; + +import java.io.File; +import java.nio.file.Files; +import java.util.List; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.testutils.ExtendedDialogMocker; +import org.openstreetmap.josm.testutils.HelpAwareOptionPaneMocker; +import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.PluginServer; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +import com.github.tomakehurst.wiremock.client.WireMock; +import com.github.tomakehurst.wiremock.junit.WireMockRule; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; + +/** + * Test parts of {@link PluginHandler} class when the reported JOSM version is too old for the plugin. + */ +public class PluginHandlerJOSMTooOldTest { + /** + * Setup test. + */ + @Rule + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") + public JOSMTestRules test = new JOSMTestRules().preferences().main().assumeRevision( + "Revision: 6000\n" + ); + + /** + * Plugin server mock. + */ + @Rule + public WireMockRule pluginServerRule = new WireMockRule( + options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot()) + ); + + @Before + public void setUp() throws Exception { + Config.getPref().putInt("pluginmanager.version", 999); + Config.getPref().put("pluginmanager.lastupdate", "999"); + Config.getPref().putList("pluginmanager.sites", + ImmutableList.of(String.format("http://localhost:%s/plugins", this.pluginServerRule.port())) + ); + + this.referenceDummyJarOld = new File(TestUtils.getTestDataRoot(), "__files/plugin/dummy_plugin.v31701.jar"); + this.referenceDummyJarNew = new File(TestUtils.getTestDataRoot(), "__files/plugin/dummy_plugin.v31772.jar"); + this.referenceBazJarOld = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v6.jar"); + this.referenceBazJarNew = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v7.jar"); + this.pluginDir = Main.pref.getPluginsDirectory(); + this.targetDummyJar = new File(this.pluginDir, "dummy_plugin.jar"); + this.targetDummyJarNew = new File(this.pluginDir, "dummy_plugin.jar.new"); + this.targetBazJar = new File(this.pluginDir, "baz_plugin.jar"); + this.targetBazJarNew = new File(this.pluginDir, "baz_plugin.jar.new"); + this.pluginDir.mkdirs(); + } + + private File pluginDir; + private File referenceDummyJarOld; + private File referenceDummyJarNew; + private File referenceBazJarOld; + private File referenceBazJarNew; + private File targetDummyJar; + private File targetDummyJarNew; + private File targetBazJar; + private File targetBazJarNew; + + private final String bazPluginVersionReqString = "JOSM version 8,001 required for plugin baz_plugin."; + private final String dummyPluginVersionReqString = "JOSM version 7,001 required for plugin dummy_plugin."; + private final String dummyPluginFailedString = "Updating the following plugin has failed:
  • dummy_plugin
" + + "Please open the Preference Dialog after JOSM has started and try to update it manually."; + + /** + * test update of plugins when those plugins turn out to require a higher JOSM version, but the + * user chooses to update them anyway. + */ + @Test + public void testUpdatePluginsDownloadBoth() throws Exception { + final PluginServer pluginServer = new PluginServer( + new PluginServer.RemotePlugin(this.referenceDummyJarNew), + new PluginServer.RemotePlugin(this.referenceBazJarNew) + ); + pluginServer.applyToWireMockServer(this.pluginServerRule); + Config.getPref().putList("plugins", ImmutableList.of("dummy_plugin", "baz_plugin")); + + final ExtendedDialogMocker edMocker = new ExtendedDialogMocker(ImmutableMap.builder() + .put(this.bazPluginVersionReqString, "Download Plugin") + .put(this.dummyPluginVersionReqString, "Download Plugin") + .build() + ); + + Files.copy(this.referenceDummyJarOld.toPath(), this.targetDummyJar.toPath()); + Files.copy(this.referenceBazJarOld.toPath(), this.targetBazJar.toPath()); + + final List updatedPlugins = PluginHandler.updatePlugins( + Main.parent, + null, + null, + false + ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList()); + + assertEquals( + ImmutableList.of( + this.dummyPluginVersionReqString, + this.bazPluginVersionReqString + ), + edMocker.getInvocationLog().stream().map( + invocationEntry -> invocationEntry[1] + ).sorted().collect(ImmutableList.toImmutableList()) + ); + + assertEquals(2, updatedPlugins.size()); + + assertEquals(updatedPlugins.get(0).name, "baz_plugin"); + assertEquals("7", updatedPlugins.get(0).localversion); + + assertEquals(updatedPlugins.get(1).name, "dummy_plugin"); + assertEquals("31772", updatedPlugins.get(1).localversion); + + assertFalse(targetDummyJarNew.exists()); + assertFalse(targetBazJarNew.exists()); + + TestUtils.assertFileContentsEqual(this.referenceDummyJarNew, this.targetDummyJar); + TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar); + + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins"))); + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar"))); + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar"))); + + assertEquals(Config.getPref().getInt("pluginmanager.version", 111), 6000); + // not mocking the time so just check it's not its original value + assertNotEquals(Config.getPref().get("pluginmanager.lastupdate", "999"), "999"); + } + + /** + * test update of plugins when those plugins turn out to require a higher JOSM version, but the + * user chooses to update one and skip the other. + */ + @Test + public void testUpdatePluginsSkipOne() throws Exception { + final PluginServer pluginServer = new PluginServer( + new PluginServer.RemotePlugin(this.referenceDummyJarNew), + new PluginServer.RemotePlugin(this.referenceBazJarNew) + ); + pluginServer.applyToWireMockServer(this.pluginServerRule); + Config.getPref().putList("plugins", ImmutableList.of("dummy_plugin", "baz_plugin")); + + final ExtendedDialogMocker edMocker = new ExtendedDialogMocker(ImmutableMap.builder() + .put(this.bazPluginVersionReqString, "Download Plugin") + .put(this.dummyPluginVersionReqString, "Skip Download") + .build() + ); + final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker(ImmutableMap.builder() + .put(this.dummyPluginFailedString, "OK") + .build() + ); + + Files.copy(this.referenceDummyJarOld.toPath(), this.targetDummyJar.toPath()); + Files.copy(this.referenceBazJarOld.toPath(), this.targetBazJar.toPath()); + + final List updatedPlugins = PluginHandler.updatePlugins( + Main.parent, + null, + null, + false + ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList()); + + assertEquals( + ImmutableList.of( + this.dummyPluginVersionReqString, + this.bazPluginVersionReqString + ), + edMocker.getInvocationLog().stream().map( + invocationEntry -> invocationEntry[1] + ).sorted().collect(ImmutableList.toImmutableList()) + ); + + assertEquals( + ImmutableList.of( + this.dummyPluginFailedString + ), + haMocker.getInvocationLog().stream().map( + invocationEntry -> invocationEntry[1] + ).sorted().collect(ImmutableList.toImmutableList()) + ); + + assertEquals(2, updatedPlugins.size()); + + assertEquals(updatedPlugins.get(0).name, "baz_plugin"); + assertEquals("7", updatedPlugins.get(0).localversion); + + assertEquals(updatedPlugins.get(1).name, "dummy_plugin"); + assertEquals("31701", updatedPlugins.get(1).localversion); + + assertFalse(targetDummyJarNew.exists()); + assertFalse(targetBazJarNew.exists()); + + TestUtils.assertFileContentsEqual(this.referenceDummyJarOld, this.targetDummyJar); + TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar); + + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins"))); + this.pluginServerRule.verify(0, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/dummy_plugin.v31772.jar"))); + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar"))); + + // shouldn't have been updated + assertEquals(Config.getPref().getInt("pluginmanager.version", 111), 999); + assertEquals(Config.getPref().get("pluginmanager.lastupdate", "999"), "999"); + } + + /** + * When the plugin list suggests that the jar file at the provided URL *doesn't* require a newer JOSM + * but in fact the plugin served *does*, it is installed anyway. + * + * This is probably NOT desirable and should be fixed, however this test documents the behaviour. + */ + @Test + public void testUpdatePluginsUnexpectedlyJOSMTooOld() throws Exception { + final PluginServer pluginServer = new PluginServer( + new PluginServer.RemotePlugin(this.referenceDummyJarNew), + new PluginServer.RemotePlugin(this.referenceBazJarNew, ImmutableMap.of( + "Plugin-Mainversion", "5500" + )) + ); + pluginServer.applyToWireMockServer(this.pluginServerRule); + Config.getPref().putList("plugins", ImmutableList.of("baz_plugin")); + + // setting up blank ExtendedDialogMocker which would raise an exception if any attempt to show + // and ExtendedDialog were made + new ExtendedDialogMocker(); + + Files.copy(this.referenceBazJarOld.toPath(), this.targetBazJar.toPath()); + + final List updatedPlugins = ImmutableList.copyOf(PluginHandler.updatePlugins( + Main.parent, + null, + null, + false + )); + + // questionably correct + assertEquals(1, updatedPlugins.size()); + + // questionably correct + assertEquals(updatedPlugins.get(0).name, "baz_plugin"); + assertEquals("7", updatedPlugins.get(0).localversion); + + assertFalse(targetBazJarNew.exists()); + + // questionably correct + TestUtils.assertFileContentsEqual(this.referenceBazJarNew, this.targetBazJar); + + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugins"))); + // questionably correct + this.pluginServerRule.verify(1, WireMock.getRequestedFor(WireMock.urlEqualTo("/plugin/baz_plugin.v7.jar"))); + + // should have been updated + assertEquals(Config.getPref().getInt("pluginmanager.version", 111), 6000); + assertNotEquals(Config.getPref().get("pluginmanager.lastupdate", "999"), "999"); + } +} -- 2.11.0