From 9134aecc4e049bfa5df2fc2f17c90f3088b1e2f1 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 10 Oct 2008 22:28:22 +0000 Subject: Restrict Export-Package and convert test cases to Junit 4 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@703589 13f79535-47bb-0310-9956-ffa450edef68 --- ...FolderContributionPackageProcessorTestCase.java | 10 +-- .../JarContributionPackageProcessorTestCase.java | 12 ++-- ...URLartifactProcessorExtensionPointTestCase.java | 55 +++++++-------- .../resolver/DefaultModelResolverTestCase.java | 31 +++++---- .../resolver/ExtensibleModelResolverTestCase.java | 81 ++++++++++++---------- .../contribution/resolver/TestModelResolver.java | 14 ++-- .../services/ContributionRepositoryTestCase.java | 27 +++++--- .../services/PackageTypeDescriberImplTestCase.java | 27 +++++--- 8 files changed, 144 insertions(+), 113 deletions(-) (limited to 'branches/sca-equinox/modules/contribution-impl/src') diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java index c33b31b550..c527e0920b 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java @@ -18,14 +18,15 @@ */ package org.apache.tuscany.sca.contribution.processor; +import static junit.framework.Assert.assertNotNull; + import java.io.File; import java.net.URI; import java.net.URL; import java.util.List; -import junit.framework.TestCase; - import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor; +import org.junit.Test; /** * Folder Package Processor test case @@ -33,9 +34,10 @@ import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProc * * @version $Rev$ $Date$ */ -public class FolderContributionPackageProcessorTestCase extends TestCase { +public class FolderContributionPackageProcessorTestCase { private static final String FOLDER_CONTRIBUTION = "."; - + + @Test public final void testProcessPackageArtifacts() throws Exception { FolderContributionProcessor folderProcessor = new FolderContributionProcessor(); URL contributionURL = new File(FOLDER_CONTRIBUTION).toURL().toURI().toURL(); diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java index 9b3dce7029..a59465340c 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java @@ -18,15 +18,16 @@ */ package org.apache.tuscany.sca.contribution.processor; +import static junit.framework.Assert.assertNotNull; + import java.io.InputStream; import java.net.URI; import java.net.URL; import java.util.List; -import junit.framework.TestCase; - import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor; import org.apache.tuscany.sca.contribution.service.util.IOHelper; +import org.junit.Test; /** * JAR Package Processor test case @@ -35,9 +36,10 @@ import org.apache.tuscany.sca.contribution.service.util.IOHelper; * @version $Rev$ $Date$ */ -public class JarContributionPackageProcessorTestCase extends TestCase { +public class JarContributionPackageProcessorTestCase { private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar"; - + + @Test public final void testProcessPackageArtifacts() throws Exception { JarContributionProcessor jarProcessor = new JarContributionProcessor(); @@ -49,7 +51,7 @@ public class JarContributionPackageProcessorTestCase extends TestCase { } finally { IOHelper.closeQuietly(jarStream); } - + assertNotNull(artifacts); } } diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java index 46b4183380..7b3d8dadc0 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java @@ -19,17 +19,18 @@ package org.apache.tuscany.sca.contribution.processor; +import static junit.framework.Assert.assertNotNull; + import java.net.URI; import java.net.URL; -import junit.framework.TestCase; - import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; - +import org.junit.BeforeClass; +import org.junit.Test; /** * URL Artifact Processor Extension Point test case @@ -37,78 +38,78 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; * * @version $Rev$ $Date$ */ -public class URLartifactProcessorExtensionPointTestCase extends TestCase { - - private URLArtifactProcessorExtensionPoint artifactProcessors; - - @Override - protected void setUp() throws Exception { +public class URLartifactProcessorExtensionPointTestCase { + + private static URLArtifactProcessorExtensionPoint artifactProcessors; + + @BeforeClass + public static void setUp() throws Exception { ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); artifactProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints); artifactProcessors.addArtifactProcessor(new FileTypeArtifactProcessor()); artifactProcessors.addArtifactProcessor(new FileNameArtifactProcessor()); } - - + + @Test public final void testFileTypeProcessor() { assertNotNull(artifactProcessors.getProcessor(".m1")); } - - + + @Test public final void testFileNameProcessor() { assertNotNull(artifactProcessors.getProcessor("file.m2")); - + } - + /** * Internal mock classes * */ - + private class M1 { } - + private class M2 { } - - private class FileTypeArtifactProcessor implements URLArtifactProcessor { + + private static class FileTypeArtifactProcessor implements URLArtifactProcessor { public FileTypeArtifactProcessor() { } public M1 read(URL contributionURL, URI uri, URL url) throws ContributionReadException { return null; } - + public void resolve(M1 m1, ModelResolver resolver) throws ContributionResolveException { } public String getArtifactType() { return ".m1"; } - + public Class getModelType() { return M1.class; - } + } } - - private class FileNameArtifactProcessor implements URLArtifactProcessor { + + private static class FileNameArtifactProcessor implements URLArtifactProcessor { public FileNameArtifactProcessor() { } public M2 read(URL contributionURL, URI uri, URL url) throws ContributionReadException { return null; } - + public void resolve(M2 m2, ModelResolver resolver) throws ContributionResolveException { } public String getArtifactType() { return "file.m2"; } - + public Class getModelType() { return M2.class; - } + } } } diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java index 98852e951c..f5b04f503c 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java @@ -19,28 +19,31 @@ package org.apache.tuscany.sca.contribution.resolver; -import junit.framework.TestCase; +import static junit.framework.Assert.assertTrue; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.DefaultContributionFactory; +import org.junit.Before; +import org.junit.Test; /** * Test the default model resolver implementation. * * @version $Rev$ $Date$ */ -public class DefaultModelResolverTestCase extends TestCase { - +public class DefaultModelResolverTestCase { + private ModelResolver resolver; private ContributionFactory factory; - - @Override - protected void setUp() throws Exception { + + @Before + public void setUp() throws Exception { resolver = new DefaultModelResolver(); factory = new DefaultContributionFactory(); } - + + @Test public void testResolved() { Model a = new Model("a"); resolver.addModel(a); @@ -48,13 +51,15 @@ public class DefaultModelResolverTestCase extends TestCase { x = resolver.resolveModel(Model.class, x); assertTrue(x == a); } - + + @Test public void testUnresolved() { Model x = new Model("a"); Model y = resolver.resolveModel(Model.class, x); assertTrue(x == y); } - + + @Test public void testResolvedArtifact() { Artifact artifact = factory.createArtifact(); artifact.setURI("foo/bar"); @@ -64,19 +69,19 @@ public class DefaultModelResolverTestCase extends TestCase { x = resolver.resolveModel(Artifact.class, x); assertTrue(x == artifact); } - + class Model { private String name; - + Model(String name) { this.name = name; } - + @Override public int hashCode() { return name.hashCode(); } - + @Override public boolean equals(Object obj) { return name.equals(((Model)obj).name); diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java index a53bbcc71d..5c6080d699 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java @@ -1,55 +1,58 @@ - /* - * 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. - */ +/* +* 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.sca.contribution.resolver; -import junit.framework.TestCase; +import static junit.framework.Assert.assertTrue; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.DefaultContributionFactory; import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint; import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.junit.Before; +import org.junit.Test; /** * Test DefaultArtifactResolver. * * @version $Rev$ $Date$ */ -public class ExtensibleModelResolverTestCase extends TestCase { +public class ExtensibleModelResolverTestCase { private ExtensibleModelResolver resolver; - + private ContributionFactory factory; - - @Override - protected void setUp() throws Exception { - + + @Before + public void setUp() throws Exception { + ModelResolverExtensionPoint resolvers = new DefaultModelResolverExtensionPoint(); resolvers.addResolver(Model.class, TestModelResolver.class); - + FactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(); - + resolver = new ExtensibleModelResolver(null, resolvers, factories, null); factory = new DefaultContributionFactory(); } - + + @Test public void testResolvedDefault() { OtherModel a = new OtherModel("a"); resolver.addModel(a); @@ -58,6 +61,7 @@ public class ExtensibleModelResolverTestCase extends TestCase { assertTrue(x == a); } + @Test public void testResolvedRegisteredClass() { Model a = new Model("a"); resolver.addModel(a); @@ -66,18 +70,21 @@ public class ExtensibleModelResolverTestCase extends TestCase { assertTrue(x == a); } + @Test public void testUnresolvedDefault() { OtherModel x = new OtherModel("a"); OtherModel y = resolver.resolveModel(OtherModel.class, x); assertTrue(x == y); } - + + @Test public void testUnresolved() { Model x = new Model("a"); Model y = resolver.resolveModel(Model.class, x); assertTrue(x == y); } - + + @Test public void testResolvedArtifact() { Artifact artifact = factory.createArtifact(); artifact.setURI("foo/bar"); @@ -87,19 +94,19 @@ public class ExtensibleModelResolverTestCase extends TestCase { x = resolver.resolveModel(Artifact.class, x); assertTrue(x == artifact); } - + private class Model { private String name; - + Model(String name) { this.name = name; } - + @Override public int hashCode() { return name.hashCode(); } - + @Override public boolean equals(Object obj) { return name.equals(((Model)obj).name); @@ -108,16 +115,16 @@ public class ExtensibleModelResolverTestCase extends TestCase { private class OtherModel { private String name; - + OtherModel(String name) { this.name = name; } - + @Override public int hashCode() { return name.hashCode(); } - + @Override public boolean equals(Object obj) { return name.equals(((OtherModel)obj).name); diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java index 4442bf7b00..cd586d3b2c 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java @@ -31,28 +31,28 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint; * @version $Rev$ $Date$ */ public class TestModelResolver implements ModelResolver { - + private Map map = new HashMap(); - + public TestModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) { } - + public T resolveModel(Class modelClass, T unresolved) { Object resolved = map.get(unresolved); if (resolved != null) { // Return the resolved object return modelClass.cast(resolved); - } + } // Return the unresolved object return unresolved; } - + public void addModel(Object resolved) { map.put(resolved, resolved); } - + public Object removeModel(Object resolved) { return map.remove(resolved); } - + } diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java index 2e5354fb96..5ec23475ac 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java @@ -19,27 +19,33 @@ package org.apache.tuscany.sca.contribution.services; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; + import java.io.File; import java.io.InputStream; import java.net.URL; import javax.xml.stream.XMLInputFactory; -import junit.framework.TestCase; - import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl; import org.apache.tuscany.sca.contribution.service.util.FileHelper; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; -public class ContributionRepositoryTestCase extends TestCase { - private ContributionRepositoryImpl repository; +public class ContributionRepositoryTestCase { + private static ContributionRepositoryImpl repository; - @Override - protected void setUp() throws Exception { + @BeforeClass + public static void setUp() throws Exception { // create repository (this should re-create the root directory) - this.repository = new ContributionRepositoryImpl("target/repository/", XMLInputFactory.newInstance(), null); + repository = new ContributionRepositoryImpl("target/repository/", XMLInputFactory.newInstance(), null); repository.init(); } + @Test public void testStore() throws Exception { String resourceLocation = "/repository/sample-calculator.jar"; String contribution = "sample-calculator.jar"; @@ -51,6 +57,7 @@ public class ContributionRepositoryTestCase extends TestCase { assertNotNull(contributionURL); } + @Test public void testRemove() throws Exception { String resourceLocation = "/repository/sample-calculator.jar"; String contribution = "sample-calculator.jar"; @@ -63,6 +70,7 @@ public class ContributionRepositoryTestCase extends TestCase { assertNull(contributionURL); } + @Test public void testList() throws Exception { String resourceLocation = "/repository/sample-calculator.jar"; String contribution = "sample-calculator.jar"; @@ -73,9 +81,8 @@ public class ContributionRepositoryTestCase extends TestCase { assertEquals(1, repository.list().size()); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); + @AfterClass + public static void tearDown() throws Exception { FileHelper.deleteDirectory(new File("target/repository")); } } diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java index dfb600153e..6edfbb78b6 100644 --- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java +++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java @@ -18,45 +18,52 @@ */ package org.apache.tuscany.sca.contribution.services; -import java.net.URL; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNull; -import junit.framework.TestCase; +import java.net.URL; import org.apache.tuscany.sca.contribution.PackageType; import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl; +import org.junit.BeforeClass; +import org.junit.Test; -public class PackageTypeDescriberImplTestCase extends TestCase { - private PackageTypeDescriberImpl packageTypeDescriber; +public class PackageTypeDescriberImplTestCase { + private static PackageTypeDescriberImpl packageTypeDescriber; + @Test public void testResolveArchivePackageType() throws Exception { URL artifactURL = getClass().getResource("/deployables/sample-calculator.jar"); assertEquals(PackageType.JAR, this.packageTypeDescriber.getType(artifactURL, null)); } + @Test public void testResolveFolderPackageType() throws Exception { URL artifactURL = getClass().getResource("/deployables/"); assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null)); } + @Test public void testResolveFolder2PackageType() throws Exception { URL artifactURL = getClass().getResource("/deployables"); assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null)); } - + @Test public void testResolveUnknownPackageType() throws Exception { URL artifactURL = getClass().getResource("/test.ext"); assertNull(this.packageTypeDescriber.getType(artifactURL, null)); } - + + @Test public void testDefaultPackageType() throws Exception { URL artifactURL = getClass().getResource("/test.ext"); - assertEquals("application/vnd.tuscany.ext", - packageTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext")); + assertEquals("application/vnd.tuscany.ext", packageTypeDescriber.getType(artifactURL, + "application/vnd.tuscany.ext")); } - @Override - protected void setUp() throws Exception { + @BeforeClass + public static void setUp() throws Exception { packageTypeDescriber = new PackageTypeDescriberImpl(); } -- cgit v1.2.3