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 18:19:32 UTC
svn commit: r1360265 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/test/java/org/apache/airavata/registry/api/impl/
gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/
xbaya-gui/src/test/java/org/apache/airavata/xbay...
Author: lahiru
Date: Wed Jul 11 16:19:32 2012
New Revision: 1360265
URL: http://svn.apache.org/viewvc?rev=1360265&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/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SchedulerTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.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=1360265&r1=1360264&r2=1360265&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 16:19:32 2012
@@ -123,8 +123,6 @@ public class JCRRegistryDeleteTest {
} 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;
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java?rev=1360265&r1=1360264&r2=1360265&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java Wed Jul 11 16:19:32 2012
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -183,6 +184,8 @@ public class PropertiesBasedServiceImplT
Assert.assertNotNull(ct.getOutput());
Assert.assertNotNull(ct.getOutput().getValue("echo_output"));
Assert.assertEquals("hello", ((StringParameterType)((ActualParameter)ct.getOutput().getValue("echo_output")).getType()).getValue());
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target"));
} catch (Exception e) {
e.printStackTrace();
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SchedulerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SchedulerTest.java?rev=1360265&r1=1360264&r2=1360265&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SchedulerTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/SchedulerTest.java Wed Jul 11 16:19:32 2012
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.core.gfac.services.impl;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -42,6 +43,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
@@ -170,6 +172,9 @@ public class SchedulerTest {
}else {
junit.framework.Assert.assertTrue(false);
}
+ jcrRegistry.getSession().logout();
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target"));
+
} catch (Exception e) {
e.printStackTrace();
fail("ERROR");
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java?rev=1360265&r1=1360264&r2=1360265&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java Wed Jul 11 16:19:32 2012
@@ -22,6 +22,7 @@
package org.apache.airavata.xbaya.interpreter;
import org.apache.airavata.common.registry.api.exception.RegistryException;
+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;
@@ -31,6 +32,7 @@ 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.Rule;
import org.junit.Test;
@@ -43,6 +45,7 @@ import org.slf4j.LoggerFactory;
import javax.jcr.RepositoryException;
import javax.xml.bind.SchemaOutputResolver;
+import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -180,4 +183,14 @@ public class RegistryServiceTest {
assertTrue(true);
}
}
+
+ @After
+ public void cleanup()throws RegistryException{
+ try {
+ jcrRegistry.getSession().logout();
+ } catch (RepositoryException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ IOUtil.deleteDirectory(new File((new File(".")).getAbsolutePath() + File.separator + "target"));
+ }
}