# HG changeset patch # User one # Date 1415523409 -32400 # Node ID b8d86bc46b51c97d53baaa61cf28db55d006ef91 # Parent 7f70341a78bc3be7cbbfc93197c2292dc68288b4 remove warning and rename src file diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/LoadXml.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/LoadXml.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,68 @@ +package ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; + +import org.xml.sax.SAXException; + +public class LoadXml { + + Jungle jungle; + SAXParserFactory saxParserFactory; + + public LoadXml() { + saxParserFactory = SAXParserFactory.newInstance(); + jungle = new DefaultJungle(null, "jungle", new DefaultTreeEditor(new DefaultTraverser())); + } + + private JungleTree putTestDataCreate(String xmlName, JungleTree tree) throws FileNotFoundException, + SAXException, IOException, ParserConfigurationException { + SAXParser saxParser = saxParserFactory.newSAXParser(); + ReadXmlPutAttributeCreateIndex readXmlHandler = new ReadXmlPutAttributeCreateIndex(tree); + saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); + JungleTree newTree = readXmlHandler.getTree(); + + return newTree; + + } + + private JungleTree createNodeTestData(String xmlName) throws FileNotFoundException, SAXException, + IOException, ParserConfigurationException { + SAXParser saxParser = saxParserFactory.newSAXParser(); + JungleTree tree = jungle.createNewTree(xmlName); + ReadXmlNodeCreateIndexHandler readXmlHandler = new ReadXmlNodeCreateIndexHandler(tree); + saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); + JungleTree nodeTree = readXmlHandler.getTree(); + JungleTree newTree = putTestDataCreate(xmlName, nodeTree); + return newTree; + } + + public JungleTree loadTestDataCreateIndex(String xmlName) throws FileNotFoundException, SAXException, IOException, ParserConfigurationException{ + JungleTree newTree = createNodeTestData(xmlName); + return newTree; + } + + public JungleTree loadTestData(String xmlName) throws FileNotFoundException, SAXException, IOException, + ParserConfigurationException { + SAXParser saxParser = saxParserFactory.newSAXParser(); + JungleTree tree = jungle.createNewTree(xmlName); + ReadXmlHandler readXmlHandler = new ReadXmlHandler(tree); + saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); + JungleTree newTree = readXmlHandler.getTree(); + + return newTree; + + } + +} diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/XmlReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/XmlReader.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,26 @@ +package ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader; + +import java.io.*; + +import javax.xml.parsers.*; + +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; + +class XmlReader { + public static void main(String args[]) { + try { + SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); + SAXParser saxParser = saxParserFactory.newSAXParser(); + Jungle jungle = new DefaultJungle(null, "hoge",new DefaultTreeEditor(new DefaultTraverser())); + JungleTree tree = jungle.createNewTree("XMLTEST"); + ReadXmlHandler readXmlHandler = new ReadXmlHandler(tree); + saxParser.parse(new FileInputStream("/Users/e115731/workspace/aaa/xml/Person.xml"), readXmlHandler); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/loadXml.java --- a/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/loadXml.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -package ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; - -import org.xml.sax.SAXException; - -public class loadXml { - - Jungle jungle; - SAXParserFactory saxParserFactory; - - public loadXml() { - saxParserFactory = SAXParserFactory.newInstance(); - jungle = new DefaultJungle(null, "jungle", new DefaultTreeEditor(new DefaultTraverser())); - } - - private JungleTree putTestDataCreate(String xmlName, JungleTree tree) throws FileNotFoundException, - SAXException, IOException, ParserConfigurationException { - SAXParser saxParser = saxParserFactory.newSAXParser(); - ReadXmlPutAttributeCreateIndex readXmlHandler = new ReadXmlPutAttributeCreateIndex(tree); - saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); - JungleTree newTree = readXmlHandler.getTree(); - - return newTree; - - } - - private JungleTree createNodeTestData(String xmlName) throws FileNotFoundException, SAXException, - IOException, ParserConfigurationException { - SAXParser saxParser = saxParserFactory.newSAXParser(); - JungleTree tree = jungle.createNewTree(xmlName); - ReadXmlNodeCreateIndexHandler readXmlHandler = new ReadXmlNodeCreateIndexHandler(tree); - saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); - JungleTree nodeTree = readXmlHandler.getTree(); - JungleTree newTree = putTestDataCreate(xmlName, nodeTree); - return newTree; - } - - public JungleTree loadTestDataCreateIndex(String xmlName) throws FileNotFoundException, SAXException, IOException, ParserConfigurationException{ - JungleTree newTree = createNodeTestData(xmlName); - return newTree; - } - - public JungleTree loadTestData(String xmlName) throws FileNotFoundException, SAXException, IOException, - ParserConfigurationException { - SAXParser saxParser = saxParserFactory.newSAXParser(); - JungleTree tree = jungle.createNewTree(xmlName); - ReadXmlHandler readXmlHandler = new ReadXmlHandler(tree); - saxParser.parse(new FileInputStream("xml/" + xmlName), readXmlHandler); - JungleTree newTree = readXmlHandler.getTree(); - - return newTree; - - } - -} diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/xmlReader.java --- a/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/xmlReader.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -package ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader; - -import java.io.*; - -import javax.xml.parsers.*; - -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; - -class xmlReader { - public static void main(String args[]) { - try { - SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); - SAXParser saxParser = saxParserFactory.newSAXParser(); - Jungle jungle = new DefaultJungle(null, "hoge",new DefaultTreeEditor(new DefaultTraverser())); - JungleTree tree = jungle.createNewTree("XMLTEST"); - ReadXmlHandler readXmlHandler = new ReadXmlHandler(tree); - saxParser.parse(new FileInputStream("/Users/e115731/workspace/aaa/xml/Person.xml"), readXmlHandler); - } catch (Exception e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/GetAttributeImp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/GetAttributeImp.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,22 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.bbs; + +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; + + + + +public class GetAttributeImp +{ + private final TreeNode node; + + public GetAttributeImp(TreeNode _node) + { + node = _node; + } + + public String getMessage() { + return node.getAttributes().getString("text"); + } + +} + diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java Sun Nov 09 17:56:49 2014 +0900 @@ -5,14 +5,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.collections.OrderedBidiMap; -import org.omg.CORBA.OBJ_ADAPTER; -import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.loadXml; +import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.LoadXml; import fj.Ord; import fj.P2; import fj.data.TreeMap; -import jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest.PersonIdsTest; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; @@ -31,7 +28,7 @@ public JuGrix(boolean index) { try { - loadXml reader = new loadXml(); + LoadXml reader = new LoadXml(); if (index == true) { personTree = reader.loadTestDataCreateIndex("Person.xml"); diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JungleBulletinBoard.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JungleBulletinBoard.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JungleBulletinBoard.java Sun Nov 09 17:56:49 2014 +0900 @@ -1,46 +1,33 @@ package jp.ac.u_ryukyu.cr.ie.tatsuki.bbs; -import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.ReadXmlHandler; -import fj.data.List; -import fj.data.TreeMap; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.BoardMessage; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.BulletinBoard; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Children; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListReader; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultOperationLog; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.LoggingNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.OperationLog; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.PutAttributeOperation; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.NodeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultEvaluator; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.Traversal; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.IterableConverter; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.LoggingNode; import junit.framework.Assert; public class JungleBulletinBoard implements XmlBulletinBoard { @@ -520,7 +507,7 @@ return new IterableConverter(chs, converter); } - public getAttributeImp getAttribute(String _boardName, String _nodeNum) { + public GetAttributeImp getAttribute(String _boardName, String _nodeNum) { DefaultNodePath path = new DefaultNodePath(); try { @@ -543,7 +530,7 @@ Traversal traversal = ret.b(); TreeNode target = traversal.destination(); - return new getAttributeImp(target); + return new GetAttributeImp(target); } diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/MatrixApp.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/MatrixApp.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/MatrixApp.java Sun Nov 09 17:56:49 2014 +0900 @@ -3,7 +3,6 @@ import javax.servlet.Servlet; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.CreateBoardMessageServlet; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.CreateBoardServlet; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.EditMessageServlet; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.EditMessageUseGetServlet; diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowBoardsServletMatrix.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowBoardsServletMatrix.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowBoardsServletMatrix.java Sun Nov 09 17:56:49 2014 +0900 @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.bbs.BulletinBoard; public class ShowBoardsServletMatrix extends HttpServlet { diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java Sun Nov 09 17:56:49 2014 +0900 @@ -17,12 +17,8 @@ private static final long serialVersionUID = 1L; private final XmlBulletinBoard bbs; private final String createBoardMessagePath; - private final String editNodePath; private final String showMatrixPath; private final String createAttributePath; - private final String editAttributePath; - private final String deleteAttributePath; - private final String deleteNodePath; private static final String PARAM_BOARD_NAME = "bname"; private static final String PARAM_NODE_PATH = "uuid"; private static final String PARAM_NODE_NAME = "nodeName"; @@ -33,13 +29,9 @@ String _editAttributePath, String _deleteAttributePath, String _deleteNodePath, ThreadPool thp) { bbs = _bbs; - deleteAttributePath = _deleteAttributePath; - deleteNodePath = _deleteNodePath; createAttributePath = _createAttributePath; - editAttributePath = _editAttributePath; showMatrixPath = _showMatrixPath; createBoardMessagePath = _createBoardMessagePath; - editNodePath = _editNodePath; } public void doGet(HttpServletRequest _req, HttpServletResponse _res) { @@ -92,7 +84,7 @@ } _pw.write("

Value

"); - getAttributeImp attribute = (bbs.getAttribute(_bname, path)); + GetAttributeImp attribute = (bbs.getAttribute(_bname, path)); _pw.write(bbs.sanitize(attribute.getMessage())); diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/XmlBulletinBoard.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/XmlBulletinBoard.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/XmlBulletinBoard.java Sun Nov 09 17:56:49 2014 +0900 @@ -9,7 +9,7 @@ public Iterable getFolder(String _boardName, String nodeNum); public void createFolder(String boardName, String author, String msg,String key, String _nodeNum); public void createAttribute(String boardName, String uuid, String author, String msg, String key); - public getAttributeImp getAttribute(String _bname, String nodeNum); + public GetAttributeImp getAttribute(String _bname, String nodeNum); public void editAttribute(String boardName, String path, String id, String message); public void deleteAttribute(String _board, String _path , String id); public void deleteNode(String _board, String _path, String id); diff -r 7f70341a78bc -r b8d86bc46b51 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/getAttributeImp.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/getAttributeImp.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.bbs; - -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; - - - - -public class getAttributeImp -{ - private final TreeNode node; - - public getAttributeImp(TreeNode _node) - { - node = _node; - } - - public String getMessage() { - return node.getAttributes().getString("text"); - } - -} - diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ChildOrganizationIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ChildOrganizationIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,32 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import org.junit.Assert; +import org.junit.Test; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; + +public class ChildOrganizationIdsTest { + + @Test + public void childOrganizationIdsTest(){ + JuGrix jugrix = new JuGrix(false); + LinkedList list = new LinkedList(); + Iterator ids = jugrix.childOrganizationIds("o:2", list); + + Assert.assertTrue(ids.hasNext()); + + Assert.assertEquals(ids.next(),"o:9"); + Assert.assertEquals(ids.next(),"o:3"); + + JuGrix indexJugrix = new JuGrix(true); + ids = indexJugrix.childOrganizationIds("o:2", list); + + Assert.assertTrue(ids.hasNext()); + + Assert.assertEquals(ids.next(),"o:9"); + Assert.assertEquals(ids.next(),"o:3"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/CompetentRoleIdTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/CompetentRoleIdTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,24 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class CompetentRoleIdTest { + + @Test + public void testCompetentRoleIdTest(){ + JuGrix jugrix = new JuGrix(false); + Iterator roleIds = jugrix.competentRoleId("p:1"); + Assert.assertTrue(roleIds.hasNext()); + Assert.assertEquals(roleIds.next(), "r:10"); + + jugrix = new JuGrix(true); + roleIds = jugrix.competentRoleId("p:1"); + Assert.assertTrue(roleIds.hasNext()); + Assert.assertEquals(roleIds.next(), "r:10"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ConcurrentRoleIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ConcurrentRoleIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,27 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; + +import org.junit.Test; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +public class ConcurrentRoleIdsTest { + + @Test + public void testConcurrentRoleId(){ + JuGrix jugrix = new JuGrix(false); + Iterator roleIds = jugrix.concurrentRoleIds("p:1"); + Assert.assertTrue(roleIds.hasNext()); + Assert.assertEquals(roleIds.next(), "r:34"); + + jugrix = new JuGrix(true); + roleIds = jugrix.concurrentRoleIds("p:1"); + Assert.assertTrue(roleIds.hasNext()); + Assert.assertEquals(roleIds.next(), "r:34"); + + roleIds = jugrix.concurrentRoleIds("p:48"); + Assert.assertFalse(roleIds.hasNext()); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,41 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; + +import org.junit.Assert; +import org.junit.Test; + +public class DeepChildOrganizationIdsPlusTest { + + @Test + public void TestDeepChildOrganizationIdsPlus(){ + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + filterIds.add("r:9"); + Iterator childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(),"o:2"); + + filterIds = new LinkedList(); + filterIds.add("r:5"); + childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(),"o:4"); + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + filterIds.add("r:9"); + childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(),"o:2"); + + filterIds = new LinkedList(); + filterIds.add("r:5"); + childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(),"o:4"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,48 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import org.junit.Test; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +public class DeepChildOrganizationIdsTest { + + @Test + public void TestDeepChildOrganizationIds() { + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + filterIds.add("r:5"); + Iterator childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); + + Assert.assertTrue(childrenIds.hasNext()); + String childrenId = childrenIds.next(); + Assert.assertEquals(childrenId, "o:4"); + + filterIds.add("rde:4"); + childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); + + Assert.assertTrue(childrenIds.hasNext()); + childrenId = childrenIds.next(); + Assert.assertEquals(childrenId, "o:4"); + + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + filterIds.add("r:5"); + childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); + + Assert.assertTrue(childrenIds.hasNext()); + childrenId = childrenIds.next(); + Assert.assertEquals(childrenId, "o:4"); + + filterIds.add("rde:4"); + childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); + + Assert.assertTrue(childrenIds.hasNext()); + childrenId = childrenIds.next(); + Assert.assertEquals(childrenId, "o:4"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsPlusTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsPlusTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,41 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class DeepParentOrganizationIdsPlusTest { + @Test + public void deepParentOrganizationIdsPlus(){ + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + //filterIds.add("r:2"); + Iterator childrenIds = jugrix.deepParentOrganizationIdsPlus("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + Assert.assertEquals(childrenIds.next(),"o:22"); + Assert.assertEquals(childrenIds.next(),"o:2"); + + filterIds.add("r:2"); + childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + + Assert.assertEquals(childrenIds.next(),"o:23"); + + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + //filterIds.add("r:2"); + childrenIds = jugrix.deepParentOrganizationIdsPlus("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + Assert.assertEquals(childrenIds.next(),"o:22"); + Assert.assertEquals(childrenIds.next(),"o:2"); + + filterIds.add("r:2"); + childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + + Assert.assertEquals(childrenIds.next(),"o:23"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,35 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class DeepParentOrganizationIdsTest { + + @Test + public void deepParentOrganizationIds(){ + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + Iterator childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + Assert.assertEquals(childrenIds.next(),"o:22"); + + filterIds.add("r:2"); + childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + Assert.assertEquals(childrenIds.next(),"o:22"); + + filterIds.add("r:2"); + childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); + Assert.assertEquals(childrenIds.next(),"o:23"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepPersonIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepPersonIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,34 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; + +import org.junit.Test; + +public class DeepPersonIdsTest { + @Test + public void TestDeepPersonIds(){ + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + //filterIds.add("r:9"); + Iterator ids = jugrix.deepPersonIds("o:3",filterIds); + System.out.println("------------------------------------------------"); + for (;ids.hasNext();) { + System.out.println(ids.next()); + } + + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + //filterIds.add("r:9"); + ids = jugrix.deepPersonIds("o:3",filterIds); + System.out.println("------------------------------------------------"); + for (;ids.hasNext();) { + System.out.println(ids.next()); + } + } + + +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/IsActiveTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/IsActiveTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,30 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; + + +import org.junit.Assert; +import org.junit.Test; + +public class IsActiveTest { + + @Test + public void TestIsActive(){ + + JuGrix jugrix = new JuGrix(false); + String personId = "p:1"; + + Assert.assertTrue(jugrix.isActive(personId)); + + personId = "p:100"; + Assert.assertFalse(jugrix.isActive(personId)); + + jugrix = new JuGrix(true); + personId = "p:1"; + Assert.assertTrue(jugrix.isActive(personId)); + + personId = "p:100"; + Assert.assertFalse(jugrix.isActive(personId)); + } + +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ParentOrganizationIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ParentOrganizationIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,36 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class ParentOrganizationIdsTest { + @Test + public void testParentOrganizationIds() { + JuGrix jugrix = new JuGrix(false); + LinkedList filterIds = new LinkedList(); + filterIds.add("r:2"); + Iterator childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(), "o:23"); + + filterIds.add("r:2a"); + childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); + Assert.assertFalse(childrenIds.hasNext()); + + jugrix = new JuGrix(true); + filterIds = new LinkedList(); + filterIds.add("r:2"); + childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); + Assert.assertTrue(childrenIds.hasNext()); + Assert.assertEquals(childrenIds.next(), "o:23"); + + filterIds.add("r:2a"); + childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); + Assert.assertFalse(childrenIds.hasNext()); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -4,17 +4,15 @@ import java.util.LinkedList; import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import junit.framework.Assert; import org.junit.Test; -import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.loadXml; public class PersonIdsTest { @Test - public void PersonIdsTest() { + public void testPersonIds() { JuGrix jugrix = new JuGrix(false); LinkedList filterIds = new LinkedList(); diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleDescriptionElementIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleDescriptionElementIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,34 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; +import java.util.LinkedList; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class RoleDescriptionElementIdsTest { + + @Test + public void testRoleDescriptionElementIds(){ + JuGrix jugrix = new JuGrix(true + ); + LinkedList ids = new LinkedList(); + //ids.add("o:34"); + Iterator rdeIds = jugrix.roleDescriptionElementIds("o:2",ids); + Assert.assertEquals(rdeIds.next(),"rde:3"); + Assert.assertEquals(rdeIds.next(),"rde:2"); + Assert.assertEquals(rdeIds.next(),"rde:10"); + Assert.assertEquals(rdeIds.next(),"rde:1"); + + jugrix = new JuGrix(true); + ids = new LinkedList(); + //ids.add("o:34"); + rdeIds = jugrix.roleDescriptionElementIds("o:2",ids); + Assert.assertEquals(rdeIds.next(),"rde:3"); + Assert.assertEquals(rdeIds.next(),"rde:2"); + Assert.assertEquals(rdeIds.next(),"rde:10"); + Assert.assertEquals(rdeIds.next(),"rde:1"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,39 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import java.util.Iterator; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class RoleIdsTest { + + @Test + public void testRoleIds() { + JuGrix jugrix = new JuGrix(false); + Iterator orgIds = jugrix.roleIds("o:6"); + orgIds.hasNext(); + Assert.assertEquals(orgIds.next(), "r:18"); + Assert.assertFalse(orgIds.hasNext()); + + Iterator personIds = jugrix.roleIds("p:1"); + personIds.hasNext(); + Assert.assertEquals(personIds.next(), "r:34"); + personIds.hasNext(); + Assert.assertEquals(personIds.next(), "r:10"); + + jugrix = new JuGrix(true); + orgIds = jugrix.roleIds("o:6"); + orgIds.hasNext(); + Assert.assertEquals(orgIds.next(), "r:18"); + Assert.assertFalse(orgIds.hasNext()); + + personIds = jugrix.roleIds("p:1"); + personIds.hasNext(); + Assert.assertEquals(personIds.next(), "r:34"); + personIds.hasNext(); + Assert.assertEquals(personIds.next(), "r:10"); + + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RolePriorityTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RolePriorityTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,20 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import org.junit.Test; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +public class RolePriorityTest { + + @Test + public void testRolePriority(){ + JuGrix jugrix = new JuGrix(false); + String priority = jugrix.rolePriority("p:1", "r:34"); + Assert.assertEquals(priority,"1"); + + jugrix = new JuGrix(true); + priority = jugrix.rolePriority("p:1", "r:34"); + Assert.assertEquals(priority,"1"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/StringPathToIdTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/StringPathToIdTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -0,0 +1,23 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import junit.framework.Assert; + +import org.junit.Test; + +public class StringPathToIdTest { + @Test + public void testStringPathToId() { + JuGrix jugrix = new JuGrix(false); + String id = jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ"); + Assert.assertEquals(id, "r:43"); + id = jugrix.stringPathToId("rde:path:システム開発申請書/組織的役割/起票部署"); + Assert.assertEquals(id, "rde:10"); + + jugrix = new JuGrix(true); + id = jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ"); + Assert.assertEquals(id, "r:43"); + id = jugrix.stringPathToId("rde:path:システム開発申請書/組織的役割/起票部署"); + Assert.assertEquals(id, "rde:10"); + } +} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/childOrganizationIds.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/childOrganizationIds.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import org.junit.Assert; -import org.junit.Test; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; - -public class childOrganizationIds { - - @Test - public void childOrganizationIdsTest(){ - JuGrix jugrix = new JuGrix(false); - LinkedList list = new LinkedList(); - Iterator ids = jugrix.childOrganizationIds("o:2", list); - - Assert.assertTrue(ids.hasNext()); - - Assert.assertEquals(ids.next(),"o:9"); - Assert.assertEquals(ids.next(),"o:3"); - - JuGrix indexJugrix = new JuGrix(true); - ids = indexJugrix.childOrganizationIds("o:2", list); - - Assert.assertTrue(ids.hasNext()); - - Assert.assertEquals(ids.next(),"o:9"); - Assert.assertEquals(ids.next(),"o:3"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/competentRoleIdTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/competentRoleIdTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class competentRoleIdTest { - - @Test - public void competentRoleIdTest(){ - JuGrix jugrix = new JuGrix(false); - Iterator roleIds = jugrix.competentRoleId("p:1"); - Assert.assertTrue(roleIds.hasNext()); - Assert.assertEquals(roleIds.next(), "r:10"); - - jugrix = new JuGrix(true); - roleIds = jugrix.competentRoleId("p:1"); - Assert.assertTrue(roleIds.hasNext()); - Assert.assertEquals(roleIds.next(), "r:10"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/concurrentRoleIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/concurrentRoleIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; - -import org.junit.Test; -import org.junit.experimental.theories.suppliers.TestedOn; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -public class concurrentRoleIdsTest { - - @Test - public void concurrentRoleIdsTest() { - JuGrix jugrix = new JuGrix(false); - Iterator roleIds = jugrix.concurrentRoleIds("p:1"); - Assert.assertTrue(roleIds.hasNext()); - Assert.assertEquals(roleIds.next(), "r:34"); - - jugrix = new JuGrix(true); - roleIds = jugrix.concurrentRoleIds("p:1"); - Assert.assertTrue(roleIds.hasNext()); - Assert.assertEquals(roleIds.next(), "r:34"); - - roleIds = jugrix.concurrentRoleIds("p:48"); - Assert.assertFalse(roleIds.hasNext()); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepChildOrganizationIdsPlusTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepChildOrganizationIdsPlusTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; - -import org.junit.Assert; -import org.junit.Test; - -public class deepChildOrganizationIdsPlusTest { - - @Test - public void deepChildOrganizationIdsPlusTest(){ - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - filterIds.add("r:9"); - Iterator childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(),"o:2"); - - filterIds = new LinkedList(); - filterIds.add("r:5"); - childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(),"o:4"); - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - filterIds.add("r:9"); - childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(),"o:2"); - - filterIds = new LinkedList(); - filterIds.add("r:5"); - childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(),"o:4"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepChildOrganizationIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepChildOrganizationIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import org.junit.Test; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -public class deepChildOrganizationIdsTest { - - @Test - public void deepChildOrganizationIdsTest() { - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - filterIds.add("r:5"); - Iterator childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); - - Assert.assertTrue(childrenIds.hasNext()); - String childrenId = childrenIds.next(); - Assert.assertEquals(childrenId, "o:4"); - - filterIds.add("rde:4"); - childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); - - Assert.assertTrue(childrenIds.hasNext()); - childrenId = childrenIds.next(); - Assert.assertEquals(childrenId, "o:4"); - - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - filterIds.add("r:5"); - childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); - - Assert.assertTrue(childrenIds.hasNext()); - childrenId = childrenIds.next(); - Assert.assertEquals(childrenId, "o:4"); - - filterIds.add("rde:4"); - childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds); - - Assert.assertTrue(childrenIds.hasNext()); - childrenId = childrenIds.next(); - Assert.assertEquals(childrenId, "o:4"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepParentOrganizationIdsPlusTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepParentOrganizationIdsPlusTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class deepParentOrganizationIdsPlusTest { - @Test - public void deepParentOrganizationIdsPlus(){ - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - //filterIds.add("r:2"); - Iterator childrenIds = jugrix.deepParentOrganizationIdsPlus("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - Assert.assertEquals(childrenIds.next(),"o:22"); - Assert.assertEquals(childrenIds.next(),"o:2"); - - filterIds.add("r:2"); - childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - - Assert.assertEquals(childrenIds.next(),"o:23"); - - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - //filterIds.add("r:2"); - childrenIds = jugrix.deepParentOrganizationIdsPlus("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - Assert.assertEquals(childrenIds.next(),"o:22"); - Assert.assertEquals(childrenIds.next(),"o:2"); - - filterIds.add("r:2"); - childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - - Assert.assertEquals(childrenIds.next(),"o:23"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepParentOrganizationIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepParentOrganizationIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class deepParentOrganizationIdsTest { - - @Test - public void deepParentOrganizationIds(){ - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - Iterator childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - Assert.assertEquals(childrenIds.next(),"o:22"); - - filterIds.add("r:2"); - childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - Assert.assertEquals(childrenIds.next(),"o:22"); - - filterIds.add("r:2"); - childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds); - Assert.assertEquals(childrenIds.next(),"o:23"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepPersonIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/deepPersonIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; - -import org.junit.Test; - -public class deepPersonIdsTest { - @Test - public void deepPersonIdsTest(){ - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - //filterIds.add("r:9"); - Iterator ids = jugrix.deepPersonIds("o:3",filterIds); - System.out.println("------------------------------------------------"); - for (;ids.hasNext();) { - System.out.println(ids.next()); - } - - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - //filterIds.add("r:9"); - ids = jugrix.deepPersonIds("o:3",filterIds); - System.out.println("------------------------------------------------"); - for (;ids.hasNext();) { - System.out.println(ids.next()); - } - } - - -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/isActiveTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/isActiveTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Iterator; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser; - -import org.junit.Assert; -import org.junit.Test; -import org.xml.sax.SAXException; - -import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.ReadXmlHandler; -import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.loadXml; - -public class isActiveTest { - - @Test - public void Person_idsTest(){ - - JuGrix jugrix = new JuGrix(false); - String personId = "p:1"; - - Assert.assertTrue(jugrix.isActive(personId)); - - personId = "p:100"; - Assert.assertFalse(jugrix.isActive(personId)); - - jugrix = new JuGrix(true); - personId = "p:1"; - Assert.assertTrue(jugrix.isActive(personId)); - - personId = "p:100"; - Assert.assertFalse(jugrix.isActive(personId)); - } - -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/parentOrganizationIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/parentOrganizationIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class parentOrganizationIdsTest { - @Test - public void parentOrganizationIdsTest() { - JuGrix jugrix = new JuGrix(false); - LinkedList filterIds = new LinkedList(); - filterIds.add("r:2"); - Iterator childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(), "o:23"); - - filterIds.add("r:2a"); - childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); - Assert.assertFalse(childrenIds.hasNext()); - - jugrix = new JuGrix(true); - filterIds = new LinkedList(); - filterIds.add("r:2"); - childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); - Assert.assertTrue(childrenIds.hasNext()); - Assert.assertEquals(childrenIds.next(), "o:23"); - - filterIds.add("r:2a"); - childrenIds = jugrix.parentOrganizationIds("o:2", filterIds); - Assert.assertFalse(childrenIds.hasNext()); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleDescriptionElementIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleDescriptionElementIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; -import java.util.LinkedList; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; -import junit.framework.Assert; - -import org.junit.Test; - -public class roleDescriptionElementIdsTest { - - @Test - public void roleDescriptionElementIdsTest(){ - JuGrix jugrix = new JuGrix(true - ); - LinkedList ids = new LinkedList(); - //ids.add("o:34"); - Iterator rdeIds = jugrix.roleDescriptionElementIds("o:2",ids); - Assert.assertEquals(rdeIds.next(),"rde:3"); - Assert.assertEquals(rdeIds.next(),"rde:2"); - Assert.assertEquals(rdeIds.next(),"rde:10"); - Assert.assertEquals(rdeIds.next(),"rde:1"); - - jugrix = new JuGrix(true); - ids = new LinkedList(); - //ids.add("o:34"); - rdeIds = jugrix.roleDescriptionElementIds("o:2",ids); - Assert.assertEquals(rdeIds.next(),"rde:3"); - Assert.assertEquals(rdeIds.next(),"rde:2"); - Assert.assertEquals(rdeIds.next(),"rde:10"); - Assert.assertEquals(rdeIds.next(),"rde:1"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleIdsTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import java.util.Iterator; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class roleIdsTest { - - @Test - public void roleIdsTest() { - JuGrix jugrix = new JuGrix(false); - Iterator orgIds = jugrix.roleIds("o:6"); - orgIds.hasNext(); - Assert.assertEquals(orgIds.next(), "r:18"); - Assert.assertFalse(orgIds.hasNext()); - - Iterator personIds = jugrix.roleIds("p:1"); - personIds.hasNext(); - Assert.assertEquals(personIds.next(), "r:34"); - personIds.hasNext(); - Assert.assertEquals(personIds.next(), "r:10"); - - jugrix = new JuGrix(true); - orgIds = jugrix.roleIds("o:6"); - orgIds.hasNext(); - Assert.assertEquals(orgIds.next(), "r:18"); - Assert.assertFalse(orgIds.hasNext()); - - personIds = jugrix.roleIds("p:1"); - personIds.hasNext(); - Assert.assertEquals(personIds.next(), "r:34"); - personIds.hasNext(); - Assert.assertEquals(personIds.next(), "r:10"); - - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/rolePriorityTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/rolePriorityTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import org.junit.Test; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -public class rolePriorityTest { - - @Test - public void rolePriorityTest(){ - JuGrix jugrix = new JuGrix(false); - String priority = jugrix.rolePriority("p:1", "r:34"); - Assert.assertEquals(priority,"1"); - - jugrix = new JuGrix(true); - priority = jugrix.rolePriority("p:1", "r:34"); - Assert.assertEquals(priority,"1"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/stringPathToIdTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/stringPathToIdTest.java Sat Nov 08 06:31:14 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -package jp.ac.u_ryukyu.cr.ie.tatsuki.functionTest; - -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; -import junit.framework.Assert; - -import org.junit.Test; - -public class stringPathToIdTest { - @Test - public void stringPathToIdTest() { - JuGrix jugrix = new JuGrix(false); - String id = jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ"); - Assert.assertEquals(id, "r:43"); - id = jugrix.stringPathToId("rde:path:システム開発申請書/組織的役割/起票部署"); - Assert.assertEquals(id, "rde:10"); - - jugrix = new JuGrix(true); - id = jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ"); - Assert.assertEquals(id, "r:43"); - id = jugrix.stringPathToId("rde:path:システム開発申請書/組織的役割/起票部署"); - Assert.assertEquals(id, "rde:10"); - } -} diff -r 7f70341a78bc -r b8d86bc46b51 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java Sat Nov 08 06:31:14 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java Sun Nov 09 17:56:49 2014 +0900 @@ -11,7 +11,7 @@ @Test public void Readml(){ long t1 = System.currentTimeMillis(); - JuGrix jugrix = new JuGrix(true); + new JuGrix(true); long t2 = System.currentTimeMillis(); System.out.println(t2 - t1 + "s"); }