Author: rdonkin
Date: Wed Dec 31 04:35:49 2008
New Revision: 730381
URL: http://svn.apache.org/viewvc?rev=730381&view=rev
Log:
Fix tests by taking out Torque workaround.
Modified:
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SelectedStateTest.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
Modified:
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SelectedStateTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SelectedStateTest.java?rev=730381&r1=730380&r2=730381&view=diff
==============================================================================
---
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SelectedStateTest.java
(original)
+++
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SelectedStateTest.java
Wed Dec 31 04:35:49 2008
@@ -26,18 +26,4 @@
public SelectedStateTest() throws Exception {
super(JPAHostSystem.build());
}
-
- @Override
- public void testCopyITALY() throws Exception {
- }
-
- @Override
- public void testCopyKOREA() throws Exception {
- }
-
- @Override
- public void testCopyUS() throws Exception {
- }
-
-
}
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=730381&r1=730380&r2=730381&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
Wed Dec 31 04:35:49 2008
@@ -225,20 +225,19 @@
public long[] recent(boolean reset, MailboxSession mailboxSession) throws
MailboxManagerException {
try {
final MessageMapper mapper = new
MessageMapper(entityManagerFactory.createEntityManager());
+ mapper.begin();
final List<Message> messages =
mapper.findRecentMessagesInMailbox(mailboxId);
final long[] results = new long[messages.size()];
int count = 0;
for (Message message:messages) {
results[count++] = message.getUid();
+ if (reset) {
+ message.unsetRecent();
+ }
}
- if (reset) {
- final MessageMapper resetMapper = new
MessageMapper(entityManagerFactory.createEntityManager());
- resetMapper.begin();
- resetMapper.resetRecentMessages(mailboxId);
- resetMapper.commit();
- }
+ mapper.commit();
return results;
} catch (PersistenceException e) {
throw new MailboxManagerException(e);
@@ -472,8 +471,10 @@
FetchGroupImpl.MINIMAL);
toMailbox.getUidChangeTracker().found(messageResult);
}
- mapper.commit();
}
+
+ mapper.commit();
+
} catch (PersistenceException e) {
throw new MailboxManagerException(e);
} catch (MessagingException e) {
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java?rev=730381&r1=730380&r2=730381&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
Wed Dec 31 04:35:49 2008
@@ -133,12 +133,7 @@
.setParameter("fromParam", from)
.setParameter("toParam", to).getResultList();
}
-
- public void resetRecentMessages(long mailboxId) {
-
entityManager.createNamedQuery("resetRecentMessages").setParameter("idParam",
mailboxId).executeUpdate();
- }
-
public long countMessagesInMailbox(long mailboxId) {
return (Long)
entityManager.createNamedQuery("countMessagesInMailbox").setParameter("idParam",
mailboxId).getSingleResult();
}
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java?rev=730381&r1=730380&r2=730381&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
Wed Dec 31 04:35:49 2008
@@ -38,8 +38,6 @@
@Entity
@IdClass(Message.MessageId.class)
@NamedQueries({
- @NamedQuery(name="resetRecentMessages",
- query="UPDATE Message message SET message.recent = FALSE WHERE
message.mailboxId = :idParam AND message.recent = FALSE"),
@NamedQuery(name="findRecentMessagesInMailbox",
query="SELECT message FROM Message message WHERE message.mailboxId
= :idParam AND message.recent = TRUE"),
@NamedQuery(name="findUnseenMessagesInMailboxOrderByUid",
@@ -240,6 +238,14 @@
return Collections.unmodifiableList(headers);
}
+ /**
+ * Sets {...@link #isRecent()} to false.
+ * A message can only be recent once.
+ */
+ public void unsetRecent() {
+ recent = false;
+ }
+
public void setFlags(Flags flags) {
answered = flags.contains(Flags.Flag.ANSWERED);
deleted = flags.contains(Flags.Flag.DELETED);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
