modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java | 71 ++++------ modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 8 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java | 2 3 files changed, 42 insertions(+), 39 deletions(-)
New commits: commit d32fc3170963d9622f025498234b24fbc9cdf572 Merge: 68f57f8 6a533ab Author: John Mazzitelli mazz@redhat.com Date: Tue Dec 4 11:33:37 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
commit 6a533abe4e252374aaa1760dde8bc1cf567e2d0a Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Dec 4 11:27:35 2012 -0500
Fix test failure, ensure that existing plugins are scanned and registered prior to easch test.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java index befaa1a..05bb9c0 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java @@ -55,11 +55,13 @@ public class PluginManagerBeanTest extends MetadataBeanTest { subjectMgr = LookupUtil.getSubjectManager(); pluginMgr = LookupUtil.getPluginManager();
- FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true); + getPluginScannerService().startDeployment(); }
@Override protected void afterMethod() throws Exception { + FileUtil.purge(new File(getPluginScannerService().getAgentPluginDir()), true); + unpreparePluginScannerService(); }
@@ -86,7 +88,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest { createPluginJarFile("test-plugin3.jar", "plugin_3.xml"); createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
- getPluginScannerService().startDeployment(); + getPluginScannerService().scanAndRegister(); }
@Test(dependsOnMethods = { "registerPlugins" }) @@ -105,6 +107,8 @@ public class PluginManagerBeanTest extends MetadataBeanTest { public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception { Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1"); assertTrue("Plugin should not already be disabled", plugin.isEnabled()); + Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2"); + assertTrue("Plugin should not already be disabled", plugin.isEnabled());
Exception exception = null;
commit bb6f2974eb61c5579c68137f1517ffe88d7b9a2c Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Dec 4 11:26:44 2012 -0500
trivial, comment re: potentially unnecessary call
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java index 39ce392..ddff417 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java @@ -92,7 +92,7 @@ public class ProductPluginDeployer { * allowed to begin registering types from deployed plugins. */ public void startDeployment() { - // we can now register our initial set of plugins + // we can now register our initial set of plugins (This may be a no-op at this point) registerPlugins();
// indicate that we are now ready for hot-deployment of new plugins
commit 5c02b44e2fc132e93e63f6f067f2cfd5b8e94808 Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Dec 4 11:18:48 2012 -0500
- override AbstractEJB3Test.afterMethod() as opposed to an explicitly annotated method
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java index 3f0ef84..d2682af 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java @@ -6,7 +6,6 @@ import javax.persistence.EntityManager; import javax.persistence.Query; import javax.transaction.TransactionManager;
-import org.testng.annotations.AfterMethod; import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject; @@ -54,6 +53,41 @@ public class RepoSyncingTest extends AbstractEJB3Test { em.flush(); }
+ @Override + protected void afterMethod() throws Exception { + unprepareServerPluginService(); + + getTransactionManager().begin(); + EntityManager em = getEntityManager(); + ContentSource deleteSrc = em.find(ContentSource.class, contentSource.getId()); + // em.remove(deleteSrc.getContentSourceType()); + em.remove(deleteSrc); + + Query q = em.createNamedQuery(RepoDistribution.QUERY_FIND_BY_REPO_ID); + q.setParameter("repoId", repo.getId()); + List<RepoDistribution> rds = q.getResultList(); + for (RepoDistribution rd : rds) { + Distribution d = rd.getRepoDistributionPK().getDistribution(); + List<DistributionFile> dfiles = LookupUtil.getDistributionManagerLocal().getDistributionFilesByDistId( + d.getId()); + for (DistributionFile df : dfiles) { + DistributionFile dfl = em.find(DistributionFile.class, df.getId()); + em.remove(dfl); + } + em.remove(rd); + em.remove(d); + } + + Repo delRepo = em.find(Repo.class, repo.getId()); + em.remove(delRepo); + + TransactionManager tx = getTransactionManager(); + if (tx != null) { + tx.commit(); + } + + } + @Test(enabled = ENABLED) public void testSyncResults() throws Exception { // We have to commit because bean has new transaction inside it @@ -200,41 +234,6 @@ public class RepoSyncingTest extends AbstractEJB3Test { } }
- @AfterMethod - public void tearDownAfterMethod() throws Exception { - unprepareServerPluginService(); - - getTransactionManager().begin(); - EntityManager em = getEntityManager(); - ContentSource deleteSrc = em.find(ContentSource.class, contentSource.getId()); - // em.remove(deleteSrc.getContentSourceType()); - em.remove(deleteSrc); - - Query q = em.createNamedQuery(RepoDistribution.QUERY_FIND_BY_REPO_ID); - q.setParameter("repoId", repo.getId()); - List<RepoDistribution> rds = q.getResultList(); - for (RepoDistribution rd : rds) { - Distribution d = rd.getRepoDistributionPK().getDistribution(); - List<DistributionFile> dfiles = LookupUtil.getDistributionManagerLocal().getDistributionFilesByDistId( - d.getId()); - for (DistributionFile df : dfiles) { - DistributionFile dfl = em.find(DistributionFile.class, df.getId()); - em.remove(dfl); - } - em.remove(rd); - em.remove(d); - } - - Repo delRepo = em.find(Repo.class, repo.getId()); - em.remove(delRepo); - - TransactionManager tx = getTransactionManager(); - if (tx != null) { - tx.commit(); - } - - } - class SyncerThread extends Thread {
boolean synced = false;
rhq-commits@lists.fedorahosted.org