Author: tommaso
Date: Tue Oct 16 13:29:18 2012
New Revision: 1398783
URL: http://svn.apache.org/viewvc?rev=1398783&view=rev
Log:
[CLEREZZA-718] - removing hard coded keys / license ids and ignoring tests
requiring it
Modified:
incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
Modified:
incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java?rev=1398783&r1=1398782&r2=1398783&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.concept-tagging/src/test/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerTest.java
Tue Oct 16 13:29:18 2012
@@ -19,6 +19,7 @@
package org.apache.clerezza.uima.concept;
import org.apache.clerezza.rdf.core.Graph;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -26,12 +27,15 @@ import static org.junit.Assert.assertNot
/**
* Testcase for {@link UIMARemoteResourceTaggerService}
*/
+@Ignore
public class UIMARemoteResourceTaggerTest {
+ public static final String YOUR_ALCHEMYAPI_KEY_HERE = "...";
+
@Test
public void serviceExecutionTest() throws Exception {
UIMARemoteResourceTaggerService service = new
UIMARemoteResourceTaggerService();
- Graph graph = service.tagUri("http://incubator.apache.org/clerezza",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ Graph graph = service.tagUri("http://incubator.apache.org/clerezza",
YOUR_ALCHEMYAPI_KEY_HERE);
assertNotNull(graph);
}
}
Modified:
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java?rev=1398783&r1=1398782&r2=1398783&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java
Tue Oct 16 13:29:18 2012
@@ -23,6 +23,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.uima.utils.ExternalServicesFacade;
+import org.junit.Ignore;
import org.junit.Test;
import javax.ws.rs.core.MediaType;
@@ -34,6 +35,8 @@ import java.util.Map;
*/
public class UIMABaseMetadataGeneratorTest {
private static final String TEXT_TO_ANALYZE = "Italy, the defending
champions and four-time World Cup winners, suffer a shock World Cup defeat to
Slovakia, who win a remarkable game 3-2 to book their place in the last 16";
+ public static final String YOUR_ALCHEMYAPI_KEY_HERE = "...";
+ public static final String YOUR_OPENCALAIS_LICENSEID_HERE = "...";
@Test
public void testConstructor() throws Exception {
@@ -51,11 +54,12 @@ public class UIMABaseMetadataGeneratorTe
}
@Test
+ @Ignore
public void testGenerateMethodWithsupportedMediaType() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
Map<String, Object> parameterSettings = new HashMap<String, Object>();
- parameterSettings.put("apikey",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
- parameterSettings.put("licenseID", "g6h9zamsdtwhb93nc247ecrs");
+ parameterSettings.put("apikey", YOUR_ALCHEMYAPI_KEY_HERE);
+ parameterSettings.put("licenseID", YOUR_OPENCALAIS_LICENSEID_HERE);
externalServicesFacade.setParameterSetting(parameterSettings);
UIMABaseMetadataGenerator baseMetadataGenerator = new
UIMABaseMetadataGenerator(externalServicesFacade);
String textToAnalyze = TEXT_TO_ANALYZE;
Modified:
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java?rev=1398783&r1=1398782&r2=1398783&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
(original)
+++
incubator/clerezza/trunk/uima/uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
Tue Oct 16 13:29:18 2012
@@ -21,6 +21,7 @@ package org.apache.clerezza.uima.utils;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.jcas.tcas.Annotation;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.HashMap;
@@ -32,6 +33,7 @@ import static org.junit.Assert.*;
/**
* Testcase for {@link ExternalServicesFacade}
*/
+@Ignore
public class ExternalServicesFacadeTest {
private static final String AN_ENGLISH_TEXT = "this is a document supposed
to be recognized as written in the language of Queen Elizabeth";
@@ -40,11 +42,14 @@ public class ExternalServicesFacadeTest
private static final String ANOTHER_ENGLISH_TEXT = "President Obama vows to
\"make BP pay\" for the Gulf oil spill, and says the US must end its fossil
fuel \"addiction\".";
- @Test
+ public static final String YOUR_ALCHEMYAPI_KEY_HERE = "...";
+ public static final String YOUR_OPENCALAIS_LICENSEID_HERE = "...";
+
+ @Test
public void getLanguageTest() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
Map<String, Object> parameterSettings = new HashMap<String, Object>();
- parameterSettings.put("apikey",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ parameterSettings.put("apikey", YOUR_ALCHEMYAPI_KEY_HERE);
externalServicesFacade.setParameterSetting(parameterSettings);
FeatureStructure languageFS =
externalServicesFacade.getLanguage(AN_ENGLISH_TEXT);
String language =
languageFS.getStringValue(languageFS.getType().getFeatureByBaseName("language"));
@@ -57,7 +62,7 @@ public class ExternalServicesFacadeTest
public void getTagsTest() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
Map<String, Object> parameterSettings = new HashMap<String, Object>();
- parameterSettings.put("apikey",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ parameterSettings.put("apikey", YOUR_ALCHEMYAPI_KEY_HERE);
externalServicesFacade.setParameterSetting(parameterSettings);
List<FeatureStructure> tags =
externalServicesFacade.getTags(AN_ENGLISH_TEXT);
assertTrue(tags != null);
@@ -73,7 +78,7 @@ public class ExternalServicesFacadeTest
@Test
public void getNamedEntitiesTest() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
- String licenseId = "g6h9zamsdtwhb93nc247ecrs";
+ String licenseId = YOUR_OPENCALAIS_LICENSEID_HERE;
Map<String, Object> parameterSettings = new HashMap<String, Object>();
parameterSettings.put("licenseID", licenseId);
externalServicesFacade.setParameterSetting(parameterSettings);
@@ -93,7 +98,7 @@ public class ExternalServicesFacadeTest
public void getCategoryTest() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
Map<String, Object> parameterSettings = new HashMap<String, Object>();
- parameterSettings.put("apikey",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ parameterSettings.put("apikey", YOUR_ALCHEMYAPI_KEY_HERE);
externalServicesFacade.setParameterSetting(parameterSettings);
FeatureStructure categoryFS =
externalServicesFacade.getCategory(CLEREZZA_RELATED_TEXT);
String category =
categoryFS.getStringValue(categoryFS.getType().getFeatureByBaseName("text"));
@@ -104,7 +109,7 @@ public class ExternalServicesFacadeTest
public void getConceptsTest() throws Exception {
ExternalServicesFacade externalServicesFacade = new
ExternalServicesFacade();
Map<String, Object> parameterSettings = new HashMap<String, Object>();
- parameterSettings.put("apikey",
"04490000a72fe7ec5cb3497f14e77f338c86f2fe");
+ parameterSettings.put("apikey", YOUR_ALCHEMYAPI_KEY_HERE);
externalServicesFacade.setParameterSetting(parameterSettings);
List<FeatureStructure> concepts =
externalServicesFacade.getConcepts(ANOTHER_ENGLISH_TEXT);
assertTrue(concepts != null);