Author: chathuri
Date: Fri Oct 12 07:10:44 2012
New Revision: 1397457
URL: http://svn.apache.org/viewvc?rev=1397457&view=rev
Log: (empty)
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.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/GramDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.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/UserWorkflowResourceTest.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/WorkflowDataResourceTest.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-jpa-registry/src/test/resources/repository.properties
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -30,10 +30,11 @@ import org.junit.*;
public class ApplicationDescriptorResourceTest extends TestCase {
private GatewayResource gatewayResource;
+ private Initialize initialize;
@BeforeClass
public void setUp() throws Exception {
- Initialize initialize = new Initialize();
+ initialize = new Initialize();
initialize.initializeDB();
Class[] testClasses = { ConfigurationResourceTest.class,
GatewayResourceTest.class, UserResourceTest.class,
WorkerResourceTest.class, ProjectResourceTest.class,
@@ -62,4 +63,9 @@ public class ApplicationDescriptorResour
gatewayResource.remove(ResourceType.APPLICATION_DESCRIPTOR,
"testAppDesc");
}
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -23,15 +23,19 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import
org.apache.airavata.persistance.registry.jpa.resources.ConfigurationResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
public class ConfigurationResourceTest extends TestCase {
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
- super.setUp();
+ initialize = new Initialize();
+ initialize.initializeDB();
+// super.setUp();
}
public void testSave() throws Exception {
@@ -50,4 +54,10 @@ public class ConfigurationResourceTest e
//remove test configuration
ResourceUtils.removeConfiguration("testConfigKey");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -37,8 +37,11 @@ public class ExperimentDataResourceTest
private WorkflowDataResource workflowDataResource;
private ExperimentMetadataResource experimentMetadataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -72,7 +75,7 @@ public class ExperimentDataResourceTest
workflowDataResource.setStartTime(currentTime);
workflowDataResource.save();
- super.setUp();
+// super.setUp();
}
public void testCreate() throws Exception {
@@ -128,7 +131,11 @@ public class ExperimentDataResourceTest
}
}
-
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class ExperimentMetadataResourceT
private WorkerResource workerResource;
private ExperimentDataResource experimentDataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -55,7 +59,7 @@ public class ExperimentMetadataResourceT
experimentDataResource.setUserName(workerResource.getUser());
experimentDataResource.save();
- super.setUp();
+// super.setUp();
}
public void testSave() throws Exception {
@@ -71,4 +75,10 @@ public class ExperimentMetadataResourceT
//remove the metadata
experimentDataResource.remove(ResourceType.EXPERIMENT_METADATA,
"testExpID");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -33,8 +34,11 @@ public class ExperimentResourceTest exte
private WorkerResource workerResource;
private ExperimentDataResource experimentDataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -48,7 +52,7 @@ public class ExperimentResourceTest exte
experimentResource.setSubmittedDate(currentDate);
experimentResource.save();
- super.setUp();
+// super.setUp();
}
public void testCreate() throws Exception{
@@ -80,4 +84,10 @@ public class ExperimentResourceTest exte
assertTrue("experiment data removed successfully", true);
}
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
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=1397457&r1=1397456&r2=1397457&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
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class GatewayResourceTest extends
private UserResource userResource;
private WorkerResource workerResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.createGateway("gateway1");
if(gatewayResource == null){
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
@@ -223,4 +227,10 @@ public class GatewayResourceTest extends
experimentResource.save();
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class GramDataResourceTest extend
private ExperimentDataResource experimentDataResource;
private WorkflowDataResource workflowDataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -78,4 +82,10 @@ public class GramDataResourceTest extend
workflowDataResource.removeGramData("testNodeID");
}
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
+
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -24,14 +24,18 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import
org.apache.airavata.persistance.registry.jpa.resources.HostDescriptorResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
public class HostDescriptorResourceTest extends TestCase {
private GatewayResource gatewayResource;
private HostDescriptorResource hostDescriptorResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
- super.setUp();
+ initialize = new Initialize();
+ initialize.initializeDB();
+// super.setUp();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
hostDescriptorResource =
gatewayResource.createHostDescriptorResource("testHostDesc");
hostDescriptorResource.setUserName("testUser");
@@ -50,4 +54,10 @@ public class HostDescriptorResourceTest
//remove host descriptor
gatewayResource.removeHostDescriptor("testHostDesc");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class NodeDataResourceTest extend
private ExperimentDataResource experimentDataResource;
private WorkflowDataResource workflowDataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -78,4 +82,10 @@ public class NodeDataResourceTest extend
workflowDataResource.removeNodeData("testNodeID");
}
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
+
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -26,6 +26,7 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.ProjectResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -36,9 +37,11 @@ public class ProjectResourceTest extends
private ProjectResource projectResource;
private ExperimentResource experimentResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
- super.setUp();
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
projectResource = workerResource.createProject("testProject");
@@ -86,4 +89,10 @@ public class ProjectResourceTest extends
assertTrue("experiment removed successfully", true);
}
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import
org.apache.airavata.persistance.registry.jpa.resources.PublishWorkflowResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -32,9 +33,11 @@ public class PublishWorkflowResourceTest
private GatewayResource gatewayResource;
private PublishWorkflowResource publishWorkflowResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
- super.setUp();
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
publishWorkflowResource =
gatewayResource.createPublishedWorkflow("workflow1");
publishWorkflowResource.setCreatedUser("testUser");
@@ -53,4 +56,10 @@ public class PublishWorkflowResourceTest
//remove workflow
gatewayResource.removePublishedWorkflow("workflow1");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -24,14 +24,17 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import
org.apache.airavata.persistance.registry.jpa.resources.ServiceDescriptorResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
public class ServiceDescriptorResourceTest extends TestCase {
private GatewayResource gatewayResource;
private ServiceDescriptorResource serviceDescriptorResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
- super.setUp();
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
serviceDescriptorResource =
gatewayResource.createServiceDescriptorResource("testServiceDesc");
serviceDescriptorResource.setUserName("testUser");
@@ -50,4 +53,10 @@ public class ServiceDescriptorResourceTe
//remove host descriptor
gatewayResource.removeServiceDescriptor("testServiceDesc");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
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=1397457&r1=1397456&r2=1397457&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
Fri Oct 12 07:10:44 2012
@@ -24,18 +24,22 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
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.util.Initialize;
public class UserResourceTest extends TestCase {
private UserResource userResource;
private GatewayResource gatewayResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
userResource = (UserResource)gatewayResource.create(ResourceType.USER);
userResource.setUserName("testUser");
userResource.setPassword("testPassword");
- super.setUp();
+// super.setUp();
}
public void testSave() throws Exception {
@@ -46,4 +50,10 @@ public class UserResourceTest extends Te
//remove user
// gatewayResource.remove(ResourceType.USER, "testUser");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import
org.apache.airavata.persistance.registry.jpa.resources.UserWorkflowResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class UserWorkflowResourceTest ex
private WorkerResource workerResource;
private UserWorkflowResource userWorkflowResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -46,7 +50,7 @@ public class UserWorkflowResourceTest ex
java.util.Date d = calender.getTime();
Date currentTime = new Date(d.getTime());
userWorkflowResource.setLastUpdateDate(currentTime);
- super.setUp();
+// super.setUp();
}
public void testSave() throws Exception {
@@ -57,4 +61,10 @@ public class UserWorkflowResourceTest ex
//remove user workflow
workerResource.removeWorkflowTemplate("workflow1");
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
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=1397457&r1=1397456&r2=1397457&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
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Date;
import java.util.Calendar;
@@ -32,8 +33,11 @@ public class WorkerResourceTest extends
private WorkerResource workerResource;
private UserResource userResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource = new WorkerResource();
workerResource.setGateway(gatewayResource);
@@ -110,5 +114,11 @@ public class WorkerResourceTest extends
}
}
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
+
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
Fri Oct 12 07:10:44 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.persistance.
import junit.framework.TestCase;
import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -34,8 +35,11 @@ public class WorkflowDataResourceTest ex
private ExperimentDataResource experimentDataResource;
private WorkflowDataResource workflowDataResource;
+ private Initialize initialize ;
@Override
public void setUp() throws Exception {
+ initialize = new Initialize();
+ initialize.initializeDB();
gatewayResource =
(GatewayResource)ResourceUtils.getGateway("gateway1");
workerResource =
(WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(),
"testUser");
@@ -57,7 +61,7 @@ public class WorkflowDataResourceTest ex
Timestamp timestamp = new Timestamp(d.getTime());
workflowDataResource.setLastUpdatedTime(timestamp);
- super.setUp();
+// super.setUp();
}
public void testCreate() throws Exception {
@@ -106,7 +110,11 @@ public class WorkflowDataResourceTest ex
}
}
-
+ @Override
+ protected void tearDown() throws Exception {
+ initialize.stopDerbyServer();
+// super.tearDown(); //To change body of overridden methods use File
| Settings | File Templates.
+ }
}
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=1397457&r1=1397456&r2=1397457&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
Fri Oct 12 07:10:44 2012
@@ -49,6 +49,7 @@ public class Initialize {
public static final String DERBY_SERVER_MODE_SYS_PROPERTY =
"derby.drda.startNetworkServer";
private NetworkServerControl server;
private static final String delimiter = ";";
+ public static final String PERSISTANT_DATA = "Configuration";
public static boolean checkStringBufferEndsWith(StringBuffer buffer,
String suffix) {
if (suffix.length() > buffer.length()) {
@@ -89,19 +90,19 @@ public class Initialize {
String jdbcPassword = properties.getProperty("registry.jdbc.password");
jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" +
jdbcPassword;
-
- if (Utils.getDBType().equals("derby")) {
- startDerbyInServerMode();
-// startDerbyInEmbeddedMode();
- }
-
+ startDerbyInServerMode();
+// startDerbyInEmbeddedMode();
Connection conn = null;
try {
Class.forName(Utils.getJDBCDriver()).newInstance();
conn = DriverManager.getConnection(jdbcUrl, jdbcUser,
jdbcPassword);
- executeSQLScript(conn);
- System.out.println("New Database created for Registry");
+ if (!isDatabaseStructureCreated(PERSISTANT_DATA, conn)) {
+ executeSQLScript(conn);
+ System.out.println("New Database created for Registry");
+ } else {
+ System.out.println("Database already created for Registry!");
+ }
} catch (Exception e) {
logger.error(e.getMessage(), e);
throw new RuntimeException("Database failure");
@@ -133,6 +134,33 @@ public class Initialize {
}
+ public static boolean isDatabaseStructureCreated(String tableName,
Connection conn) {
+ try {
+ System.out.println("Running a query to test the database tables
existence.");
+ // check whether the tables are already created with a query
+ Statement statement = null;
+ try {
+ statement = conn.createStatement();
+ ResultSet rs = statement.executeQuery("select * from " +
tableName);
+ if (rs != null) {
+ rs.close();
+ }
+ } finally {
+ try {
+ if (statement != null) {
+ statement.close();
+ }
+ } catch (SQLException e) {
+ return false;
+ }
+ }
+ } catch (SQLException e) {
+ return false;
+ }
+
+ return true;
+ }
+
private void executeSQLScript(Connection conn) throws Exception {
StringBuffer sql = new StringBuffer();
BufferedReader reader = null;
@@ -243,7 +271,7 @@ public class Initialize {
try {
System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "true");
server = new
NetworkServerControl(InetAddress.getByName(Utils.getHost()),
- Utils.getPort(),
+ 20000,
Utils.getJDBCUser(), Utils.getJDBCUser());
java.io.PrintWriter consoleWriter = new
java.io.PrintWriter(System.out, true);
server.start(consoleWriter);
@@ -267,4 +295,12 @@ public class Initialize {
e.printStackTrace(); //To change body of catch statement use File
| Settings | File Templates.
}
}
+
+ public void stopDerbyServer() {
+ try {
+ server.shutdown();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties?rev=1397457&r1=1397456&r2=1397457&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties
Fri Oct 12 07:10:44 2012
@@ -90,7 +90,7 @@ registry.jdbc.password=airavata
#for derby
#registry.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby://localhost:20000/memory:persistent_data;create=true;user=airavata;password=airavata
-#registry.jdbc.url=jdbc:derby:memory:unit-testing;create=true;user=airavata;password=airavata
+#registry.jdbc.url=jdbc:derby://localhost:20000/memory:persistent_data;create=true;user=airavata;password=airavata
+registry.jdbc.url=jdbc:derby:memory:unit-testing;create=true;user=airavata;password=airavata
