You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/07/11 17:34:02 UTC
svn commit: r1360230 - in
/incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl:
JCRRegistryDeleteTest.java JCRRegistryRestartTest.java
JCRRegistrySearchTest.java JCRRegistryTest.java
Author: lahiru
Date: Wed Jul 11 15:34:02 2012
New Revision: 1360230
URL: http://svn.apache.org/viewvc?rev=1360230&view=rev
Log:
fixing test failures
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryDeleteTest.java
incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryRestartTest.java
incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistrySearchTest.java
incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryTest.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryDeleteTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryDeleteTest.java?rev=1360230&r1=1360229&r2=1360230&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryDeleteTest.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryDeleteTest.java Wed Jul 11 15:34:02 2012
@@ -29,6 +29,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import javax.jcr.RepositoryException;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -64,7 +65,10 @@ public class JCRRegistryDeleteTest {
HostDescription hostR = jcrRegistry.getHostDescription(hostId);
Assert.assertNull(hostR);
-
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ System.out.println((new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit1")).getAbsolutePath());
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit1"));
} catch (Exception e) {
e.printStackTrace();
@@ -74,13 +78,14 @@ public class JCRRegistryDeleteTest {
@Test
public void testServiceDescriptionDelete() {
+ AiravataJCRRegistry jcrRegistry = null;
try {
/*
* Create database
*/
Map<String,String> config = new HashMap<String,String>();
config.put("org.apache.jackrabbit.repository.home","target" + File.separator + "jackrabbit2");
- AiravataJCRRegistry jcrRegistry = new AiravataJCRRegistry(null, "org.apache.jackrabbit.core.RepositoryFactoryImpl",
+ jcrRegistry = new AiravataJCRRegistry(null, "org.apache.jackrabbit.core.RepositoryFactoryImpl",
"admin", "admin", config);
ServiceDescription serv = new ServiceDescription();
@@ -109,8 +114,18 @@ public class JCRRegistryDeleteTest {
jcrRegistry.deleteServiceDescription(serv.getType().getName());
jcrRegistry.getServiceDescription(serv.getType().getName());
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
} catch (Exception e) {
junit.framework.Assert.assertTrue(true);
+ try {
+ jcrRegistry.getSession().logout();
+ } catch (RepositoryException e1) {
+ e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ System.out.println((new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit2")).getAbsolutePath());
+ System.out.println("************");
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit2"));
return;
}
Assert.assertTrue(false);
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryRestartTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryRestartTest.java?rev=1360230&r1=1360229&r2=1360230&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryRestartTest.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryRestartTest.java Wed Jul 11 15:34:02 2012
@@ -77,6 +77,9 @@ public class JCRRegistryRestartTest {
}else{
Assert.assertTrue(true);
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit3"));
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistrySearchTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistrySearchTest.java?rev=1360230&r1=1360229&r2=1360230&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistrySearchTest.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistrySearchTest.java Wed Jul 11 15:34:02 2012
@@ -139,6 +139,9 @@ public class JCRRegistrySearchTest {
}else{
Assert.assertEquals("SimpleEchoSearch",simpleEcho.get(0).getType().getName());
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit10"));
} catch (RepositoryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (RegistryException e) {
@@ -240,6 +243,9 @@ public class JCRRegistrySearchTest {
}else{
Assert.assertEquals(3,applicationDeploymentDescriptionStringMap.size());
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit11"));
} catch (RepositoryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (RegistryException e) {
@@ -343,6 +349,9 @@ public class JCRRegistrySearchTest {
}else{
Assert.assertEquals(1,applicationDeploymentDescriptions.size());
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit12"));
} catch (RepositoryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (RegistryException e) {
@@ -445,6 +454,9 @@ public class JCRRegistrySearchTest {
}else{
Assert.assertEquals(2,simpleEchoSearch.size());
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit13"));
} catch (RepositoryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (RegistryException e) {
@@ -547,6 +559,9 @@ public class JCRRegistrySearchTest {
}else{
Assert.assertEquals(1,applicationDeploymentDescriptions.size());
}
+ jcrRegistry.closeConnection();
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit14"));
} catch (RepositoryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (RegistryException e) {
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryTest.java?rev=1360230&r1=1360229&r2=1360230&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryTest.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/JCRRegistryTest.java Wed Jul 11 15:34:02 2012
@@ -94,6 +94,9 @@ public class JCRRegistryTest {
// if(!(hg.getType() instanceof GlobusHostType))
// fail("Save and Load Host Type Fail with Different Type when loading");
+ jcrRegistry.closeConnection();
+ System.out.println((new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit4")).getAbsolutePath());
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit4"));
} catch (Exception e) {
e.printStackTrace();
@@ -151,8 +154,10 @@ public class JCRRegistryTest {
if(service.getType().getOutputParametersArray()== null || service.getType().getOutputParametersArray().length != 1){
fail("Input Parameters is missing");
}
-
-
+
+
+ jcrRegistry.closeConnection();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit4"));
} catch (Exception e) {
e.printStackTrace();
@@ -231,7 +236,8 @@ public class JCRRegistryTest {
fail("Setting and Loading value fail");
}
-
+ jcrRegistry.closeConnection();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target" + File.separator + "jackrabbit5"));
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());