Author: rfeng
Date: Fri Oct 10 14:34:37 2008
New Revision: 703578
URL: http://svn.apache.org/viewvc?rev=703578&view=rev
Log:
Make the provider package private
Modified:
tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
tuscany/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
Modified: tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml?rev=703578&r1=703577&r2=703578&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml Fri Oct 10
14:34:37 2008
@@ -217,8 +217,7 @@
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom.abdera</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>
- org.apache.tuscany.sca.binding.atom.collection,
- org.apache.tuscany.sca.binding.atom.provider
+ org.apache.tuscany.sca.binding.atom.collection
</Export-Package>
</instructions>
</configuration>
Modified:
tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java?rev=703578&r1=703577&r2=703578&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
Fri Oct 10 14:34:37 2008
@@ -8,7 +8,6 @@
import org.apache.abdera.model.Content;
import org.apache.abdera.model.Entry;
import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.node.Client;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
@@ -25,20 +24,22 @@
@BeforeClass
public static void init() throws Exception {
- try{
- System.out.println(">>>AtomDeleteTestCase.init entry");
- String contribution =
ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
- providerNode = NodeFactory.newInstance().createNode(
-
"org/apache/tuscany/sca/binding/atom/Provider.composite", new
Contribution("provider", contribution));
- consumerNode = NodeFactory.newInstance().createNode(
-
"org/apache/tuscany/sca/binding/atom/Consumer.composite", new
Contribution("consumer", contribution));
- providerNode.start();
- consumerNode.start();
- testService = consumerNode.getService(CustomerClient.class,
"CustomerClient");
- abdera = new Abdera();
+ try {
+ System.out.println(">>>AtomDeleteTestCase.init entry");
+ String contribution =
ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
+ providerNode =
+
NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/atom/Provider.composite",
+ new
Contribution("provider", contribution));
+ consumerNode =
+
NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/atom/Consumer.composite",
+ new
Contribution("consumer", contribution));
+ providerNode.start();
+ consumerNode.start();
+ testService = consumerNode.getService(CustomerClient.class,
"CustomerClient");
+ abdera = new Abdera();
} catch (Exception e) {
e.printStackTrace();
-
+
}
}
Modified:
tuscany/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java?rev=703578&r1=703577&r2=703578&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
Fri Oct 10 14:34:37 2008
@@ -24,8 +24,6 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.Composite;
import
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
@@ -36,11 +34,14 @@
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class AtomBindingProcessorTestCase extends TestCase {
+public class AtomBindingProcessorTestCase {
private static final String COMPOSITE =
"<?xml version=\"1.0\" encoding=\"ASCII\"?>"
@@ -53,12 +54,12 @@
+ " </component>"
+ "</composite>";
- private XMLInputFactory inputFactory;
- private StAXArtifactProcessor<Object> staxProcessor;
- private Monitor monitor;
+ private static XMLInputFactory inputFactory;
+ private static StAXArtifactProcessor<Object> staxProcessor;
+ private static Monitor monitor;
- @Override
- protected void setUp() throws Exception {
+ @BeforeClass
+ public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
// Create a monitor
@@ -76,14 +77,15 @@
* Test parsing valid composite definition. Valid composite populated with
correct values expected.
* @throws Exception
*/
+ @Test
public void testLoadValidComposite() throws Exception {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new
StringReader(COMPOSITE));
Composite composite = (Composite)staxProcessor.read(reader);
AtomBinding binding = (AtomBinding)
composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
- assertNotNull(binding);
- assertEquals("Feed Title", binding.getTitle());
- assertEquals("http://localhost:8080/feed";, binding.getURI());
+ Assert.assertNotNull(binding);
+ Assert.assertEquals("Feed Title", binding.getTitle());
+ Assert.assertEquals("http://localhost:8080/feed";, binding.getURI());
}
}
