Author: angelos
Date: Wed Jan 26 20:00:45 2011
New Revision: 1063858
URL: http://svn.apache.org/viewvc?rev=1063858&view=rev
Log:
ACE-79 ported over the Log integration test.
Added:
incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/
incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
Modified:
incubator/ace/trunk/ace-integrationtests/pom.xml
incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
Modified: incubator/ace/trunk/ace-integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/pom.xml?rev=1063858&r1=1063857&r2=1063858&view=diff
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/pom.xml (original)
+++ incubator/ace/trunk/ace-integrationtests/pom.xml Wed Jan 26 20:00:45 2011
@@ -237,6 +237,41 @@
<artifactId>ace-deployment-streamgenerator</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-log</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-log-listener</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-log-servlet</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-server-log-store</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-log-task</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-gateway-log</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>ace-gateway-log-store</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
Modified: incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java?rev=1063858&r1=1063857&r2=1063858&view=diff
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
(original)
+++ incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
Wed Jan 26 20:00:45 2011
@@ -158,10 +158,37 @@ public class Options {
return maven("ace-deployment-provider-filebased");
}
- private static MavenArtifactProvisionOption maven(String artifactId) {
- return Options.maven("org.apache.ace", artifactId);
+ public static MavenArtifactProvisionOption log() {
+ return maven("ace-log");
+ }
+
+ public static MavenArtifactProvisionOption logListener() {
+ return maven("ace-log-listener");
+ }
+
+ public static MavenArtifactProvisionOption logServlet() {
+ return maven("ace-log-servlet");
+ }
+
+ public static MavenArtifactProvisionOption serverLogStore() {
+ return maven("ace-server-log-store");
}
+ public static MavenArtifactProvisionOption logTask() {
+ return maven("ace-log-task");
+ }
+
+ public static MavenArtifactProvisionOption gatewayLog() {
+ return maven("ace-gateway-log");
+ }
+
+ public static MavenArtifactProvisionOption gatewayLogStore() {
+ return maven("ace-gateway-log-store");
+ }
+
+ public static MavenArtifactProvisionOption maven(String artifactId) {
+ return Options.maven("org.apache.ace", artifactId);
+ }
}
public static class Knopflerfish {
Added: incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java?rev=1063858&view=auto
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
(added)
+++ incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
Wed Jan 26 20:00:45 2011
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.it.log;
+
+import org.apache.ace.discovery.property.constants.DiscoveryConstants;
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.identification.property.constants.IdentificationConstants;
+import org.apache.ace.it.IntegrationTestBase;
+import org.apache.ace.it.Options.Ace;
+import org.apache.ace.it.Options.Felix;
+import org.apache.ace.it.Options.Osgi;
+import org.apache.ace.log.Log;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.test.constants.TestConstants;
+import org.apache.felix.dm.Component;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.container.def.options.VMOption;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Constants;
+import org.osgi.service.http.HttpService;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+/**
+ * Integration tests for the audit log. Both a server and a gateway are setup
+ * on the same machine. The audit log is run and we check if it is indeed
+ * replicated to the server.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class LogIntegrationTest extends IntegrationTestBase {
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
+ new VMOption("-ea"),
+ provision(
+ Osgi.compendium(),
+ Felix.dependencyManager(),
+ Felix.configAdmin(),
+ jetty(),
+ Ace.util(),
+ Ace.rangeApi(),
+ Ace.discoveryApi(),
+ Ace.discoveryProperty(),
+ Ace.identificationApi(),
+ Ace.identificationProperty(),
+ Ace.httplistener(),
+ Ace.log(),
+ Ace.logListener(),
+ Ace.logServlet(),
+ Ace.serverLogStore(),
+ Ace.logTask(),
+ Ace.gatewayLog(),
+ Ace.gatewayLogStore()
+ )
+ );
+ }
+
+ protected void before() throws IOException {
+ configure(DiscoveryConstants.DISCOVERY_PID,
+ DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + TestConstants.PORT);
+ configure(IdentificationConstants.IDENTIFICATION_PID,
+ IdentificationConstants.IDENTIFICATION_GATEWAYID_KEY, GWID);
+
+ configureFactory("org.apache.ace.gateway.log.store.factory",
+ "name", "auditlog");
+ configureFactory("org.apache.ace.gateway.log.factory",
+ "name", "auditlog");
+
+ configure("org.apache.ace.deployment.servlet",
+ HttpConstants.ENDPOINT, DEPLOYMENT);
+
+ configureFactory("org.apache.ace.server.log.servlet.factory",
+ "name", "auditlog",
+ HttpConstants.ENDPOINT, AUDITLOG);
+ configureFactory("org.apache.ace.server.log.store.factory",
+ "name", "auditlog");
+
+ }
+
+ protected Component[] getDependencies() {
+ return new Component[] {
+ createComponent()
+ .setImplementation(this)
+ .add(createServiceDependency().setService(HttpService.class).setRequired(true))
+ .add(createServiceDependency().setService(Log.class, "(&("+ Constants.OBJECTCLASS+"="+Log.class.getName()+")(name=auditlog))").setRequired(true))
+ .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=auditlog))").setRequired(true))
+ .add(createServiceDependency().setService(Runnable.class, "(&("+Constants.OBJECTCLASS+"="+Runnable.class.getName()+")(taskName=auditlog))").setRequired(true))
+ };
+ }
+
+ private static final String AUDITLOG = "/auditlog";
+ private static final String DEPLOYMENT = "/deployment";
+
+ public static final String HOST = "localhost";
+ public static final String GWID = "gw-id";
+
+ private volatile Log m_auditLog;
+ private volatile LogStore m_serverStore;
+ private volatile Runnable m_auditLogSyncTask;
+
+ @Test
+ public void runTests() throws Exception {
+ startupAndTestReplication();
+ testServlet();
+ }
+
+ public void startupAndTestReplication() throws Exception {
+ // now log another event
+ Properties props = new Properties();
+ props.put("one", "value1");
+ props.put("two", "value2");
+ m_auditLog.log(12345, props);
+
+ boolean found = false;
+ long startTime = System.currentTimeMillis();
+ while ((!found) && (System.currentTimeMillis() - startTime < 5000)) {
+ // synchronize again
+ m_auditLogSyncTask.run();
+
+ // get and evaluate results (note that there is some concurrency that might interfere
with this test)
+ List<LogDescriptor> ranges2 = m_serverStore.getDescriptors();
+ if (ranges2.size() > 0) {
+// assert ranges2.size() == 1 : "We should still have audit log events for one
gateway on the server, but found " + ranges2.size();
+ LogDescriptor range = ranges2.get(0);
+ List<LogEvent> events = m_serverStore.get(range);
+ if (events.size() > 1) {
+// assert events.size() > 1 : "We should have a couple of events, at
least more than the one we added ourselves.";
+ for (LogEvent event : events) {
+ if (event.getType() == 12345) {
+ assert event.getProperties().get("two").equals("value2") : "We
could not retrieve a property of our audit log event.";
+ found = true;
+ break;
+ }
+ }
+ }
+ }
+
+ // wait if we have not found anything yet
+ if (!found) {
+ try { TimeUnit.MILLISECONDS.sleep(100); } catch (InterruptedException ie)
{}
+ }
+ }
+ assert found : "We could not retrieve our audit log event (after 5 seconds).";
+ }
+
+ public void testServlet() throws Exception {
+ // prepare the store
+ List<LogEvent> events = new ArrayList<LogEvent>();
+ events.add(new LogEvent("42", 1, 1, 1, 1, new Properties()));
+ events.add(new LogEvent("47", 1, 1, 1, 1, new Properties()));
+ events.add(new LogEvent("47", 2, 1, 1, 1, new Properties()));
+ events.add(new LogEvent("47", 2, 2, 1, 1, new Properties()));
+ m_serverStore.put(events);
+
+ List<String> result = getResponse("http://localhost:" + TestConstants.PORT
+ "/auditlog/query");
+ assert result.size() > 1 : "We expect at least two logs on the server.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=42");
+ assert result.size() == 1 : "Gateway 42 has a single audit log event.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47");
+ assert result.size() == 3 : "Gateway 47 has 3 audit log events.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=1");
+ assert result.size() == 1 : "Gateway 47, logid 1 has 1 audit log event.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2");
+ assert result.size() == 2 : "Gateway 47, logid 2 has 2 audit log events.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=1");
+ assert result.size() == 1 : "Gateway 47, logid 2, range 1 has 1 audit log event.";
+
+ result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=3,5");
+ assert result.size() == 0 : "Gateway 47, logid 2, range 3,5 has 0 audit log event.";
+ }
+
+ private List<String> getResponse(String request) throws IOException {
+ List<String> result = new ArrayList<String>();
+ InputStream in = null;
+ try {
+ in = new URL(request).openConnection().getInputStream();
+ byte[] response = new byte[in.available()];
+ in.read(response);
+
+ StringBuilder element = new StringBuilder();
+ for (byte b : response) {
+ switch(b) {
+ case '\n' :
+ result.add(element.toString());
+ element = new StringBuilder();
+ break;
+ default :
+ element.append(b);
+ }
+ }
+ }
+ finally {
+ try {
+ in.close();
+ }
+ catch (Exception e) {
+ // no problem.
+ }
+ }
+ return result;
+ }
+}
|