[jboss-svn-commits] JBoss Common SVN: r3889 - in shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base: test and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Dec 26 08:52:05 EST 2009
Author: aslak
Date: 2009-12-26 08:52:04 -0500 (Sat, 26 Dec 2009)
New Revision: 3889
Added:
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyInterfaceForTest.java
Removed:
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummayInterfaceForTest.java
Modified:
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/donotchange/DummyClassA.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyClassForTest.java
Log:
SHRINKWRAP-106 Added private / anonymous inner class test cases
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/donotchange/DummyClassA.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/donotchange/DummyClassA.java 2009-12-25 23:23:06 UTC (rev 3888)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/donotchange/DummyClassA.java 2009-12-26 13:52:04 UTC (rev 3889)
@@ -16,6 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.spec.donotchange;
+
/**
* This class is just here for the ClassContainer.addPackage/addClass tests.
*
@@ -24,9 +25,23 @@
*/
public class DummyClassA extends DummyClassParent
{
+ //-------------------------------------------------------------------------------------||
+ // Anonymous Inner Classes ------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+ @SuppressWarnings("unused")
+ private Test test = new Test() {};
+
+
+ //-------------------------------------------------------------------------------------||
+ // Inner Classes ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
public class InnerClass
{
}
+ private class Test {
+
+ }
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2009-12-25 23:23:06 UTC (rev 3888)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2009-12-26 13:52:04 UTC (rev 3889)
@@ -38,7 +38,7 @@
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
import org.jboss.shrinkwrap.impl.base.spec.donotchange.DummyClassA;
import org.jboss.shrinkwrap.impl.base.spec.donotchange.DummyClassParent;
-import org.jboss.shrinkwrap.impl.base.test.dummy.DummayInterfaceForTest;
+import org.jboss.shrinkwrap.impl.base.test.dummy.DummyInterfaceForTest;
import org.jboss.shrinkwrap.impl.base.test.dummy.DummyClassForTest;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -259,9 +259,9 @@
@Test
@ArchiveType(ManifestContainer.class)
public void testAddServiceProvider() throws Exception {
- getManifestContainer().addServiceProvider(DummayInterfaceForTest.class, DummyClassForTest.class);
+ getManifestContainer().addServiceProvider(DummyInterfaceForTest.class, DummyClassForTest.class);
- Path testPath = new BasicPath(getManifestPath(), "services/" + DummayInterfaceForTest.class.getName());
+ Path testPath = new BasicPath(getManifestPath(), "services/" + DummyInterfaceForTest.class.getName());
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -437,14 +437,38 @@
// SHRINKWRAP-106
// Ensure inner classes are added
- final Path expectedPathInnerClass = new BasicPath(getClassPath(), AssetUtil
- .getFullPathForClassResource(DummyClassA.InnerClass.class));
- final Path expectedPathInnerClassParent = new BasicPath(getClassPath(), AssetUtil
- .getFullPathForClassResource(DummyClassParent.ParentInnerClass.class));
- Assert.assertTrue("Adding a class should also add its inner classes", getArchive().contains(
- expectedPathInnerClass));
- Assert.assertFalse("Adding a class should not add the public inner classes of its parent", getArchive().contains(
- expectedPathInnerClassParent));
+ final Path expectedPathInnerClass = new BasicPath(
+ getClassPath(), AssetUtil.getFullPathForClassResource(DummyClassA.InnerClass.class));
+ final Path expectedPathInnerClassParent = new BasicPath(
+ getClassPath(), AssetUtil.getFullPathForClassResource(DummyClassParent.ParentInnerClass.class));
+
+ Assert.assertTrue(
+ "Adding a class should also add its inner classes",
+ getArchive().contains(expectedPathInnerClass));
+ Assert.assertFalse(
+ "Adding a class should not add the public inner classes of its parent",
+ getArchive().contains(expectedPathInnerClassParent));
+
+ // Ensure anonymous/private inner classes are added
+ final Path expectedPathPrivateInnerClass = new BasicPath(
+ getClassPath(),
+ AssetUtil.getFullPathForClassResource(
+ DummyClassA.InnerClass.class)
+ .get().replaceAll("InnerClass", "Test"));
+
+ final Path expectedPathAnonymousInnerClass = new BasicPath(
+ getClassPath(),
+ AssetUtil.getFullPathForClassResource(
+ DummyClassA.InnerClass.class)
+ .get().replaceAll("InnerClass", "1"));
+
+ Assert.assertTrue(
+ "Adding a class should also add its private inner classes",
+ getArchive().contains(expectedPathPrivateInnerClass));
+ Assert.assertTrue(
+ "Adding a class should also add the anonymous inner classes",
+ getArchive().contains(expectedPathAnonymousInnerClass));
+
}
/**
Deleted: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummayInterfaceForTest.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummayInterfaceForTest.java 2009-12-25 23:23:06 UTC (rev 3888)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummayInterfaceForTest.java 2009-12-26 13:52:04 UTC (rev 3889)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.shrinkwrap.impl.base.test.dummy;
-
-/**
- * DummayInterfaceForTest
- *
- * Empty class to test class adding
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public interface DummayInterfaceForTest
-{
-
-}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyClassForTest.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyClassForTest.java 2009-12-25 23:23:06 UTC (rev 3888)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyClassForTest.java 2009-12-26 13:52:04 UTC (rev 3889)
@@ -25,7 +25,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public class DummyClassForTest implements DummayInterfaceForTest
+public class DummyClassForTest implements DummyInterfaceForTest
{
}
Copied: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyInterfaceForTest.java (from rev 3879, shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummayInterfaceForTest.java)
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyInterfaceForTest.java (rev 0)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/dummy/DummyInterfaceForTest.java 2009-12-26 13:52:04 UTC (rev 3889)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.shrinkwrap.impl.base.test.dummy;
+
+/**
+ * DummyInterfaceForTest
+ *
+ * Empty class to test class adding
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public interface DummyInterfaceForTest
+{
+
+}
More information about the jboss-svn-commits
mailing list