Author: bpoussin Date: 2010-11-16 16:47:41 +0100 (Tue, 16 Nov 2010) New Revision: 475 Url: http://nuiton.org/repositories/revision/wikitty/475 Log: better test for extension deletion Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-11-16 15:36:57 UTC (rev 474) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-11-16 15:47:41 UTC (rev 475) @@ -82,19 +82,39 @@ @Test public void testExtensionMethod() throws Exception { - ws.storeExtension(null, Collections.singletonList(EXT_TEST)); - List<String> extIds = ws.getAllExtensionIds(null); - log.debug("extIds: " + extIds); - assertEquals(1, extIds.size()); - WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); - assertEquals(EXT_TEST.getName(), ext.getName()); - assertEquals(EXT_TEST.getVersion(), ext.getVersion()); - assertEquals(EXT_TEST, ext); + { + ws.storeExtension(null, Collections.singletonList(EXT_TEST)); + List<String> extIds = ws.getAllExtensionIds(null); + log.debug("extIds: " + extIds); + assertEquals(1, extIds.size()); + WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); + assertEquals(EXT_TEST.getName(), ext.getName()); + assertEquals(EXT_TEST.getVersion(), ext.getVersion()); + assertEquals(EXT_TEST, ext); + } + { + // test de la suppression de l'extension + ws.deleteExtension(null, Collections.singleton(EXT_TEST.getName())); + List<String> extIds = ws.getAllExtensionIds(null); + assertEquals(0, extIds.size()); + } + { + // test que la suppression echoue si l'extension est utilisee + ws.storeExtension(null, Collections.singletonList(EXT_TEST)); - // test de la suppression de l'extension - ws.deleteExtension(null, Collections.singleton(EXT_TEST.getName())); - extIds = ws.getAllExtensionIds(null); - assertEquals(0, extIds.size()); + Wikitty w = new WikittyImpl(); + w.addExtension(EXT_TEST); + ws.store(null, Collections.singleton(w), false); + + try { + ws.deleteExtension(null, Collections.singleton(EXT_TEST.getName())); + assertTrue(false); // il doit y avoir une exception, donc on ne passe pas la + } catch (WikittyException eee) { + assertTrue(true); + } + List<String> extIds = ws.getAllExtensionIds(null); + assertEquals(1, extIds.size()); + } } @Test