You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/09/29 19:23:31 UTC

svn commit: r580607 - in /incubator/tuscany/java/sca/itest/osgi-implementation/src: main/java/conversation/client/ main/java/conversation/service/ test/java/test/

Author: rfeng
Date: Sat Sep 29 10:23:30 2007
New Revision: 580607

URL: http://svn.apache.org/viewvc?rev=580607&view=rev
Log:
Add the missing test case base class

Added:
    incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/
    incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java   (with props)
Modified:
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java

Modified: incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java?rev=580607&r1=580606&r2=580607&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java Sat Sep 29 10:23:30 2007
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
 package conversation.client;
 
 import org.osgi.framework.Bundle;

Modified: incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java?rev=580607&r1=580606&r2=580607&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java Sat Sep 29 10:23:30 2007
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
 package conversation.service;
 
 import org.osgi.framework.Bundle;

Added: incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java?rev=580607&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java (added)
+++ incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java Sat Sep 29 10:23:30 2007
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import util.OSGiTestUtil;
+
+/**
+ * Test case setup base code - it is invoked with different composite files to test 
+ * various scenarios.
+ */
+public abstract class OSGiTestCase extends TestCase {
+
+    private String compositeName;
+    private String contributionLocation;
+    public SCADomain scaDomain;
+
+    public OSGiTestCase(String compositeName, String contributionLocation) {
+        super();
+        this.compositeName = compositeName;
+        this.contributionLocation = contributionLocation;
+        try {
+            if (contributionLocation != null) {
+                File f = new File("target/classes/" + contributionLocation);
+                this.contributionLocation = f.toURL().toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    protected void setUp() throws Exception {
+
+        OSGiTestUtil.setUpOSGiTestRuntime();
+
+        scaDomain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
+    }
+
+    protected void tearDown() throws Exception {
+        scaDomain.close();
+
+        OSGiTestUtil.shutdownOSGiRuntime();
+    }
+
+}

Propchange: incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org