svn commit: r1395408 - in /stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi: classification/impl/CeliClassificationEnhancementEngineTest.java lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java

[rwesten]

Author: rwesten
Date: Sun Oct  7 22:44:30 2012
New Revision: 1395408

URL: http://svn.apache.org/viewvc?rev=1395408&view=rev
Log:
STANBOL-759: This ensure the correct usage of the 
RemoteServiceHelper.checkServiceUnavailable utility for the CELI engine. This 
should fix 
https://builds.apache.org/job/stanbol-trunk-1.6/1061/org.apache.stanbol.apache.stanbol.enhancer.engines.celi/
 as well as http://markmail.org/message/t26l4b7ajkic2ab5

Modified:
    
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
    
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java

Modified: 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java?rev=1395408&r1=1395407&r2=1395408&view=diff
==============================================================================
--- 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
 (original)
+++ 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
 Sun Oct  7 22:44:30 2012
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru
 
 import java.io.IOException;
 import java.net.UnknownHostException;
+import java.rmi.RemoteException;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -43,6 +44,7 @@ import org.apache.stanbol.enhancer.servi
 import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
 import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
 import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -105,12 +107,9 @@ public class CeliClassificationEnhanceme
                        int numTopicAnnotations = 
validateAllTopicAnnotations(ci.getMetadata()  , expectedValues);
                        assertTrue("No TpocisAnnotations found", 
numTopicAnnotations > 0);
                } catch (EngineException e) {
-                       if (e.getCause() != null && e.getCause() instanceof 
UnknownHostException) {
-                               log.warn("Celi Service not reachable -> 
offline? -> deactivate test");
-                               return;
-                       }
-                       throw e;
-               }
+            RemoteServiceHelper.checkServiceUnavailable(e);
+            return;
+        }
        }
 
 }

Modified: 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java?rev=1395408&r1=1395407&r2=1395408&view=diff
==============================================================================
--- 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
 (original)
+++ 
stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
 Sun Oct  7 22:44:30 2012
@@ -110,11 +110,8 @@ public class CeliLemmatizerEnhancementEn
         try {
                        morphoAnalysisEngine.computeEnhancements(ci);
         } catch (EngineException e) {
-            if (e.getCause() != null && e.getCause() instanceof 
UnknownHostException) {
-                log.warn("Celi Service not reachable -> offline? -> deactivate 
test");
-                return;
-            }
-            throw e;
+            RemoteServiceHelper.checkServiceUnavailable(e);
+            return;
         }
 
                TestUtils.logEnhancements(ci);
@@ -151,6 +148,7 @@ public class CeliLemmatizerEnhancementEn
             morphoAnalysisEngine.computeEnhancements(ci);
         } catch (EngineException e) {
             RemoteServiceHelper.checkServiceUnavailable(e);
+            return;
         }
 
         TestUtils.logEnhancements(ci);