Author: dgrebenyuk Date: 2009-08-31 03:53:02 -0400 (Mon, 31 Aug 2009) New Revision: 114 Removed: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/JDBCConnectionBaseTest.java jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionEditTest.java jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionFindTest.java jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionEditTest.java jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionFindTest.java Log: Remove wrong test classes. Deleted: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/JDBCConnectionBaseTest.java =================================================================== --- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/JDBCConnectionBaseTest.java 2009-08-28 20:02:13 UTC (rev 113) +++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/JDBCConnectionBaseTest.java 2009-08-31 07:53:02 UTC (rev 114) @@ -1,137 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.storage.jdbc.db; - -import java.sql.*; -import org.exoplatform.services.jcr.datamodel.InternalQName; -import org.exoplatform.services.jcr.datamodel.NodeData; -import org.exoplatform.services.jcr.impl.Constants; -import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; -import junit.framework.TestCase; - -public class JDBCConnectionBaseTest - extends TestCase -{ - final String URL = "jdbc:mysql://mysql.exoua-int/test"; - - final String USER = "asistant"; - - final String PASSWORD = "asistant"; - - public Connection connect = null; - - public MultiDbJDBCConnection mdbc = null; - - public SingleDbJDBCConnection sdbc = null; - - public Statement st = null; - - public ResultSet rs; - - @Override - public void setUp() throws Exception - { - - super.setUp(); - DriverManager.registerDriver((Driver) Class.forName("com.mysql.jdbc.Driver").newInstance()); - connect = DriverManager.getConnection(URL, USER, PASSWORD); - st = connect.createStatement(); - try - { - st.executeUpdate("insert into JCR_SITEM values" - + "('12345','123456','Sam',20090525,'myContainer',2,1233,5,10,1)"); - st.executeUpdate("insert into JCR_SITEM values" - + "('myContainer123','1235','Nick',20090625,'myContainer',1,1233,5,10,1)"); - st.executeUpdate("insert into JCR_SVALUE values" + "(12,'hello',16,'12345','Say')"); - st.executeUpdate("insert into JCR_SVALUE values" + "(127,'love',16,'aa74d2','java')"); - st.executeUpdate("insert into JCR_SREF values" + "('45as1','12345',2)"); - st.executeUpdate("insert into JCR_SREF values" + "('78710','5987',2)"); - sdbc = new SingleDbJDBCConnection(connect, false, "myContainer", null, 10, null, null); - - st.executeUpdate("insert into JCR_MITEM values" + "('12345','123456','Sam',20090525,2,1233,5,10,1)"); - st.executeUpdate("insert into JCR_MITEM values" + "('123','1235','Nick',20090625,1,1233,5,10,1)"); - st.executeUpdate("insert into JCR_MVALUE values" + "(12,'hello',16,'12345','Say')"); - st.executeUpdate("insert into JCR_MVALUE values" + "(45,'winner',15,'1278','beauty')"); - st.executeUpdate("insert into JCR_MREF values" + "('45re1','00214',2)"); - st.executeUpdate("insert into JCR_MREF values" + "('45as1','12345',2)"); - mdbc = new MultiDbJDBCConnection(connect, false, "mycontainer", null, 10, null, null); - } - catch (SQLException se) - { - fail(se.toString()); - } - } - - @Override - protected void tearDown() throws Exception - { - - try - { - st.executeUpdate("delete from JCR_SITEM"); - st.executeUpdate("delete from JCR_SVALUE"); - st.executeUpdate("delete from JCR_SREF"); - st.executeUpdate("delete from JCR_MITEM"); - st.executeUpdate("delete from JCR_MVALUE"); - st.executeUpdate("delete from JCR_MREF"); - - } - catch (SQLException se) - { - fail(se.toString()); - } - finally - { - st.close(); - connect.close(); - } - super.tearDown(); - } - - public NodeData giveNode() throws Exception - { - InternalQName[] iqn = - {InternalQName.parse("[]DbJDBCConnectionEditTest")}; - TransientNodeData tnd = - new TransientNodeData(Constants.JCR_NODETYPES_PATH, "123", 2, Constants.SV_NODE_NAME, iqn, 7, "4512", - null); - return tnd; - } - - public NodeData setNode() throws Exception - { - InternalQName[] iqn = - {InternalQName.parse("[]DbJDBCConnectionEditTest")}; - TransientNodeData tnd = - new TransientNodeData(Constants.JCR_NODETYPES_PATH, "245", 9, Constants.SV_NODE_NAME, iqn, 8, "7870", - null); - return tnd; - } - - public void makeFindDB(String sql) throws Exception - { - rs = st.executeQuery(sql); - rs.next(); - } - - public void ifDeleted(String sql) throws Exception - { - rs = st.executeQuery(sql); - } -} \ No newline at end of file Deleted: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionEditTest.java =================================================================== --- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionEditTest.java 2009-08-28 20:02:13 UTC (rev 113) +++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionEditTest.java 2009-08-31 07:53:02 UTC (rev 114) @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.storage.jdbc.db; - -import java.io.*; - -public class MultiDbJDBCConnectionEditTest - extends JDBCConnectionBaseTest -{ - public void testAddNode() throws Exception - { - mdbc.add(setNode()); - makeFindDB("select * from JCR_MITEM where N_ORDER_NUM=8"); - assertEquals(8, rs.getInt("N_ORDER_NUM")); - } - - public void testAddValueData() throws Exception - { - byte data[] = - {Byte.parseByte("2")}; - ByteArrayInputStream bas = new ByteArrayInputStream(data); - mdbc.addValueData("45", 2, bas, 13, "000"); - makeFindDB("select * from JCR_MVALUE where PROPERTY_ID='45'"); - assertEquals("45", rs.getString("PROPERTY_ID")); - } - - public void testRenameNode() throws Exception - { - mdbc.renameNode(giveNode()); - makeFindDB("select * from JCR_MITEM where ID='12345'"); - assertEquals("123456", rs.getString("PARENT_ID")); - } - - public void testUpdateNodeByIdentifier() throws Exception - { - mdbc.updateNodeByIdentifier(200923, 4512, 20, "12345"); - makeFindDB("select * from JCR_MITEM where ID='12345'"); - assertEquals(4512, rs.getInt("I_INDEX")); - } - - public void testUpdatePropertyByIdentifier() throws Exception - { - mdbc.updatePropertyByIdentifier(200923, 4512, "12345"); - makeFindDB("select * from JCR_MITEM where ID='12345'"); - assertEquals(200923, rs.getInt("VERSION")); - } - - public void testDeleteReference() throws Exception - { - mdbc.deleteReference("00214"); - ifDeleted("select * from JCR_MREF where PROPERTY_ID='00214'"); - assertEquals(false, rs.next()); - } - - public void testDeleteItemByIdentifier() throws Exception - { - mdbc.deleteItemByIdentifier("123"); - ifDeleted("select * from JCR_MITEM where ID='123'"); - assertEquals(false, rs.next()); - } - - public void testDeleteValueData() throws Exception - { - mdbc.deleteValueData("12345"); - ifDeleted("select * from JCR_MVALUE where PROPERTY_ID='12345'"); - assertEquals(false, rs.next()); - } -} \ No newline at end of file Deleted: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionFindTest.java =================================================================== --- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionFindTest.java 2009-08-28 20:02:13 UTC (rev 113) +++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnectionFindTest.java 2009-08-31 07:53:02 UTC (rev 114) @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.storage.jdbc.db; - -import java.sql.*; - -public class MultiDbJDBCConnectionFindTest - extends JDBCConnectionBaseTest -{ - public void testFindItemByIdentifier() throws Exception - { - ResultSet rsRemote = mdbc.findItemByIdentifier("12345"); - rsRemote.next(); - makeFindDB("select * from JCR_MITEM where ID='12345'"); - assertEquals(rs.getString("ID"), rsRemote.getString("ID")); - } - - public void testFindPropertyByName() throws Exception - { - ResultSet rsRemote = mdbc.findPropertyByName("123456", "Sam"); - rsRemote.next(); - makeFindDB("select V.DATA" - + " from JCR_MITEM I,JCR_MVALUE V" - + " where I.I_CLASS=2 and I.PARENT_ID='123456' and I.Name='Sam' and I.ID=V.PROPERTY_ID order by V.ORDER_NUM"); - assertEquals(rs.getString("DATA"), rsRemote.getString("DATA")); - } - - public void testFindItemByName() throws Exception - { - ResultSet rsRemote = mdbc.findItemByName("123456", "Sam", 1233); - rsRemote.next(); - makeFindDB("select * from JCR_MITEM where PARENT_ID='123456' and NAME='Sam' and I_INDEX=1233"); - assertTrue(rs.getInt("I_INDEX") == rsRemote.getInt("I_INDEX")); - } - - public void testFindChildNodesByParentIdentifier() throws Exception - { - ResultSet rsRemote = mdbc.findChildNodesByParentIdentifier("1235"); - rsRemote.next(); - makeFindDB("select * from JCR_MITEM where I_CLASS=1 and PARENT_ID='1235'"); - assertEquals(rs.getString("PARENT_ID"), rsRemote.getString("PARENT_ID")); - } - - public void testFindChildPropertiesByParentIdentifier() throws Exception - { - ResultSet rsRemote = mdbc.findChildPropertiesByParentIdentifier("123456"); - rsRemote.next(); - makeFindDB("select * from JCR_MITEM where I_CLASS=2 and PARENT_ID='123456' order by ID"); - assertEquals(rs.getString("PARENT_ID"), rsRemote.getString("PARENT_ID")); - } - - public void testFindReferences() throws Exception - { - ResultSet rsRemote = mdbc.findReferences("45as1"); - rsRemote.next(); - makeFindDB("select P.ID, P.PARENT_ID, P.VERSION, P.P_TYPE, P.P_MULTIVALUED, P.NAME" - + " from JCR_MREF R, JCR_MITEM P" + " where R.NODE_ID='45as1' and P.ID=R.PROPERTY_ID and P.I_CLASS=2"); - assertEquals(rs.getString("ID"), rsRemote.getString("ID")); - } - - public void testFindValuesByPropertyId() throws Exception - { - ResultSet rsRemote = mdbc.findValuesByPropertyId("12345"); - rsRemote.next(); - makeFindDB("select PROPERTY_ID, ORDER_NUM, STORAGE_DESC from JCR_MVALUE where PROPERTY_ID='12345' order by ORDER_NUM"); - assertEquals(rs.getString("PROPERTY_ID"), rsRemote.getString("PROPERTY_ID")); - } - - public void testFindValueByPropertyIdOrderNumber() throws Exception - { - ResultSet rsRemote = mdbc.findValueByPropertyIdOrderNumber("12345", 16); - rsRemote.next(); - makeFindDB("select DATA from JCR_MVALUE where PROPERTY_ID='12345' and ORDER_NUM=16"); - assertEquals(rs.getString("DATA"), rsRemote.getString("DATA")); - } -} \ No newline at end of file Deleted: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionEditTest.java =================================================================== --- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionEditTest.java 2009-08-28 20:02:13 UTC (rev 113) +++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionEditTest.java 2009-08-31 07:53:02 UTC (rev 114) @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.storage.jdbc.db; - -import java.io.ByteArrayInputStream; - -public class SingleDbJDBCConnectionEditTest - extends JDBCConnectionBaseTest -{ - - public void testAddNode() throws Exception - { - sdbc.add(setNode()); - makeFindDB("select * from JCR_SITEM where N_ORDER_NUM=8"); - assertEquals(8, rs.getInt("N_ORDER_NUM")); - } - - public void testAddValueData() throws Exception - { - byte data[] = - {Byte.parseByte("2")}; - ByteArrayInputStream bas = new ByteArrayInputStream(data); - sdbc.addValueData("45", 2, bas, 13, "000"); - makeFindDB("select * from JCR_SVALUE where PROPERTY_ID='45'"); - assertEquals("45", rs.getString("PROPERTY_ID")); - } - - public void testRenameNode() throws Exception - { - sdbc.renameNode(giveNode()); - makeFindDB("select * from JCR_SITEM where ID='myContainer123'"); - assertEquals("myContainer4512", rs.getString("PARENT_ID")); - } - - public void testUpdateNodeByIdentifier() throws Exception - { - sdbc.updateNodeByIdentifier(200923, 4512, 20, "12345"); - makeFindDB("select * from JCR_SITEM where ID='12345'"); - assertEquals(20, rs.getInt("N_ORDER_NUM")); - } - - public void testUpdatePropertyByIdentifier() throws Exception - { - sdbc.updatePropertyByIdentifier(200923, 4512, "12345"); - makeFindDB("select * from JCR_SITEM where ID='12345'"); - assertEquals(4512, rs.getInt("P_TYPE")); - } - - public void testDeleteReference() throws Exception - { - sdbc.deleteReference("5987"); - ifDeleted("select * from JCR_SREF where PROPERTY_ID='5987'"); - assertEquals(false, rs.next()); - } - - public void testDeleteItemByIdentifier() throws Exception - { - sdbc.deleteItemByIdentifier("myContainer123"); - ifDeleted("select * from JCR_SREF where NODE_ID='myContainer123'"); - assertEquals(false, rs.next()); - } - - public void testDeleteValueData() throws Exception - { - sdbc.deleteValueData("12345"); - ifDeleted("select * from JCR_SVALUE where PROPERTY_ID='12345'"); - assertEquals(false, rs.next()); - } -} \ No newline at end of file Deleted: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionFindTest.java =================================================================== --- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionFindTest.java 2009-08-28 20:02:13 UTC (rev 113) +++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnectionFindTest.java 2009-08-31 07:53:02 UTC (rev 114) @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.storage.jdbc.db; - -import java.sql.*; - -public class SingleDbJDBCConnectionFindTest - extends JDBCConnectionBaseTest -{ - public void testFindItemByIdentifier() throws Exception - { - ResultSet rsRemote = sdbc.findItemByIdentifier("12345"); - rsRemote.next(); - makeFindDB("select * from JCR_SITEM where ID='12345'"); - assertEquals(rs.getString("ID"), rsRemote.getString("ID")); - } - - public void testFindPropertyByName() throws Exception - { - ResultSet rsRemote = sdbc.findPropertyByName("123456", "Sam"); - rsRemote.next(); - makeFindDB("select V.DATA" - + " from JCR_SITEM I, JCR_SVALUE V" - + " where I.I_CLASS=2 and I.CONTAINER_NAME='mycontainer' and I.PARENT_ID='123456' and I.NAME='Sam' and I.ID=V.PROPERTY_ID order by V.ORDER_NUM"); - assertEquals(rs.getString("DATA"), rsRemote.getString("DATA")); - } - - public void testFindItemByName() throws Exception - { - ResultSet rsRemote = sdbc.findItemByName("123456", "Sam", 1233); - rsRemote.next(); - makeFindDB("select * from JCR_SITEM" - + " where CONTAINER_NAME='mycontainer' and PARENT_ID='123456' and NAME='Sam' and I_INDEX=1233 order by I_CLASS, VERSION DESC"); - assertTrue(rs.getInt("I_INDEX") == rsRemote.getInt("I_INDEX")); - } - - public void testFindChildNodesByParentIdentifier() throws Exception - { - ResultSet rsRemote = sdbc.findChildNodesByParentIdentifier("1235"); - rsRemote.next(); - makeFindDB("select * from JCR_SITEM" + " where I_CLASS=1 and CONTAINER_NAME='myContainer' and PARENT_ID='1235'" - + " order by N_ORDER_NUM"); - assertEquals(rs.getString("PARENT_ID"), rsRemote.getString("PARENT_ID")); - } - - public void testFindChildPropertiesByParentIdentifier() throws Exception - { - ResultSet rsRemote = sdbc.findChildPropertiesByParentIdentifier("123456"); - rsRemote.next(); - makeFindDB("select * from JCR_SITEM" + " where I_CLASS=2 and CONTAINER_NAME='mycontainer' and PARENT_ID='123456'" - + " order by ID"); - assertEquals(rs.getString("PARENT_ID"), rsRemote.getString("PARENT_ID")); - } - - public void testFindReferences() throws Exception - { - ResultSet rsRemote = sdbc.findReferences("45as1"); - rsRemote.next(); - makeFindDB("select P.ID, P.PARENT_ID, P.VERSION, P.P_TYPE, P.P_MULTIVALUED, P.NAME" - + " from JCR_SREF R, JCR_SITEM P" - + " where R.NODE_ID='45as1' and P.CONTAINER_NAME='mycontainer' and P.ID=R.PROPERTY_ID and P.I_CLASS=2"); - assertEquals(rs.getString("ID"), rsRemote.getString("ID")); - } - - public void testFindValuesByPropertyId() throws Exception - { - ResultSet rsRemote = sdbc.findValuesByPropertyId("12345"); - rsRemote.next(); - makeFindDB("select PROPERTY_ID, ORDER_NUM, STORAGE_DESC from JCR_SVALUE where PROPERTY_ID='12345' order by ORDER_NUM"); - assertEquals(rs.getString("PROPERTY_ID"), rsRemote.getString("PROPERTY_ID")); - } - - public void testFindValueByPropertyIdOrderNumber() throws Exception - { - ResultSet rsRemote = sdbc.findValueByPropertyIdOrderNumber("12345", 16); - rsRemote.next(); - makeFindDB("select DATA from JCR_SVALUE where PROPERTY_ID='12345' and ORDER_NUM=16"); - assertEquals(rs.getString("DATA"), rsRemote.getString("DATA")); - } -}