You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/29 21:10:41 UTC
svn commit: r1415349 - in /airavata/trunk/modules/registry:
airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/
airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/
airavata-registry-test/...
Author: chathuri
Date: Thu Nov 29 20:10:40 2012
New Revision: 1415349
URL: http://svn.apache.org/viewvc?rev=1415349&view=rev
Log:
fixing test failures
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java Thu Nov 29 20:10:40 2012
@@ -38,11 +38,11 @@ public abstract class AbstractResourceTe
public void setUp() throws Exception {
initialize = new Initialize();
initialize.initializeDB();
- gatewayResource = (GatewayResource)ResourceUtils.getGateway("gateway1");
- workerResource = (WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(), "testUser");
+ gatewayResource = (GatewayResource)ResourceUtils.getGateway("default");
+ workerResource = (WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(), "admin");
userResource = (UserResource)gatewayResource.create(ResourceType.USER);
- userResource.setUserName("testUser");
- userResource.setPassword("testUser");
+ userResource.setUserName("admin");
+ userResource.setPassword("admin");
}
@Override
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java Thu Nov 29 20:10:40 2012
@@ -48,7 +48,7 @@ public class GatewayResourceTest extends
workerResource = super.getWorkerResource();
userResource = super.getUserResource();
if (gatewayResource == null) {
- gatewayResource = (GatewayResource) ResourceUtils.getGateway("gateway1");
+ gatewayResource = (GatewayResource) ResourceUtils.getGateway("default");
}
projectResource = (ProjectResource) gatewayResource.create(ResourceType.PROJECT);
projectResource.setName("testProject");
@@ -89,7 +89,7 @@ public class GatewayResourceTest extends
userWorkflowResource.save();
publishWorkflowResource.setName("pubworkflow1");
- publishWorkflowResource.setCreatedUser("testUser");
+ publishWorkflowResource.setCreatedUser("admin");
publishWorkflowResource.setContent("testContent");
Calendar c = Calendar.getInstance();
java.util.Date da = c.getTime();
@@ -109,7 +109,7 @@ public class GatewayResourceTest extends
gatewayResource.setOwner("owner1");
gatewayResource.save();
- boolean gatewayExist = ResourceUtils.isGatewayExist("gateway1");
+ boolean gatewayExist = ResourceUtils.isGatewayExist("default");
assertTrue("The gateway exisits", gatewayExist);
}
@@ -129,7 +129,7 @@ public class GatewayResourceTest extends
@org.junit.Test
public void testIsExists() throws Exception {
- assertTrue(gatewayResource.isExists(ResourceType.USER, "testUser"));
+ assertTrue(gatewayResource.isExists(ResourceType.USER, "admin"));
assertTrue(gatewayResource.isExists(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
assertTrue(gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
assertTrue(gatewayResource.isExists(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
@@ -139,7 +139,7 @@ public class GatewayResourceTest extends
@org.junit.Test
public void testGet() throws Exception {
- assertNotNull(gatewayResource.get(ResourceType.USER, "testUser"));
+ assertNotNull(gatewayResource.get(ResourceType.USER, "admin"));
assertNotNull(gatewayResource.get(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
assertNotNull(gatewayResource.get(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
assertNotNull(gatewayResource.get(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
@@ -204,7 +204,7 @@ public class GatewayResourceTest extends
Timestamp currentTime = new Timestamp(d.getTime());
publishWorkflowResource.setName("pubworkflow1");
- publishWorkflowResource.setCreatedUser("testUser");
+ publishWorkflowResource.setCreatedUser("admin");
publishWorkflowResource.setContent("testContent");
Calendar c = Calendar.getInstance();
java.util.Date da = c.getTime();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java Thu Nov 29 20:10:40 2012
@@ -37,7 +37,7 @@ public class UserResourceTest extends Ab
public void testSave() throws Exception {
userResource.save();
- assertTrue("user resource saved successfully", gatewayResource.isExists(ResourceType.USER, "testUser"));
+ assertTrue("user resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin"));
//remove user
// gatewayResource.remove(ResourceType.USER, "testUser");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java Thu Nov 29 20:10:40 2012
@@ -83,7 +83,7 @@ public class WorkerResourceTest extends
public void testSave() throws Exception {
workerResource.save();
- assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "testUser"));
+ assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin"));
//remove
// ResourceUtils.removeGatewayWorker(gatewayResource, userResource);
// gatewayResource.remove(ResourceType.USER, "testUser");
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java Thu Nov 29 20:10:40 2012
@@ -21,28 +21,23 @@
package org.apache.airavata.persistance.registry.jpa.util;
-import org.apache.airavata.common.exception.ServerSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
-import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
import org.apache.airavata.persistance.registry.jpa.resources.Utils;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import org.apache.airavata.registry.api.exception.RegistrySettingsException;
import org.apache.airavata.registry.api.util.RegistrySettings;
+import org.apache.derby.drda.NetworkServerControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.derby.drda.NetworkServerControl;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.InetAddress;
-import java.net.URL;
import java.sql.*;
-import java.util.Properties;
import java.util.StringTokenizer;
public class Initialize {
@@ -121,23 +116,21 @@ public class Initialize {
try{
GatewayResource gatewayResource = new GatewayResource();
- gatewayResource.setGatewayName(ServerSettings.getDefaultGatewayId());
- gatewayResource.setOwner(ServerSettings.getDefaultGatewayId());
+ gatewayResource.setGatewayName(RegistrySettings.getSetting("default.registry.gateway"));
+ gatewayResource.setOwner(RegistrySettings.getSetting("default.registry.gateway"));
gatewayResource.save();
UserResource userResource = (UserResource) gatewayResource.create(ResourceType.USER);
- userResource.setUserName(ServerSettings.getSystemUser());
- userResource.setPassword(ServerSettings.getSystemUserPassword());
+ userResource.setUserName(RegistrySettings.getSetting("default.registry.user"));
+ userResource.setPassword(RegistrySettings.getSetting("default.registry.password"));
userResource.save();
WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
workerResource.setUser(userResource.getUserName());
workerResource.save();
- } catch (ServerSettingsException e) {
- logger.error("Unable to read properties" , e);
+ } catch (RegistrySettingsException e) {
+ logger.error("Unable to read properties", e);
}
-
-
}
public static boolean isDatabaseStructureCreated(String tableName, Connection conn) {
Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java?rev=1415349&r1=1415348&r2=1415349&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java Thu Nov 29 20:10:40 2012
@@ -21,8 +21,6 @@
package org.apache.airavata.registry.api.test.util;
-import org.apache.airavata.common.exception.ServerSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
@@ -120,20 +118,20 @@ public class Initialize {
try{
GatewayResource gatewayResource = new GatewayResource();
- gatewayResource.setGatewayName(ServerSettings.getDefaultGatewayId());
- gatewayResource.setOwner(ServerSettings.getDefaultGatewayId());
+ gatewayResource.setGatewayName(RegistrySettings.getSetting("default.registry.gateway"));
+ gatewayResource.setOwner(RegistrySettings.getSetting("default.registry.gateway"));
gatewayResource.save();
UserResource userResource = (UserResource) gatewayResource.create(ResourceType.USER);
- userResource.setUserName(ServerSettings.getSystemUser());
- userResource.setPassword(ServerSettings.getSystemUserPassword());
+ userResource.setUserName(RegistrySettings.getSetting("default.registry.user"));
+ userResource.setPassword(RegistrySettings.getSetting("default.registry.password"));
userResource.save();
WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
workerResource.setUser(userResource.getUserName());
workerResource.save();
- } catch (ServerSettingsException e) {
- logger.error("Unable to read properties" , e);
+ } catch (RegistrySettingsException e) {
+ logger.error("Unable to read properties", e);
}