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 2011/12/22 03:50:37 UTC
svn commit: r1222011 - in
/incubator/airavata/trunk/modules/commons/registry-api: ./
src/test/java/org/apache/airavata/registry/api/impl/
Author: lahiru
Date: Thu Dec 22 02:50:36 2011
New Revision: 1222011
URL: http://svn.apache.org/viewvc?rev=1222011&view=rev
Log:
dding more tests.
Modified:
incubator/airavata/trunk/modules/commons/registry-api/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/pom.xml?rev=1222011&r1=1222010&r2=1222011&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/pom.xml Thu Dec 22 02:50:36 2011
@@ -41,6 +41,11 @@
<artifactId>gfac-schema-utils</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Test -->
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=1222011&r1=1222010&r2=1222011&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 Thu Dec 22 02:50:36 2011
@@ -20,13 +20,16 @@
*/
package org.apache.airavata.registry.api.impl;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -106,4 +109,12 @@ public class JCRRegistryDeleteTest {
}
Assert.assertTrue(false);
}
+
+ @After
+ public void cleanup(){
+ File jackrabbit = new File(".");
+ String s = jackrabbit.getAbsolutePath() + File.separator +
+ "modules" + File.separator + "registry-api" + File.separator +"jackrabbit";
+ IOUtil.deleteDirectory(new File(s));
+ }
}
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=1222011&r1=1222010&r2=1222011&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 Thu Dec 22 02:50:36 2011
@@ -20,11 +20,13 @@
*/
package org.apache.airavata.registry.api.impl;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.jackrabbit.core.RepositoryFactoryImpl;
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.xmlbeans.XmlString;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -32,6 +34,8 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
+import java.io.File;
+
import static org.junit.Assert.fail;
public class JCRRegistryRestartTest {
@@ -66,5 +70,12 @@ public class JCRRegistryRestartTest {
fail(e.getMessage());
}
}
+ @After
+ public void cleanup(){
+ File jackrabbit = new File(".");
+ String s = jackrabbit.getAbsolutePath() + File.separator +
+ "modules" + File.separator + "registry-api" + File.separator +"jackrabbit";
+ IOUtil.deleteDirectory(new File(s));
+ }
}
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=1222011&r1=1222010&r2=1222011&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 Thu Dec 22 02:50:36 2011
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.api.impl;
import junit.framework.Assert;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
@@ -29,12 +30,15 @@ import org.apache.airavata.schemas.gfac.
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
import org.apache.airavata.schemas.gfac.StringParameterType;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import javax.jcr.RepositoryException;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
public class JCRRegistrySearchTest {
@Before
@@ -109,12 +113,14 @@ public class JCRRegistrySearchTest {
*/
jcrRegistry.saveHostDescription(host);
jcrRegistry.saveHostDescription(host1);
+
jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host
.getType().getHostName(), appDesc);
jcrRegistry.saveDeploymentDescription(serv1.getType().getName(), host
.getType().getHostName(), appDesc);
jcrRegistry.saveDeploymentDescription(serv1.getType().getName(), host1
.getType().getHostName(), appDesc);
+
jcrRegistry.saveServiceDescription(serv);
jcrRegistry.saveServiceDescription(serv1);
jcrRegistry.deployServiceOnHost(serv.getType().getName(), host
@@ -146,24 +152,31 @@ public class JCRRegistrySearchTest {
Assert.assertTrue(true);
}
-// @Test
-// public void searchDeploymentDescriptorTest() {
-// try {
-// JCRRegistry jcrRegistry = new JCRRegistry(null,
-// "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
-// "admin", null);
-// jcrRegistry.searchDeploymentDescription();
-// List<ServiceDescription> simpleEcho = jcrRegistry.searchServiceDescription("SimpleEchoSearch");
-// if(simpleEcho.size() == 0){
-// Assert.assertTrue(false);
-// }else{
-// Assert.assertEquals("SimpleEchoSearch",simpleEcho.get(0).getType().getName());
-// }
-// } catch (RepositoryException e) {
-// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
-// } catch (RegistryException e) {
-// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
-// }
-// Assert.assertTrue(true);
-// }
+ @Test
+ public void searchDeploymentDescriptorTest() {
+ try {
+ JCRRegistry jcrRegistry = new JCRRegistry(null,
+ "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
+ "admin", null);
+ Map<ApplicationDeploymentDescription,String> applicationDeploymentDescriptionStringMap = jcrRegistry.searchDeploymentDescription();
+ if(applicationDeploymentDescriptionStringMap.size() == 0){
+ Assert.assertTrue(false);
+ }else{
+ Assert.assertEquals(3,applicationDeploymentDescriptionStringMap.size());
+ }
+ } catch (RepositoryException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (RegistryException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ Assert.assertTrue(true);
+ }
+
+ @After
+ public void cleanup(){
+ File jackrabbit = new File(".");
+ String s = jackrabbit.getAbsolutePath() + File.separator +
+ "jackrabbit";
+ IOUtil.deleteDirectory(new File(s));
+ }
}
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=1222011&r1=1222010&r2=1222011&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 Thu Dec 22 02:50:36 2011
@@ -23,9 +23,11 @@ package org.apache.airavata.registry.api
import static org.junit.Assert.fail;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
@@ -33,6 +35,7 @@ import org.apache.airavata.schemas.gfac.
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
import org.apache.xmlbeans.XmlString;
+import org.junit.After;
import org.junit.Test;
public class JCRRegistryTest {
@@ -227,5 +230,12 @@ public class JCRRegistryTest {
fail(e.getMessage());
}
}
+ @After
+ public void cleanup(){
+ File jackrabbit = new File(".");
+ String s = jackrabbit.getAbsolutePath() + File.separator +
+ "modules" + File.separator + "registry-api" + File.separator +"jackrabbit";
+ IOUtil.deleteDirectory(new File(s));
+ }
}