ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1369858 - in /ace/sandbox/marrs/org.apache.ace.client.rest.itest: ./ bnd.bnd src/org/apache/ace/client/rest/itest/RESTClientTest.java
Date Mon, 06 Aug 2012 14:40:28 GMT
Author: marrs
Date: Mon Aug  6 14:40:28 2012
New Revision: 1369858

URL: http://svn.apache.org/viewvc?rev=1369858&view=rev
Log:
Added more integration tests for the REST client API.

Modified:
    ace/sandbox/marrs/org.apache.ace.client.rest.itest/   (props changed)
    ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java

Propchange: ace/sandbox/marrs/org.apache.ace.client.rest.itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  6 14:40:28 2012
@@ -0,0 +1,4 @@
+generated
+store
+bin
+bin_test

Modified: ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd?rev=1369858&r1=1369857&r2=1369858&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd Mon Aug  6 14:40:28 2012
@@ -19,7 +19,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	com.sun.jersey.client,\
-	com.sun.jersey.core
+	com.sun.jersey.core,\
+	gson,\
+	biz.aQute.bndlib
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runbundles: org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
@@ -70,4 +72,10 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	com.sun.jersey.client,\
 	com.sun.jersey.core,\
 	org.apache.ace.deployment.provider.repositorybased;version=latest
-Private-Package: org.apache.ace.client.rest.itest
+Private-Package: org.apache.ace.client.rest.itest,\
+	com.google.gson,\
+	com.google.gson.*,\
+	aQute.*,\
+	org.osgi.service.bindex
+	
+	

Modified: ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java?rev=1369858&r1=1369857&r2=1369858&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
(original)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
Mon Aug  6 14:40:28 2012
@@ -1,8 +1,11 @@
 package org.apache.ace.client.rest.itest;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.util.jar.Manifest;
 
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.felix.dm.Component;
@@ -10,6 +13,10 @@ import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
+import aQute.lib.osgi.Builder;
+import aQute.lib.osgi.Jar;
+
+import com.google.gson.Gson;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
@@ -17,6 +24,7 @@ import com.sun.jersey.api.client.WebReso
 import com.sun.jersey.api.client.config.ClientConfig;
 
 public class RESTClientTest extends IntegrationTestBase {
+    private static boolean m_hasBeenSetup = false;
     private volatile UserAdmin m_user;
     
     @Override
@@ -26,14 +34,22 @@ public class RESTClientTest extends Inte
         };
     }
     
+    @Override
+    protected void before() throws Exception {
+        // there is some setup we only want to do once, before the first test we run, and
since we cannot
+        // predict which one that is, we use a static flag
+        if (!m_hasBeenSetup) {
+            configureServer();
+            createServerUser();
+            m_hasBeenSetup = true;
+        }
+    }
+    
     /**
      * Creates a new workspace, ensures it works correctly by asking for a list of entity
types, then
      * deletes the workspace again and ensures it's no longer available.
      */
     public void testCreateAndDestroyRESTSession() throws Exception {
-        configureServer();
-        createServerUser();
-        
         Client c = Client.create();
         c.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
         WebResource r = c.resource("http://localhost:8080/client/work");
@@ -44,7 +60,7 @@ public class RESTClientTest extends Inte
         catch (UniformInterfaceException e) {
             ClientResponse response = e.getResponse();
             URI location = response.getLocation();
-            assertEquals("http://localhost:8080/client/work/rest-1", location.toString());
+            assertTrue(location.toString().startsWith("http://localhost:8080/client/work/rest-"));
             WebResource r2 = c.resource(location);
             r2.get(String.class);            
             r2.delete();
@@ -56,7 +72,227 @@ public class RESTClientTest extends Inte
             }
         }
     }
+
+    /**
+     * Creates a workspace, three bundle artifacts that are associated to three features.
The features are all grouped into
+     * a single distribution, and the distribution is associated with a target. This workspace
is then committed and a new
+     * workspace is opened. From this new workspace, we read back the entities we committed
before. Then, we check if this
+     * has indeed led to a new version of the software for this target.
+     */
+    public void testDeployBundlesToTarget() throws Exception {
+        Client c = Client.create();
+        c.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
+        
+        File b1 = new File("b1.jar");
+        File b2 = new File("b2.jar");
+        File b3 = new File("b3.jar");
+        createBundle(b1, "b1", "1.0.0");
+        createBundle(b2, "b2", "1.0.0");
+        createBundle(b3, "b3", "1.0.0");
+        b1.deleteOnExit();
+        b2.deleteOnExit();
+        b3.deleteOnExit();
+        
+        WebResource w1 = createWorkspace(c);
+        WebResource a1 = createArtifact(c, w1, "a1", "b1", "1.0.0", b1.toURI().toURL().toString(),
BundleHelper.MIMETYPE);
+        WebResource a2 = createArtifact(c, w1, "a2", "b2", "1.0.0", b2.toURI().toURL().toString(),
BundleHelper.MIMETYPE);
+        WebResource a3 = createArtifact(c, w1, "a3", "b3", "1.0.0", b3.toURI().toURL().toString(),
BundleHelper.MIMETYPE);
+        assertEntitiesExist(a1, a2, a3);
+        WebResource a1f1 = createAssociationA2F(c, w1, "artifact2feature", "a1", "f1");
+        WebResource a2f2 = createAssociationA2F(c, w1, "artifact2feature", "a2", "f2");
+        WebResource a3f3 = createAssociationA2F(c, w1, "artifact2feature", "a3", "f3");
+        assertEntitiesExist(a1f1, a2f2, a3f3);
+        WebResource f1 = createFeature(c, w1, "f1");
+        WebResource f2 = createFeature(c, w1, "f2");
+        WebResource f3 = createFeature(c, w1, "f3");
+        assertEntitiesExist(f1, f2, f3);
+        WebResource f1d1 = createAssociationF2D(c, w1, "feature2distribution", "f1", "d1");
+        WebResource f2d1 = createAssociationF2D(c, w1, "feature2distribution", "f2", "d1");
+        WebResource f3d1 = createAssociationF2D(c, w1, "feature2distribution", "f3", "d1");
+        assertEntitiesExist(f1d1, f2d1, f3d1);
+        WebResource d1 = createDistribution(c, w1, "d1");
+        assertEntitiesExist(d1);
+        WebResource d1t1 = createAssociationD2T(c, w1, "distribution2target", "d1", "t1");
+        assertEntitiesExist(d1t1);
+        WebResource t1 = createTarget(c, w1, "t1");
+        assertEntitiesExist(t1);
+        w1.post();
+        w1.delete();
+        
+        Gson gson = new Gson();
+        WebResource w2 = createWorkspace(c);
+        assertResources(gson, w2, "artifact", 3);
+        assertResources(gson, w2, "artifact2feature", 3);
+        assertResources(gson, w2, "feature", 3);
+        assertResources(gson, w2, "feature2distribution", 3);
+        assertResources(gson, w2, "distribution", 1);
+        assertResources(gson, w2, "distribution2target", 1);
+        assertResources(gson, w2, "target", 1);
+        w2.delete();
+        
+        WebResource t1versions = c.resource("http://localhost:8080/deployment/t1/versions");
+        assertEquals("1.0.0\n", t1versions.get(String.class));
+    }
+    
+    /**
+     * Creates and deletes a number of workspaces.
+     */
+    public void testCreateAndDeleteMultipleWorkspaces() throws Exception {
+        int nr = 10;
+        Client c = Client.create();
+        c.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
+        for (int i = 0; i < nr; i++) {
+            WebResource w1 = createWorkspace(c);
+            w1.delete();
+        }
+        WebResource[] w = new WebResource[nr];
+        for (int i = 0; i < w.length; i++) {
+            w[i] = createWorkspace(c);
+        }
+        for (int i = 0; i < w.length; i++) {
+            w[i].delete();
+        }
+    }
+    
+    /**
+     * Creates two bundles, artifacts an a single target and then in a loop creates two
+     * features that link to the bundle artifacts, one distribution and links all of that
+     * to the target. Even though we create a lot of entities that way, all of them will
+     * result in the two bundles being deployed to the target so we end up with only a single
+     * deployment version.
+     */
+    public void testCreateLotsOfEntities() throws Exception {
+        int nr = 20;
+        Client c = Client.create();
+        c.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
+        
+        File b1 = new File("b1.jar");
+        File b2 = new File("b2.jar");
+        createBundle(b1, "b1", "1.0.0");
+        createBundle(b2, "b2", "1.0.0");
+        b1.deleteOnExit();
+        b2.deleteOnExit();
+        
+        WebResource w1 = createWorkspace(c);
+        createArtifact(c, w1, "a1", "b1", "1.0.0", b1.toURI().toURL().toString(), BundleHelper.MIMETYPE);
+        createArtifact(c, w1, "a2", "b2", "1.0.0", b2.toURI().toURL().toString(), BundleHelper.MIMETYPE);
+        createTarget(c, w1, "t1");
+        w1.post();
+        w1.delete();
+        for (int i = 0; i < nr; i++) {
+            WebResource w = createWorkspace(c);
+            createAssociationA2F(c, w, "artifact2feature", "a1", "feat-1-" + i);
+            createAssociationA2F(c, w, "artifact2feature", "a2", "feat-2-" + i);
+            createFeature(c, w, "feat-1-" + i);
+            createFeature(c, w, "feat-2-" + i);
+            createAssociationF2D(c, w, "feature2distribution", "feat-1-" + i, "dist-" + i);
+            createAssociationF2D(c, w, "feature2distribution", "feat-2-" + i, "dist-" + i);
+            createDistribution(c, w, "dist-" + i);
+            createAssociationD2T(c, w, "distribution2target", "dist-" + i, "t1");
+            w.post();
+            w.delete();
+        }
+        WebResource t1versions = c.resource("http://localhost:8080/deployment/t1/versions");
+        assertEquals("1.0.0\n", t1versions.get(String.class));
+    }
+    
+    
+    /** Asserts that a list of entities exist by trying to GET them. */
+    private void assertEntitiesExist(WebResource... entities) throws Exception {
+        for (WebResource r : entities) {
+            r.get(String.class);
+        }
+    }
     
+    /**
+     * Asserts that a collection of resources exist by trying to GET the list, validate the
+     * number of items and finally GET each item.
+     */
+    private void assertResources(Gson gson, WebResource w2, String type, int number) {
+        String[] artifacts = gson.fromJson(w2.path(type).get(String.class), String[].class);
+        assertEquals("Wrong number of " + type + "s", number, artifacts.length);
+        for (String id : artifacts) {
+            w2.path(type + "/" + id).get(String.class);
+        }
+    }
+
+    /** Creates a new workspace. */
+    private WebResource createWorkspace(Client c) {
+        WebResource r = c.resource("http://localhost:8080/client/work");
+        try {
+            r.post(String.class, "");
+            fail("We should have been redirected to a new workspace.");
+            return null; // to keep the compiler happy, it does not understand what fail()
does
+        }
+        catch (UniformInterfaceException e) {
+            return c.resource(e.getResponse().getLocation());
+        }
+    }
+
+    /** Creates an artifact. */
+    private WebResource createArtifact(Client c, WebResource work, String name, String bsn,
String v, String url, String mimetype) throws IOException {
+        return createEntity(c, work, "artifact", "{attributes: {" +
+    		"artifactName: \"" + name + "\", " +
+			"url: \"" + url + "\", " +
+            "Bundle-SymbolicName: \"" + bsn + "\", " +
+    		"Bundle-Version: \"" + v + "\", " +
+			"mimetype: \"" + mimetype + "\"" +
+			"}, tags: {}}");
+    }
+
+    /** Creates a feature. */
+    private WebResource createFeature(Client c, WebResource work, String name) throws IOException
{
+        return createEntity(c, work, "feature", "{attributes: {name: \"" + name + "\"}, tags:
{}}");
+    }
+
+    /** Creates a distribution. */
+    private WebResource createDistribution(Client c, WebResource work, String name) throws
IOException {
+        return createEntity(c, work, "distribution", "{attributes: {name: \"" + name + "\"},
tags: {}}");
+    }
+
+    /** Creates a target. */
+    private WebResource createTarget(Client c, WebResource work, String name) throws IOException
{
+        return createEntity(c, work, "target", "{attributes: {id: \"" + name + "\", autoapprove:
\"true\"}, tags: {}}");
+    }
+
+    /** Creates an association between an artifact and a feature. */
+    private WebResource createAssociationA2F(Client c, WebResource work, String type, String
left, String right) throws IOException {
+        return createEntity(c, work, type, "{attributes: {leftEndpoint: \"(artifactName="
+ left + ")\", rightEndpoint=\"(name=" + right + ")\", leftCardinality: \"1\", rightCardinality=\"1\"},
tags: {}}");
+    }
+
+    /** Creates an association between a feature and a distribution. */
+    private WebResource createAssociationF2D(Client c, WebResource work, String type, String
left, String right) throws IOException {
+        return createEntity(c, work, type, "{attributes: {leftEndpoint: \"(name=" + left
+ ")\", rightEndpoint=\"(name=" + right + ")\", leftCardinality: \"1\", rightCardinality=\"1\"},
tags: {}}");
+    }
+    
+    /** Creates an association between a distribution and a target. */
+    private WebResource createAssociationD2T(Client c, WebResource work, String type, String
left, String right) throws IOException {
+        return createEntity(c, work, type, "{attributes: {leftEndpoint: \"(name=" + left
+ ")\", rightEndpoint=\"(id=" + right + ")\", leftCardinality: \"1\", rightCardinality=\"1\"},
tags: {}}");
+    }
+
+    /** Creates an entity. */
+    private WebResource createEntity(Client c, WebResource work, String type, String data)
throws IOException {
+        WebResource entity = work.path(type);
+        try {
+            entity.post(String.class, data);
+            throw new IOException("Could not create " + type + " with data " + data);
+        }
+        catch (UniformInterfaceException e2) {
+            return c.resource(e2.getResponse().getLocation());
+        }
+    }
+
+    /** Creates a bundle on disk, using the specified file, symbolic name and version. */
+    private void createBundle(File f, String bsn, String v) throws Exception {
+        Builder b = new Builder();
+        b.setProperty("Bundle-SymbolicName", bsn);
+        b.setProperty("Bundle-Version", v);
+        Jar jar = b.build();
+        Manifest m = jar.getManifest();
+        jar.write(f);
+    }
+    
+    /** Configure the server for this test. */
     private void configureServer() throws IOException {
         configure("org.apache.ace.client.rest",
             "org.apache.ace.server.servlet.endpoint", "/client",
@@ -127,13 +363,12 @@ public class RESTClientTest extends Inte
             "repositoryCustomer", "apache",
             "repositoryName", "user");
     }
+    
+    /** Create a user so we can log in to the server. */
+    @SuppressWarnings("unchecked")
     private void createServerUser() {
         User user = (User) m_user.createRole("d", Role.USER);
         user.getProperties().put("username", "d");
         user.getCredentials().put("password", "f");
     }
-    
-    public static void main(String[] args) throws Exception {
-        new RESTClientTest().testCreateAndDestroyRESTSession();
-    }
 }



Mime
View raw message