svn commit: r1068910 - in /uima/sandbox/trunk/Solrcas/src: main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java

[jo...@apache.org]

Author: joern
Date: Wed Feb  9 14:40:23 2011
New Revision: 1068910

URL: http://svn.apache.org/viewvc?rev=1068910&view=rev
Log:
UIMA-2041 Changed test to check for actual values. The passed values are now correctly assigned to member variables.

Modified:
    uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java
    uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java

Modified: uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java?rev=1068910&r1=1068909&r2=1068910&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java (original)
+++ uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrMappingConfiguration.java Wed Feb  9 14:40:23 2011
@@ -36,12 +36,11 @@ public class SolrMappingConfiguration {
 
   public SolrMappingConfiguration(String casMapping, String documentTextMapping, String documentLanguageMapping, Map<String, Map<String, String>> featureStructureMapping) {
     this.casMapping = casMapping;
-    this.documentLanguageMapping = documentTextMapping;
-    this.documentTextMapping = documentLanguageMapping;
+    this.documentLanguageMapping = documentLanguageMapping;
+    this.documentTextMapping = documentTextMapping;
     this.featureStructuresMapping = featureStructureMapping;
   }
 
-
   public String getDocumentLanguageMapping() {
     return documentLanguageMapping;
   }

Modified: uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java?rev=1068910&r1=1068909&r2=1068910&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java (original)
+++ uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/FieldMappingReaderTest.java Wed Feb  9 14:40:23 2011
@@ -4,6 +4,8 @@ import org.junit.Test;
 
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -36,16 +38,18 @@ public class FieldMappingReaderTest {
     try {
       FieldMappingReader fieldMappingReader = new FieldMappingReader();
       SolrMappingConfiguration mapping = fieldMappingReader.getConf("/solrmapping.xml");
-      assertTrue(mapping != null);
+      assertNotNull(mapping);
+      
       Map<String, Map<String, String>> featureStructuresMapping = mapping.getFeatureStructuresMapping();
       assertTrue(featureStructuresMapping != null);
       assertTrue(featureStructuresMapping.size()>0);
       for (String type : featureStructuresMapping.keySet()) {
         assertTrue(featureStructuresMapping.get(type)!=null && featureStructuresMapping.get(type).size()>0);
       }
-      assertTrue(mapping.getDocumentLanguageMapping()!=null && mapping.getDocumentLanguageMapping().length()>0);
-      assertTrue(mapping.getDocumentTextMapping()!=null && mapping.getDocumentTextMapping().length()>0);
-      assertTrue(mapping.getCasMapping()!=null && mapping.getCasMapping().length()>0);
+      
+      assertEquals("language", mapping.getDocumentLanguageMapping());
+      assertEquals("text", mapping.getDocumentTextMapping());
+      assertEquals("id", mapping.getCasMapping());
     } catch (Exception e) {
       fail(e.getLocalizedMessage());
     }