[exo-jcr-commits] exo-jcr SVN: r1057 - in jcr/branches/1.12.0-JBC/component/core/src: test/java/org/exoplatform/services/jcr/cluster and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Dec 15 08:25:53 EST 2009
Author: sergiykarpenko
Date: 2009-12-15 08:25:52 -0500 (Tue, 15 Dec 2009)
New Revision: 1057
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_backup.xml
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_digital-assets.xml
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_production.xml
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddBLOBTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddNodeTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavRemoveNodeTest.java
Log:
EXOJCR-313: cluster functional tests updated - 4 cluster nodes support added
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_backup.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_backup.xml 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_backup.xml 2009-12-15 13:25:52 UTC (rev 1057)
@@ -53,7 +53,7 @@
<!-- <async /> -->
</clustering>
- <loaders passivation="false" shared="false">
+ <loaders passivation="false" shared="true">
<loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader"
async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_digital-assets.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_digital-assets.xml 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_digital-assets.xml 2009-12-15 13:25:52 UTC (rev 1057)
@@ -53,7 +53,7 @@
<!-- <async /> -->
</clustering>
- <loaders passivation="false" shared="false">
+ <loaders passivation="false" shared="true">
<loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader"
async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_production.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_production.xml 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/jbosscache-configuration_repository_production.xml 2009-12-15 13:25:52 UTC (rev 1057)
@@ -53,7 +53,7 @@
<!-- <async /> -->
</clustering>
- <loaders passivation="false" shared="false">
+ <loaders passivation="false" shared="true">
<loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader"
async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java 2009-12-15 13:25:52 UTC (rev 1057)
@@ -35,12 +35,24 @@
*/
public abstract class BaseClusteringFunctionalTest extends TestCase
{
- protected JCRWebdavConnection connection;
+ protected JCRWebdavConnection connection1;
+ protected JCRWebdavConnection connection2;
+
+ protected JCRWebdavConnection connection3;
+
+ protected JCRWebdavConnection connection4;
+
private String host = "localhost";
- private int port = 8080;
+ private int port1 = 8081;//8080;
+ private int port2 = 8082;
+
+ private int port3 = 8083;
+
+ private int port4 = 8084;
+
private String realm = "eXo REST services";
private String user = "root";
@@ -59,7 +71,10 @@
super.setUp();
CookieModule.setCookiePolicyHandler(null);
- connection = new JCRWebdavConnection(host, port, user, password, realm, workspacePath);
+ connection1 = new JCRWebdavConnection(host, port1, user, password, realm, workspacePath);
+ connection2 = new JCRWebdavConnection(host, port2, user, password, realm, workspacePath);
+ connection3 = new JCRWebdavConnection(host, port3, user, password, realm, workspacePath);
+ connection4 = new JCRWebdavConnection(host, port4, user, password, realm, workspacePath);
nodeName = generateUniqueName("removed_node_over_webdav");
}
@@ -76,8 +91,8 @@
{
super.tearDown();
- connection.removeNode(nodeName);
- connection.stop();
+ connection1.removeNode(nodeName);
+ connection1.stop();
}
protected File createBLOBTempFile(String prefix, int sizeInKb) throws IOException
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddBLOBTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddBLOBTest.java 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddBLOBTest.java 2009-12-15 13:25:52 UTC (rev 1057)
@@ -41,41 +41,49 @@
*/
private int sizeInMb = 5;
- //File blobFile = null;
-
public void testAddBLOB() throws Exception
{
+ // make a test blob
byte[] data = new byte[sizeInMb * 1024 * 1024];
Random random = new Random();
random.nextBytes(data);
+ // add node with blob data
HttpOutputStream stream = new HttpOutputStream();
-
- HTTPResponse response = connection.addNode(nodeName, stream);
+ HTTPResponse response = connection1.addNode(nodeName, stream);
loadStream(stream, new ByteArrayInputStream(data));
stream.close();
response.getStatusCode();
- // check results
- response = connection.getNode(nodeName);
-
+ // check results
+ // cluster-node1
+ response = connection1.getNode(nodeName);
assertEquals(response.getStatusCode(), 200);
byte[] respData = response.getData();
assertEquals(data.length, respData.length);
assertTrue(java.util.Arrays.equals(data, respData));
- }
- protected void loadStream(HttpOutputStream stream, int sizeInKb) throws IOException
- {
- byte[] data = new byte[1024]; // 1Kb
+ // cluster-node2
+ response = connection2.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
+ respData = response.getData();
+ assertEquals(data.length, respData.length);
+ assertTrue(java.util.Arrays.equals(data, respData));
- Random random = new Random();
+ // cluster-node3
+ response = connection3.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
+ respData = response.getData();
+ assertEquals(data.length, respData.length);
+ assertTrue(java.util.Arrays.equals(data, respData));
- for (int i = 0; i < sizeInKb; i++)
- {
- random.nextBytes(data);
- stream.write(data);
- }
+ // cluster-node4
+ response = connection4.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
+ respData = response.getData();
+ assertEquals(data.length, respData.length);
+ assertTrue(java.util.Arrays.equals(data, respData));
+
}
protected void loadStream(HttpOutputStream stream, InputStream in) throws IOException
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddNodeTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddNodeTest.java 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavAddNodeTest.java 2009-12-15 13:25:52 UTC (rev 1057)
@@ -27,20 +27,35 @@
* @author <a href="mailto:alex.reshetnyak at exoplatform.com.ua">Alex Reshetnyak</a>
* @version $Id$
*/
-public class WebdavAddNodeTest
- extends BaseClusteringFunctionalTest
+public class WebdavAddNodeTest extends BaseClusteringFunctionalTest
{
public void testAddNode() throws Exception
{
- // add
- connection.addNode(nodeName, "_data_".getBytes());
-
- // check
- HTTPResponse response = connection.getNode(nodeName);
-
+ // add node
+ connection1.addNode(nodeName, "_data_".getBytes());
+
+ // check is node exist
+ // cluster-node1
+ HTTPResponse response = connection1.getNode(nodeName);
assertEquals(response.getStatusCode(), 200);
- assertTrue("_data_".equals(new String(response.getData())));
+ assertTrue("_data_".equals(new String(response.getData())));
+
+ // cluster-node2
+ HTTPResponse response2 = connection2.getNode(nodeName);
+ assertEquals(response2.getStatusCode(), 200);
+ assertTrue("_data_".equals(new String(response2.getData())));
+
+ // cluster-node3
+ HTTPResponse response3 = connection3.getNode(nodeName);
+ assertEquals(response3.getStatusCode(), 200);
+ assertTrue("_data_".equals(new String(response3.getData())));
+
+ // cluster-node4
+ HTTPResponse response4 = connection4.getNode(nodeName);
+ assertEquals(response4.getStatusCode(), 200);
+ assertTrue("_data_".equals(new String(response4.getData())));
+
}
-
+
}
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavRemoveNodeTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavRemoveNodeTest.java 2009-12-15 12:31:47 UTC (rev 1056)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/cluster/functional/WebdavRemoveNodeTest.java 2009-12-15 13:25:52 UTC (rev 1057)
@@ -31,20 +31,41 @@
{
public void testRemoveNode() throws Exception
{
- // add
- connection.addNode(nodeName, "".getBytes());
+ // add test node
+ connection1.addNode(nodeName, "".getBytes());
- HTTPResponse response = connection.getNode(nodeName);
-
+ // check is exist cluster-node1
+ HTTPResponse response = connection1.getNode(nodeName);
assertEquals(response.getStatusCode(), 200);
+ //cluster-node2
+ response = connection2.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
+ //cluster-node3
+ response = connection3.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
+ //cluster-node4
+ response = connection4.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 200);
- // remove
- connection.removeNode(nodeName);
+ // remove node on cluster-node2
+ connection2.removeNode(nodeName);
- // check
- response = connection.getNode(nodeName);
+ // check cluster-node1
+ response = connection1.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 404);
+ // cluster-node2
+ response = connection2.getNode(nodeName);
assertEquals(response.getStatusCode(), 404);
+
+ // cluster-node3
+ response = connection3.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 404);
+
+ // cluster-node4
+ response = connection4.getNode(nodeName);
+ assertEquals(response.getStatusCode(), 404);
+
}
}
More information about the exo-jcr-commits
mailing list