From c3f583ec074e7f96102a732c3cab3b375c5aa7f9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 18 Nov 2007 08:27:50 +0000 Subject: [PATCH] Change default separator git-svn-id: https://svn.argeo.org/slc/trunk@715 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/slc/core/structure/tree/TreeSPath.java | 8 ++++++-- .../org/argeo/slc/example/junit/TestAntBuild.java | 12 ++++++------ .../structure/tree/TreeSPathDaoHibernateTest.java | 6 +++--- .../tree/TreeSRegistryDaoHibernateTest.java | 2 +- .../test/tree/TreeTestResultDaoHibernateTest.java | 6 +++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java index 014e12c0b..f28c843cf 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java @@ -12,8 +12,8 @@ import org.argeo.slc.core.structure.StructureRegistry; * Path for tree based StructureRegistry implementations. */ public class TreeSPath implements StructurePath, Comparable { - /** Default character to use a separator: #. */ - public static Character DEFAULT_SEPARATOR = '#'; + /** Default character to use a separator: /. */ + public static Character DEFAULT_SEPARATOR = '/'; private TreeSPath parent; private String name; @@ -68,6 +68,10 @@ public class TreeSPath implements StructurePath, Comparable { path.name = name; return path; } + /** Parses a string to a path. */ + public static TreeSPath parseToCreatePath(String path) { + return parseToCreatePath(path, DEFAULT_SEPARATOR); + } /** Parses a string to a path. */ public static TreeSPath parseToCreatePath(String path, Character separator) { diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java index b4d097483..a3ca0e530 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java @@ -47,12 +47,12 @@ public class TestAntBuild extends TestCase { // assertPart(testResult1, "", 0, TestStatus.PASSED, ""); assertPart( testResult1, - "#root#Category1#SubCategory2#testComplex#slc.test0#0", + "/root/Category1/SubCategory2/testComplex/slc.test0/0", 0, TestStatus.PASSED, - "Sub task with path #root#Category1#SubCategory2#testComplex#slc.test0#0 executed"); + "Sub task with path /root/Category1/SubCategory2/testComplex/slc.test0/0 executed"); assertPart(testResult1, - "#root#Category1#SubCategory2#testSimple#slc.test0", 1, + "/root/Category1/SubCategory2/testSimple/slc.test0", 1, TestStatus.FAILED, "Compare nato-expected.txt with nato-reached.txt"); @@ -60,11 +60,11 @@ public class TestAntBuild extends TestCase { TreeTestResult testResult2 = (TreeTestResult) testResultDao .getTestResult(numericTRId); assertPart(testResult2, - "#root#Category1#SubCategory2#testSimple#slc.test2", 1, + "/root/Category1/SubCategory2/testSimple/slc.test2", 1, TestStatus.PASSED, "Compare eu-reform-expected.txt with eu-reform-reached.txt"); assertPart(testResult2, - "#root#Category1#SubCategory2#testSimple#slc.test3", 1, + "/root/Category1/SubCategory2/testSimple/slc.test3", 1, TestStatus.FAILED, "Compare eu-reform-expected.txt with eu-reform-reached.txt"); @@ -76,7 +76,7 @@ public class TestAntBuild extends TestCase { private void assertPart(TreeTestResult testResult, String pathStr, int index, Integer status, String message) { - TreeSPath path = TreeSPath.parseToCreatePath(pathStr, '#'); + TreeSPath path = TreeSPath.parseToCreatePath(pathStr); PartSubList list = testResult.getResultParts().get(path); SimpleResultPart part = (SimpleResultPart) list.getParts().get(index); assertEquals(status, part.getStatus()); diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java index 66447030d..3b9a32ddf 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java @@ -10,9 +10,9 @@ public class TreeSPathDaoHibernateTest extends SpringBasedTestCase { TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean( "treeSPathDao"); - String pathParentStr = "#root#testParent"; - String pathStr = pathParentStr+"#test"; - TreeSPath path = TreeSPath.parseToCreatePath(pathStr, '#'); + String pathParentStr = "/root/testParent"; + String pathStr = pathParentStr+"/test"; + TreeSPath path = TreeSPath.parseToCreatePath(pathStr); treeSPathDao.create(path); TreeSPath pathChild = treeSPathDao.getTreeSPath(pathStr); diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java index 7ed268458..b5b626b3e 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java @@ -16,7 +16,7 @@ public class TreeSRegistryDaoHibernateTest extends SpringBasedTestCase { TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean( "treeSPathDao"); - TreeSPath root = TreeSPath.parseToCreatePath("#root", '#'); + TreeSPath root = TreeSPath.parseToCreatePath("/root"); TreeSPath path = root.createChild("test"); treeSPathDao.create(root); diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java index f983a89fe..1e7fcf716 100644 --- a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java +++ b/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java @@ -19,9 +19,9 @@ public class TreeTestResultDaoHibernateTest extends SpringBasedTestCase { TestResultDao testResultDao = (TestResultDao) getContext().getBean( "testResultDao"); - String pathParentStr = "#root#testParent"; - String pathStr = pathParentStr + "#test"; - TreeSPath path = TreeSPath.parseToCreatePath(pathStr, '#'); + String pathParentStr = "/root/testParent"; + String pathStr = pathParentStr + "/test"; + TreeSPath path = TreeSPath.parseToCreatePath(pathStr); treeSPathDao.create(path); TreeTestResult treeTestResult = new TreeTestResult(); -- 2.39.5