Skip to content

Commit

Permalink
Bettered tests for JMS Atom eventing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajs6f
ajs6f committed Feb 2, 2013
1 parent 8da2557 commit ca9f967
Show file tree
Hide file tree
Showing 4 changed files with 146 additions and 64 deletions.
6 changes: 3 additions & 3 deletions src/main/java/org/fcrepo/modeshape/observer/JMSTopicPublisher.java
View file
Expand Up @@ -49,9 +49,9 @@ public class JMSTopicPublisher {
public void publishJCREvent(Event jcrEvent) throws JMSException,
RepositoryException, IOException {
Entry entry = abdera.newEntry();
entry.addCategory("fedora-types:pid", jcrEvent.getPath(), "xsd:string");
entry.setTitle(operationsMappings.get(jcrEvent.getType()), Type.TEXT);
entry.setBaseUri("http://localhost:8080/rest");
entry.setTitle(operationsMappings.get(jcrEvent.getType()), Type.TEXT)
.setBaseUri("http://localhost:8080/rest");
entry.addCategory("xsd:string", jcrEvent.getPath(), "fedora-types:pid");
StringWriter writer = new StringWriter();
entry.writeTo(writer);
String atomMessage = writer.toString();
Expand Down
118 changes: 118 additions & 0 deletions src/test/java/org/fcrepo/modeshape/observer/AtomJMSTest.java
View file
@@ -0,0 +1,118 @@
package org.fcrepo.modeshape.observer;

import static org.junit.Assert.assertEquals;

import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;

import javax.inject.Inject;
import javax.jcr.LoginException;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.TextMessage;

import org.apache.abdera.Abdera;
import org.apache.abdera.model.Category;
import org.apache.abdera.model.Entry;
import org.apache.abdera.parser.ParseException;
import org.apache.abdera.parser.Parser;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.modeshape.common.SystemFailureException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({ "/spring/eventing.xml", "/spring/repo.xml" })
public class AtomJMSTest implements MessageListener {

@Inject
private Repository repository;

@Inject
private ActiveMQConnectionFactory connectionFactory;

private Connection connection;
private javax.jms.Session session;
private MessageConsumer consumer;

static Parser parser = new Abdera().getParser();
private Entry entry;

final private Logger logger = LoggerFactory.getLogger(AtomJMSTest.class);

@Test
public void testNodeCreation() throws LoginException, RepositoryException {
Session session = repository.login();
session.getRootNode().addNode("test1").addMixin("fedora:object");
session.save();
session.logout();
while (entry == null)
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
List<Category> categories = entry.getCategories("xsd:string");
String path = null;
for (Category cat : categories) {
if (cat.getLabel().equals("fedora-types:pid")) {
logger.debug("Found Category with term: " + cat.getTerm());
path = cat.getTerm();
}
}
assertEquals("Got wrong pid!", "/test1", path);
assertEquals("Got wrong method!", "ingest", entry.getTitle());
}

@Override
public void onMessage(Message message) {
logger.debug("Received JMS message: " + message.toString());
TextMessage tMessage = (TextMessage) message;
try {
entry = (Entry) parser.parse(
new ByteArrayInputStream(tMessage.getText().getBytes(
"UTF-8"))).getRoot();
logger.debug("Parsed Entry: " + entry.toString());
} catch (ParseException e) {
throw new SystemFailureException(e);
} catch (JMSException e) {
throw new SystemFailureException(e);
} catch (UnsupportedEncodingException e) {
throw new SystemFailureException(e);
}

}

@Before
public void acquireConnection() throws JMSException {
logger.debug(this.getClass().getName() + " acquiring JMS connection.");
connection = connectionFactory.createConnection();
connection.start();
session = connection.createSession(false,
javax.jms.Session.AUTO_ACKNOWLEDGE);
consumer = session.createConsumer(session.createTopic("fedora"));
consumer.setMessageListener(this);
}

@After
public void releaseConnection() throws JMSException {
logger.debug(this.getClass().getName() + " releasing JMS connection.");
consumer.close();
session.close();
connection.close();
}

}
66 changes: 5 additions & 61 deletions src/test/java/org/fcrepo/modeshape/observer/SimpleObserverTest.java
View file
Expand Up @@ -3,19 +3,11 @@
import static junit.framework.Assert.assertEquals;

import javax.inject.Inject;
import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.observation.Event;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;

import org.apache.activemq.ActiveMQConnectionFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All @@ -28,34 +20,21 @@

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({ "/spring/eventing.xml", "/spring/repo.xml" })
public class SimpleObserverTest implements MessageListener {
public class SimpleObserverTest {

private Integer eventBusMessageCount;
private Integer jmsMessageCount;

@Inject
private Repository repository;

@Inject
private SimpleObserver o;

@Inject
private EventBus eventBus;

@Inject
private ActiveMQConnectionFactory connectionFactory;

private Connection connection;
private javax.jms.Session session;

@Test
public void TestEventBusPublishing() throws RepositoryException {

Session se = repository.login();
Node testnode = se.getRootNode().addNode("/object1");
testnode.addMixin("fedora:object");
Node testnode2 = se.getRootNode().addNode("/object2");
testnode2.addMixin("fedora:object");
se.getRootNode().addNode("/object1").addMixin("fedora:object");
se.getRootNode().addNode("/object2").addMixin("fedora:object");
se.save();
se.logout();

Expand All @@ -73,54 +52,19 @@ public void TestEventBusPublishing() throws RepositoryException {

}

@Test
public void TestJMSPublishing() throws LoginException, RepositoryException {
Session se = repository.login();
Node testnode = se.getRootNode().addNode("/object3");
testnode.addMixin("fedora:object");
Node testnode2 = se.getRootNode().addNode("/object4");
testnode2.addMixin("fedora:object");
se.save();
se.logout();

try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
assertEquals("Where are my messages!?", (Integer) 2, jmsMessageCount);
}

@Subscribe
public void countMessages(Event e) {
eventBusMessageCount++;
}

@Override
public void onMessage(Message message) {
jmsMessageCount++;
}

@Before
public void acquireConnections() throws JMSException {
public void acquireConnections() {
eventBusMessageCount = 0;
jmsMessageCount = 0;
connection = connectionFactory.createConnection();
connection.start();
session = connection.createSession(false,
javax.jms.Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(session
.createTopic("fedora"));
consumer.setMessageListener(this);

eventBus.register(this);
}

@After
public void releaseConnections() throws JMSException {
session.close();
connection.close();

public void releaseConnections() {
eventBus.unregister(this);
}
}
20 changes: 20 additions & 0 deletions src/test/resources/logback.xml
View file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%p %d{HH:mm:ss.SSS} \(%c{0}\) %m%n</pattern>
</encoder>
</appender>
<logger name="org.fcrepo" additivity="false" level="DEBUG">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.modeshape" additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.apache.abdera" additivity="false" level="DEBUG">
<appender-ref ref="STDOUT"/>
</logger>
<root additivity="false" level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</configuration>

0 comments on commit ca9f967

Please sign in to comment.