[jboss-cvs] JBossAS SVN: r110219 - in projects/metadata/common/trunk/src: test/java/org/jboss/test/metadata and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2010-12-24 15:11:41 -0500 (Fri, 24 Dec 2010)
New Revision: 110219

Added:
   projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/
   projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/unit/
   projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/unit/MappedMetaDataUnitTestCase.java
Modified:
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/AbstractMappedMetaData.java
Log:
JBMETA-325 Fix AbstractMappedMetaData.remove()

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/AbstractMappedMetaData.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/AbstractMappedMetaData.java	2010-12-24 19:00:45 UTC (rev 110218)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/AbstractMappedMetaData.java	2010-12-24 20:11:41 UTC (rev 110219)
@@ -160,7 +160,7 @@
    {
       if (o == null)
          throw new IllegalArgumentException("Null object");
-      if (o instanceof MappableMetaData)
+      if (!(o instanceof MappableMetaData))
          return false;
       
       if (map == null)

Added: projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/unit/MappedMetaDataUnitTestCase.java
===================================================================
--- projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/unit/MappedMetaDataUnitTestCase.java	                        (rev 0)
+++ projects/metadata/common/trunk/src/test/java/org/jboss/test/metadata/jbmeta325/unit/MappedMetaDataUnitTestCase.java	2010-12-24 20:11:41 UTC (rev 110219)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.jbmeta325.unit;
+
+import junit.framework.Assert;
+
+import org.jboss.metadata.javaee.spec.DataSourceMetaData;
+import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.junit.Test;
+
+/**
+ * Tests {@link AbstractMappedMetaData}
+ *
+ * 
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class MappedMetaDataUnitTestCase
+{
+
+   /**
+    * Tests {@link AbstractMappedMetaData#remove(Object)}
+    * @see https://issues.jboss.org/browse/JBMETA-325
+    */
+   @Test
+   public void testRemove()
+   {
+      DataSourcesMetaData dataSources = new DataSourcesMetaData();
+      
+      DataSourceMetaData ds1 = new DataSourceMetaData();
+      ds1.setName("ds1");
+      dataSources.add(ds1);
+      
+      DataSourceMetaData ds2 = new DataSourceMetaData();
+      ds2.setName("ds2");
+      dataSources.add(ds2);
+      
+      Assert.assertEquals("Unexpected number of datasources", 2, dataSources.size());
+      
+      // remove ds1
+      Assert.assertTrue(ds1.getName() + " wasn't removed", dataSources.remove(ds1));
+      Assert.assertEquals("Unexpected number of datasources after removing " + ds1.getName(), 1, dataSources.size());
+      
+      // remove a ds which isn't present in the DataSourcesMetadata collection
+      DataSourceMetaData nonExistentDS = new DataSourceMetaData();
+      nonExistentDS.setName("blah");
+      Assert.assertFalse("Non existent datasource was considered as removed", dataSources.remove(nonExistentDS));
+      Assert.assertEquals("Unexpected number of datasources after removing non existent datasource", 1, dataSources.size());
+      
+      // remove ds2
+      Assert.assertTrue(ds2.getName() + " wasn't removed", dataSources.remove(ds2));
+      Assert.assertEquals("Unexpected number of datasources after removing " + ds2.getName(), 0, dataSources.size());
+
+   }
+}