You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/10/06 14:10:55 UTC
svn commit: r702119 - in
/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry:
./ src/test/java/org/apache/jetspeed/components/portletentity/
src/test/java/org/apache/jetspeed/components/portletregistry/
Author: ate
Date: Mon Oct 6 05:10:54 2008
New Revision: 702119
URL: http://svn.apache.org/viewvc?rev=702119&view=rev
Log:
Fixes for registry testcases
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml?rev=702119&r1=702118&r2=702119&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/pom.xml Mon Oct 6 05:10:54 2008
@@ -152,7 +152,7 @@
<resources>
<resource>
<path>assembly</path>
- <include>transaction.xml,cache.xml,boot/datasource.xml</include>
+ <include>transaction.xml,cache.xml,static-bean-references.xml,boot/datasource.xml</include>
</resource>
<resource>
<path>db-ojb</path>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java?rev=702119&r1=702118&r2=702119&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java Mon Oct 6 05:10:54 2008
@@ -26,7 +26,6 @@
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.engine.MockJetspeedEngine;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
@@ -205,23 +204,7 @@
prefs = (PreferenceSetComposite)entity.getPreferenceSet();
pref2 = (PreferenceComposite) prefs.get("pref2");
- assertFalse(pref2.isValueSet());
- prefValues = pref2.getValuesList();
-
- assertTrue(prefValues.size() == 0);
-
- pref2.setValues(prefValues);
- assertFalse(pref2.isValueSet());
-
- entity.store();
-
- prefs = (PreferenceSetComposite)entity.getPreferenceSet();
- pref2 = (PreferenceComposite) prefs.get("pref2");
-
- assertFalse(pref2.isValueSet());
- prefValues = pref2.getValuesList();
-
- assertTrue(prefValues.size() == 0);
+ assertNull(pref2);
MutablePortletEntity entity2 = entityAccess.getPortletEntityForFragment(f1);
assertTrue("entity id ", entity2.getId().toString().equals(TEST_ENTITY));
@@ -300,9 +283,14 @@
registry.registerPortletApplication(app);
}
+ protected String getBeanDefinitionFilterCategories()
+ {
+ return "registry,transaction,cache,jdbcDS";
+ }
+
protected String[] getConfigurations()
{
return new String[]
- { "transaction.xml", "registry-test.xml", "cache.xml" };
+ { "transaction.xml", "registry-test.xml", "cache.xml", "static-bean-references.xml" };
}
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?rev=702119&r1=702118&r2=702119&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java Mon Oct 6 05:10:54 2008
@@ -198,10 +198,15 @@
}
+ protected String getBeanDefinitionFilterCategories()
+ {
+ return "registry,transaction,cache,jdbcDS";
+ }
+
protected String[] getConfigurations()
{
return new String[]
- { "transaction.xml", "registry-test.xml", "cache.xml" };
+ { "transaction.xml", "registry-test.xml", "cache.xml", "static-bean-references.xml" };
}
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=702119&r1=702118&r2=702119&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java Mon Oct 6 05:10:54 2008
@@ -324,9 +324,14 @@
assertEquals(dc.getTypes().size(), 1);
}
+ protected String getBeanDefinitionFilterCategories()
+ {
+ return "registry,transaction,cache,jdbcDS";
+ }
+
protected String[] getConfigurations()
{
return new String[]
- { "transaction.xml", "registry-test.xml", "cache.xml" };
+ { "transaction.xml", "registry-test.xml", "cache.xml", "static-bean-references.xml" };
}
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java?rev=702119&r1=702118&r2=702119&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java Mon Oct 6 05:10:54 2008
@@ -180,10 +180,15 @@
super.tearDown();
}
+ protected String getBeanDefinitionFilterCategories()
+ {
+ return "registry,transaction,cache,jdbcDS";
+ }
+
protected String[] getConfigurations()
{
return new String[]
- { "transaction.xml", "registry-test.xml", "cache.xml" };
+ { "transaction.xml", "registry-test.xml", "cache.xml", "static-bean-references.xml" };
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org