You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/10/15 12:46:33 UTC

[2/3] git commit: Fix Integration tests in OsgiStandaloneTest

Fix Integration tests in OsgiStandaloneTest

 * setUp/tearDown weren't called when Integration profile specified
 * Change testDuplicateBundle back to unit test but ignore if file is not in local repo.

Also change io.brooklyn ref in BrooklynMavenArtifactsTest.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/34fcfe6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/34fcfe6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/34fcfe6a

Branch: refs/heads/master
Commit: 34fcfe6ade32d37e795afcfa14a4bc224e462c4c
Parents: a422b9a
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Oct 14 14:02:40 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Oct 14 14:37:22 2014 +0300

----------------------------------------------------------------------
 .../management/osgi/OsgiStandaloneTest.java      | 19 +++++++++++--------
 .../util/BrooklynMavenArtifactsTest.java         |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/34fcfe6a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
index 44d657b..86981a7 100644
--- a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
@@ -45,11 +45,11 @@ import brooklyn.entity.proxying.InternalEntityFactory;
 import brooklyn.entity.proxying.InternalPolicyFactory;
 import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.test.entity.LocalManagementContextForTests;
-import brooklyn.test.entity.TestApplicationImpl;
 import brooklyn.util.ResourceUtils;
 import brooklyn.util.collections.MutableSet;
 import brooklyn.util.maven.MavenArtifact;
 import brooklyn.util.maven.MavenRetriever;
+import brooklyn.util.net.Urls;
 import brooklyn.util.os.Os;
 import brooklyn.util.osgi.Osgis;
 import brooklyn.util.osgi.Osgis.ManifestHelper;
@@ -76,13 +76,13 @@ public class OsgiStandaloneTest {
     protected Framework framework = null;
     private File storageTempDir;
 
-    @BeforeMethod
+    @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         storageTempDir = Os.newTempDir("osgi-standalone");
         framework = Osgis.newFrameworkStarted(storageTempDir.getAbsolutePath(), true, null);
     }
 
-    @AfterMethod
+    @AfterMethod(alwaysRun=true)
     public void tearDown() throws BundleException, IOException, InterruptedException {
         if (framework!=null) {
             framework.stop();
@@ -117,11 +117,15 @@ public class OsgiStandaloneTest {
         Assert.assertEquals(Entity.class, bundleCls.getClassLoader().loadClass(Entity.class.getName()));
     }
 
-    // Marked as integration because jenkins configures an unusual local .m2 repository location,
-    // so attempts to look up the local artifact fail.
-    @Test(groups="Integration")
+    @Test
     public void testDuplicateBundle() throws Exception {
-        helperDuplicateBundle(MavenRetriever.localUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT")));
+        MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT");
+        String localUrl = MavenRetriever.localUrl(artifact);
+        if ("file".equals(Urls.getProtocol(localUrl))) {
+            helperDuplicateBundle(localUrl);
+        } else {
+            log.warn("Skipping test OsgiStandaloneTest.testDuplicateBundle due to " + artifact + " not available in local repo.");
+        }
     }
 
     @Test(groups="Integration")
@@ -157,7 +161,6 @@ public class OsgiStandaloneTest {
         @SuppressWarnings("unchecked")
         Class<? extends Entity> bundleInterface = (Class<? extends Entity>) bundle.loadClass("brooklyn.osgi.tests.SimpleEntity");
 
-        TestApplicationImpl app = new TestApplicationImpl();
         @SuppressWarnings("unchecked")
         EntitySpec<Entity> spec = (EntitySpec<Entity>) (((EntitySpec<Entity>)EntitySpec.create(bundleInterface))).impl(bundleCls);
         Entity entity = bundleCls.newInstance();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/34fcfe6a/core/src/test/java/brooklyn/util/BrooklynMavenArtifactsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/BrooklynMavenArtifactsTest.java b/core/src/test/java/brooklyn/util/BrooklynMavenArtifactsTest.java
index a481a0e..bb68951 100644
--- a/core/src/test/java/brooklyn/util/BrooklynMavenArtifactsTest.java
+++ b/core/src/test/java/brooklyn/util/BrooklynMavenArtifactsTest.java
@@ -66,7 +66,7 @@ public class BrooklynMavenArtifactsTest {
     @Test(groups="Integration")
     public void testHistoricHosted() {
         // NB: this should be a version known to be up at sonatype or maven central, NOT necessarily the current version!
-        String snapshot = MavenRetriever.hostedUrl(MavenArtifact.fromCoordinate("io.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"));
+        String snapshot = MavenRetriever.hostedUrl(MavenArtifact.fromCoordinate("org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"));
         log.info("Sample snapshot URL is: "+snapshot);
         checkValidArchive(snapshot);
         ResourceUtils.create(this).checkUrlExists(snapshot);