You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/28 20:09:45 UTC
svn commit: r523429 - in
/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src:
main/java/org/apache/tuscany/services/contribution/processor/
test/java/org/apache/tuscany/services/contribution/processor/
Author: lresende
Date: Wed Mar 28 11:09:44 2007
New Revision: 523429
URL: http://svn.apache.org/viewvc?view=rev&rev=523429
Log:
Contribution Services - Updating folderProcessor testcase
Added:
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/InvalidFolderContributionException.java
Modified:
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessorTestCase.java
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java?view=diff&rev=523429&r1=523428&r2=523429
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java Wed Mar 28 11:09:44 2007
@@ -82,10 +82,14 @@
// Assume the root is a jar file
File rootFolder;
-
+
try {
rootFolder = new File(rootURL.toURI());
if (rootFolder.isDirectory()) {
+ if(! rootFolder.exists()){
+ throw new InvalidFolderContributionException(rootFolder.getAbsolutePath());
+ }
+
this.traverse(artifacts, rootFolder);
}
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/InvalidFolderContributionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/InvalidFolderContributionException.java?view=auto&rev=523429
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/InvalidFolderContributionException.java (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/processor/InvalidFolderContributionException.java Wed Mar 28 11:09:44 2007
@@ -0,0 +1,41 @@
+/*
+ * 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 org.apache.tuscany.services.contribution.processor;
+
+import org.apache.tuscany.services.spi.contribution.ContributionException;
+
+/**
+ * Exception that indicates that the supplied XML Document invalid.
+ *
+ */
+public class InvalidFolderContributionException extends ContributionException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1564255850052593282L;
+
+ protected InvalidFolderContributionException(String componentDefinitionLocatoin) {
+ super(componentDefinitionLocatoin);
+ }
+
+ protected InvalidFolderContributionException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessorTestCase.java?view=diff&rev=523429&r1=523428&r2=523429
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessorTestCase.java Wed Mar 28 11:09:44 2007
@@ -19,13 +19,21 @@
package org.apache.tuscany.services.contribution.processor;
import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
import junit.framework.TestCase;
+import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.services.spi.contribution.ContributionProcessorRegistry;
+import org.easymock.EasyMock;
+
public class FolderContributionProcessorTestCase extends TestCase {
- private static final String DIRECTORY_CONTRIBUTION = "//D:/DEV/Projects/Tuscany/source/java-sca-integration/samples/sca/calculator";
+ private static final String CONTRIBUTION_URI = "sca://contributions/002/";
+ private static final String DIRECTORY_CONTRIBUTION = "../../../../core-samples/common/calculator";
private File contributionRoot;
+ private FolderContributionProcessor folderProcessor = new FolderContributionProcessor();
protected void setUp() throws Exception {
@@ -34,17 +42,17 @@
}
public final void testProcessJarArtifacts() throws Exception {
-// FolderContributionProcessor folderContribution = new FolderContributionProcessor();
-// ContributionProcessorRegistry mockRegistry = EasyMock.createMock(ContributionProcessorRegistry.class);
-// mockRegistry.register(FolderContributionProcessor.CONTENT_TYPE, folderContribution);
-// EasyMock.expectLastCall().anyTimes();
-// EasyMock.replay(mockRegistry);
-// folderContribution.setContributionProcessorRegistry(mockRegistry);
-// folderContribution.start();
-// EasyMock.verify(mockRegistry);
-//
-// Contribution contribution = new Contribution(URI.create("sca://contributions/001"));
-// contribution.setLocation(this.contributionRoot.toURL());
-// folderContribution.processContent(contribution, contribution.getUri(), null);
+ ContributionProcessorRegistry mockRegistry = EasyMock.createMock(ContributionProcessorRegistry.class);
+ mockRegistry.register(FolderContributionProcessor.CONTENT_TYPE, folderProcessor);
+ mockRegistry.processContent((Contribution)EasyMock.anyObject(), (URI) EasyMock.anyObject(), (InputStream) EasyMock.anyObject() );
+ EasyMock.expectLastCall().anyTimes();
+ EasyMock.replay(mockRegistry);
+ folderProcessor.setContributionProcessorRegistry(mockRegistry);
+ folderProcessor.start();
+ EasyMock.verify(mockRegistry);
+
+ Contribution contribution = new Contribution(URI.create(CONTRIBUTION_URI));
+ contribution.setLocation(this.contributionRoot.toURL());
+ folderProcessor.processContent(contribution, contribution.getUri(), null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org