Author: sergiykarpenko Date: 2011-07-20 05:57:28 -0400 (Wed, 20 Jul 2011) New Revision: 4669 Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java Log: EXOJCR-1443: tests - escape symbols in workspase name fixed. Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2011-07-20 07:47:31 UTC (rev 4668) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2011-07-20 09:57:28 UTC (rev 4669) @@ -357,7 +357,7 @@ public void testRemoveRepository() throws Exception { ManageableRepository repository = helper.createRepository(container, true, null); - + String wsName = repository.getConfiguration().getSystemWorkspaceName(); String repoName = repository.getConfiguration().getName(); @@ -439,7 +439,7 @@ // Indexer ArrayList qParams = new ArrayList(); - qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator + wsName)); + qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator + skipInvalidCharacters(wsName))); QueryHandlerEntry qEntry = new QueryHandlerEntry(defWEntry.getQueryHandler().getType(), qParams); ws1back.setQueryHandler(qEntry); @@ -453,7 +453,7 @@ if (newp.getName().equals("source-name")) newp.setValue(sourceName); else if (newp.getName().equals("swap-directory")) - newp.setValue("target/temp/swap/" + wsName); + newp.setValue("target/temp/swap/" + skipInvalidCharacters(wsName)); else if (newp.getName().equals("multi-db")) newp.setValue(Boolean.toString(multiDb)); @@ -465,4 +465,17 @@ return ws1back; } + + private String skipInvalidCharacters(String s) + { + if (File.separator.equals("\\")) + { + return s.replaceAll("[:,?]", "_"); + } + else + { + return s; + } + + } }