Author: bago
Date: Sat Sep 27 09:58:00 2008
New Revision: 699685
URL: http://svn.apache.org/viewvc?rev=699685&view=rev
Log:
Removed .junit. package name from tests. (JSIEVE-33)
Added:
james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllTests.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/
james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
(contents, props changed)
- copied, changed from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
Removed:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllTests.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
Modified:
james/jsieve/trunk/src/test/resources/sieveConfig.xml
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java (from
r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java
Sat Sep 27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.commons.logging.LogFactory;
import org.apache.jsieve.BaseSieveContext;
import org.apache.jsieve.ConfigurationManager;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
public class AddressParseTest extends TestCase {
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressParseTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java Sat Sep
27 09:58:00 2008
@@ -17,17 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import javax.mail.MessagingException;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
/**
* Class AddressTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/AddressTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java (from
r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java Sat Sep
27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class AllOfTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/AllOfTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllTests.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllTests.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllTests.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java Sat Sep 27
09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.Test;
import junit.framework.TestSuite;
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/AllTests.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java (from
r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java Sat Sep
27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class AnyOfTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/AnyOfTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java Sat Sep 27
09:58:00 2008
@@ -17,18 +17,18 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
/**
* Class BodyTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/BodyTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java Sat
Sep 27 09:58:00 2008
@@ -17,16 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.CommandException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class <code>ConditionTest</code> tests the conditional commands if, elsif
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConditionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import java.util.HashMap;
import java.util.Iterator;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/ConfigurationManagerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java Sat Sep
27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class DiscardTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/DiscardTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java Sat
Sep 27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveEnvelopeMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveEnvelopeMailAdapter;
/**
* Class EnvelopeTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/EnvelopeTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java Sat Sep
27 09:58:00 2008
@@ -17,18 +17,18 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import javax.mail.MessagingException;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
/**
* Class ExistsTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/ExistsTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java (from
r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java Sat Sep
27 09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class FalseTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/FalseTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java Sat
Sep 27 09:58:00 2008
@@ -17,16 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class FileIntoTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/FileIntoTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java Sat Sep
27 09:58:00 2008
@@ -17,17 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import javax.mail.MessagingException;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
/**
* Class HeaderTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/HeaderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java Sat Sep 27
09:58:00 2008
@@ -17,16 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionKeep;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class KeepTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/KeepTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java Sat Sep 27
09:58:00 2008
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class LogTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/LogTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java
Sat Sep 27 09:58:00 2008
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.MailAdapter;
+import org.apache.jsieve.utils.JUnitUtils;
public class MultipleRequireTest extends TestCase {
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleRequireTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java Sat
Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/MultipleToTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java Sat Sep 27
09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class NotTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/NotTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java Sat
Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.exception.SieveException;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/OpenedAddress.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java Sat Sep
27 09:58:00 2008
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
+import org.apache.jsieve.commands.ThrowTestException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
public class QuotingTest extends TestCase {
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/QuotingTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java Sat Sep
27 09:58:00 2008
@@ -17,17 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.CommandException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionReject;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class RejectTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/RejectTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java
Sat Sep 27 09:58:00 2008
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class AddressTest
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireMissingTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java Sat Sep
27 09:58:00 2008
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class RequireTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/RequireTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java Sat Sep 27
09:58:00 2008
@@ -17,18 +17,18 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import javax.mail.MessagingException;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.mail.SieveMailException;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
+import org.apache.jsieve.utils.SieveMailAdapter;
/**
* Class SizeTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/SizeTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java Sat Sep 27
09:58:00 2008
@@ -17,17 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionKeep;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class StopTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/StopTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java (from
r699682, james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java Sat Sep 27
09:58:00 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit;
+package org.apache.jsieve;
import junit.framework.TestCase;
+import org.apache.jsieve.commands.ThrowTestException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
+import org.apache.jsieve.utils.JUnitUtils;
/**
* Class TrueTest
Propchange: james/jsieve/trunk/src/test/java/org/apache/jsieve/TrueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit.commands;
+package org.apache.jsieve.commands;
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/commands/ThrowTestException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit.comparator;
+package org.apache.jsieve.comparator;
import junit.framework.TestCase;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/comparator/ComparatorUtilsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java (from
r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit.utils;
+package org.apache.jsieve.utils;
import java.io.ByteArrayInputStream;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/JUnitUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit.utils;
+package org.apache.jsieve.utils;
import java.util.ArrayList;
import java.util.HashMap;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveEnvelopeMailAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
(from r699682,
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java?p2=james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java&p1=james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java&r1=699682&r2=699685&rev=699685&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
Sat Sep 27 09:58:00 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.jsieve.junit.utils;
+package org.apache.jsieve.utils;
import java.io.IOException;
import java.util.ArrayList;
Propchange:
james/jsieve/trunk/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/jsieve/trunk/src/test/resources/sieveConfig.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/resources/sieveConfig.xml?rev=699685&r1=699684&r2=699685&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/resources/sieveConfig.xml (original)
+++ james/jsieve/trunk/src/test/resources/sieveConfig.xml Sat Sep 27 09:58:00
2008
@@ -70,7 +70,7 @@
<!-- JUnit Commands for Testing -->
<entry>
<name>throwtestexception</name>
- <class>org.apache.jsieve.junit.commands.ThrowTestException</class>
+ <class>org.apache.jsieve.commands.ThrowTestException</class>
</entry>
<!-- Extension Commands -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
