Author: echatellier Date: 2012-01-27 12:04:08 +0100 (Fri, 27 Jan 2012) New Revision: 1382 Url: http://nuiton.org/repositories/revision/wikitty/1382 Log: improve imbricated service detection Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-01-27 10:56:52 UTC (rev 1381) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-01-27 11:04:08 UTC (rev 1382) @@ -46,6 +46,7 @@ import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyTypes; +import org.nuiton.wikitty.services.WikittyServiceDelegator; import org.nuiton.wikitty.services.WikittyServiceInMemory; import org.nuiton.wikitty.test.CatalogNode; import org.nuiton.wikitty.test.CatalogNodeImpl; @@ -85,7 +86,14 @@ * l'instance in memory ne supporte pas la fonctionnalité testée. */ protected void assumeTrueSearchEngineCanRunTest() { - boolean isInMomory = wikittyClient.getWikittyService() instanceof WikittyServiceInMemory; + + // improve imbricated service detection + WikittyService ws = wikittyClient.getWikittyService(); + while (ws instanceof WikittyServiceDelegator) { + ws = ((WikittyServiceDelegator)ws).getDelegate(); + } + + boolean isInMomory = ws instanceof WikittyServiceInMemory; if (isInMomory) { log.warn("Not yet implemented in memory, skipping"); }