Revision: 17847
          http://sourceforge.net/p/gate/code/17847
Author:   markagreenwood
Date:     2014-04-16 20:32:01 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
moved all the e-mail tests into the test class, this means nothing in src/main 
now depends on JUnit -- in otherwords it should no longer be a runtime 
dependency (although there is bound to be a plugin that messes that up)

Modified Paths:
--------------
    gate/trunk/src/main/gate/email/EmailDocumentHandler.java
    gate/trunk/src/test/gate/email/TestEmail.java

Modified: gate/trunk/src/main/gate/email/EmailDocumentHandler.java
===================================================================
--- gate/trunk/src/main/gate/email/EmailDocumentHandler.java    2014-04-16 
16:34:04 UTC (rev 17846)
+++ gate/trunk/src/main/gate/email/EmailDocumentHandler.java    2014-04-16 
20:32:01 UTC (rev 17847)
@@ -336,7 +336,7 @@
     * @return true if the line begins an e-mail message
     * @return false if is doesn't
     */
-  private boolean lineBeginsMessage(String aTextLine){
+  protected boolean lineBeginsMessage(String aTextLine){
     int score = 0;
 
     // if first token is "From" and the rest contains Day, Zone, etc
@@ -385,7 +385,7 @@
     * @return true if the line begins with a field from the e-mail header
     * @return false if is doesn't
     */
-  private boolean lineBeginsWithField(String aTextLine){
+  protected boolean lineBeginsWithField(String aTextLine){
     if (containsSemicolon(aTextLine)){
       StringTokenizer tokenizer = new StringTokenizer(aTextLine,":");
 
@@ -412,7 +412,7 @@
   /**
     * This method checks if a String contains white spaces.
     */
-  private boolean containsWhiteSpaces(String aString) {
+  protected boolean containsWhiteSpaces(String aString) {
     for (int i = 0; i<aString.length(); i++)
       if (Character.isWhitespace(aString.charAt(i))) return true;
     return false;
@@ -421,7 +421,7 @@
   /**
     * This method checks if a String contains a semicolon char
     */
-  private boolean containsSemicolon(String aString) {
+  protected boolean containsSemicolon(String aString) {
     for (int i = 0; i<aString.length(); i++)
       if (aString.charAt(i) == ':') return true;
     return false;
@@ -430,7 +430,7 @@
   /**
     * This method tests a token if is Day, Month, Zone, Time, Year
     */
-  private boolean hasAMeaning(String aToken) {
+  protected boolean hasAMeaning(String aToken) {
     // if token is a Day return true
     if (day.contains(aToken)) return true;
 
@@ -470,7 +470,7 @@
   /**
     * Tests a token if is in time format HH:MM:SS
     */
-  private boolean isTime(String aToken) {
+  protected boolean isTime(String aToken) {
     StringTokenizer st = new StringTokenizer(aToken,":");
 
     // test each token if is hour, minute or second
@@ -662,111 +662,4 @@
   private Collection<String> zone = null;
 
 
- // TEST SECTION
-
-  /**
-    * Test containsSemicolon
-    */
-  private void testContainsSemicolon() {
-    String str1 = "X-Sender: oana@derwent";
-    String str2 = "X-Sender oana@derwent";
-    String str3 = ":X-Sender oana@derwent";
-    String str4 = "X-Sender oana@derwent:";
-
-    Assert.assertTrue((containsSemicolon(str1) == true));
-    Assert.assertTrue((containsSemicolon(str2)== false));
-    Assert.assertTrue((containsSemicolon(str3) == true));
-    Assert.assertTrue((containsSemicolon(str4) == true));
-  }// testContainsSemicolon
-
-  /**
-    * Test containsWhiteSpaces
-    */
-  private void testContainsWhiteSpaces(){
-    String str1 = "Content-Type: TEXT/PLAIN; charset=US-ASCII";
-    String str2 = "Content-Type:TEXT/PLAIN;charset=US-ASCII";
-    String str3 = " Content-Type:TEXT/PLAIN;charset=US-ASCII";
-    String str4 = "Content-Type:TEXT/PLAIN;charset=US-ASCII ";
-
-    Assert.assertTrue((containsWhiteSpaces(str1) == true));
-    Assert.assertTrue((containsWhiteSpaces(str2) == false));
-    Assert.assertTrue((containsWhiteSpaces(str3) == true));
-    Assert.assertTrue((containsWhiteSpaces(str4) == true));
-  }// testContainsWhiteSpaces
-
-  /**
-    * Test hasAMeaning
-    */
-  private void testHasAMeaning() {
-    String str1 = "12:05:22";
-    String str2 = "Sep";
-    String str3 = "Fri";
-    String str4 = "2000";
-    String str5 = "GMT";
-    String str6 = "Date: Wed, 13 Sep 2000 13:05:22 +0100 (BST)";
-    String str7 = "12:75:22";
-    String str8 = "September";
-    String str9 = "Friday";
-
-    Assert.assertTrue((hasAMeaning(str1) == true));
-    Assert.assertTrue((hasAMeaning(str2) == true));
-    Assert.assertTrue((hasAMeaning(str3) == true));
-    Assert.assertTrue((hasAMeaning(str4) == true));
-    Assert.assertTrue((hasAMeaning(str5) == true));
-    Assert.assertTrue((hasAMeaning(str6) == false));
-    Assert.assertTrue((hasAMeaning(str7) == false));
-    Assert.assertTrue((hasAMeaning(str8) == false));
-    Assert.assertTrue((hasAMeaning(str9) == false));
-  } // testHasAMeaning
-
-  /**
-    * Test isTime
-    */
-  private void testIsTime() {
-    String str1 = "13:05:22";
-    String str2 = "13/05/22";
-    String str3 = "24:05:22";
-
-    Assert.assertTrue((isTime(str1) == true));
-    Assert.assertTrue((isTime(str2) == false));
-    Assert.assertTrue((isTime(str3) == false));
-  }// testIsTime
-
-  /**
-    * Test lineBeginsMessage
-    */
-  private void testLineBeginsMessage(){
-    String str1 = "From [email protected] Wed Sep 13 13:05:23 2000";
-    String str2 = "Date: Wed, 13 Sep 2000 13:05:22 +0100 (BST)";
-    String str3 = "From [email protected] Sep 13 13:05:23 2000";
-
-    Assert.assertTrue((lineBeginsMessage(str1) == true));
-    Assert.assertTrue((lineBeginsMessage(str2) == false));
-    Assert.assertTrue((lineBeginsMessage(str3) == false));
-
-  }// testLineBeginsMessage
-
-  /**
-    * Test lineBeginsWithField
-    */
-  private void testLineBeginsWithField() {
-    String str1 = "Message-ID: 
<Pine.SOL.3.91.1000913130311.19537A-10@derwent>";
-    String str2 = "%:ContentType TEXT/PLAIN; charset=US-ASCII";
-
-    Assert.assertTrue((lineBeginsWithField(str1) == true));
-    Assert.assertTrue((lineBeginsWithField(str2) == true));
-  }// testLineBeginsWithField
-
-   /**
-     * Test final
-     */
-   public void testSelf(){
-     testContainsSemicolon();
-     testContainsWhiteSpaces();
-     testHasAMeaning();
-     testIsTime();
-     testLineBeginsMessage();
-     testLineBeginsWithField();
-   } // testSelf
-
 } //EmailDocumentHandler

Modified: gate/trunk/src/test/gate/email/TestEmail.java
===================================================================
--- gate/trunk/src/test/gate/email/TestEmail.java       2014-04-16 16:34:04 UTC 
(rev 17846)
+++ gate/trunk/src/test/gate/email/TestEmail.java       2014-04-16 20:32:01 UTC 
(rev 17847)
@@ -24,6 +24,8 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+
+import org.junit.Assert;
 //import org.w3c.www.mime.*;
 
 
@@ -35,6 +37,8 @@
 
   /** Construction */
   public TestEmail(String name) { super(name); }
+  
+  private EmailDocumentHandler emailDocumentHandler = new 
EmailDocumentHandler();
 
   /** Fixture set up */
   @Override
@@ -76,11 +80,116 @@
   /**
     * final test
     */
-  public void testEmail(){
-    EmailDocumentHandler emailDocumentHandler = new EmailDocumentHandler();
-    emailDocumentHandler.testSelf();
-  }// testEmail
+  //public void testEmail(){
+ //   EmailDocumentHandler emailDocumentHandler = new EmailDocumentHandler();
+    //emailDocumentHandler.testSelf();
+ // }// testEmail
+  
+  /**
+   * Test containsSemicolon
+   */
+ public void testContainsSemicolon() {
+   String str1 = "X-Sender: oana@derwent";
+   String str2 = "X-Sender oana@derwent";
+   String str3 = ":X-Sender oana@derwent";
+   String str4 = "X-Sender oana@derwent:";
 
+   Assert.assertTrue((emailDocumentHandler.containsSemicolon(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.containsSemicolon(str2)== false));
+   Assert.assertTrue((emailDocumentHandler.containsSemicolon(str3) == true));
+   Assert.assertTrue((emailDocumentHandler.containsSemicolon(str4) == true));
+ }// testContainsSemicolon
+
+ /**
+   * Test containsWhiteSpaces
+   */
+ public void testContainsWhiteSpaces(){
+   String str1 = "Content-Type: TEXT/PLAIN; charset=US-ASCII";
+   String str2 = "Content-Type:TEXT/PLAIN;charset=US-ASCII";
+   String str3 = " Content-Type:TEXT/PLAIN;charset=US-ASCII";
+   String str4 = "Content-Type:TEXT/PLAIN;charset=US-ASCII ";
+
+   Assert.assertTrue((emailDocumentHandler.containsWhiteSpaces(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.containsWhiteSpaces(str2) == 
false));
+   Assert.assertTrue((emailDocumentHandler.containsWhiteSpaces(str3) == true));
+   Assert.assertTrue((emailDocumentHandler.containsWhiteSpaces(str4) == true));
+ }// testContainsWhiteSpaces
+
+ /**
+   * Test hasAMeaning
+   */
+ public void testHasAMeaning() {
+   String str1 = "12:05:22";
+   String str2 = "Sep";
+   String str3 = "Fri";
+   String str4 = "2000";
+   String str5 = "GMT";
+   String str6 = "Date: Wed, 13 Sep 2000 13:05:22 +0100 (BST)";
+   String str7 = "12:75:22";
+   String str8 = "September";
+   String str9 = "Friday";
+
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str2) == true));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str3) == true));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str4) == true));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str5) == true));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str6) == false));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str7) == false));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str8) == false));
+   Assert.assertTrue((emailDocumentHandler.hasAMeaning(str9) == false));
+ } // testHasAMeaning
+
+ /**
+   * Test isTime
+   */
+ public void testIsTime() {
+   String str1 = "13:05:22";
+   String str2 = "13/05/22";
+   String str3 = "24:05:22";
+
+   Assert.assertTrue((emailDocumentHandler.isTime(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.isTime(str2) == false));
+   Assert.assertTrue((emailDocumentHandler.isTime(str3) == false));
+ }// testIsTime
+
+ /**
+   * Test lineBeginsMessage
+   */
+ public void testLineBeginsMessage(){
+   String str1 = "From [email protected] Wed Sep 13 13:05:23 2000";
+   String str2 = "Date: Wed, 13 Sep 2000 13:05:22 +0100 (BST)";
+   String str3 = "From [email protected] Sep 13 13:05:23 2000";
+
+   Assert.assertTrue((emailDocumentHandler.lineBeginsMessage(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.lineBeginsMessage(str2) == false));
+   Assert.assertTrue((emailDocumentHandler.lineBeginsMessage(str3) == false));
+
+ }// testLineBeginsMessage
+
+ /**
+   * Test lineBeginsWithField
+   */
+ public void testLineBeginsWithField() {
+   String str1 = "Message-ID: <Pine.SOL.3.91.1000913130311.19537A-10@derwent>";
+   String str2 = "%:ContentType TEXT/PLAIN; charset=US-ASCII";
+
+   Assert.assertTrue((emailDocumentHandler.lineBeginsWithField(str1) == true));
+   Assert.assertTrue((emailDocumentHandler.lineBeginsWithField(str2) == true));
+ }// testLineBeginsWithField
+
+  /**
+    * Test final
+    */
+  /*public void testSelf(){
+    testContainsSemicolon();
+    testContainsWhiteSpaces();
+    testHasAMeaning();
+    testIsTime();
+    testLineBeginsMessage();
+    testLineBeginsWithField();
+  } // testSelf*/
+
   /** Test suite routine for the test runner */
   public static Test suite() {
     return new TestSuite(TestEmail.class);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to