svn commit: r1571420 - /manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java

[kwright]

Author: kwright
Date: Mon Feb 24 20:08:16 2014
New Revision: 1571420

URL: http://svn.apache.org/r1571420
Log:
Update test so that null values work as ES intended.  But I still haven't 
enabled them.

Modified:
    
manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java

Modified: 
manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java?rev=1571420&r1=1571419&r2=1571420&view=diff
==============================================================================
--- 
manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java
 (original)
+++ 
manifoldcf/integration/elasticsearch/trunk/src/test/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerTest.java
 Mon Feb 24 20:08:16 2014
@@ -57,7 +57,8 @@ import org.testng.annotations.Test;
 */
 public class MCFAuthorizerTest
 {
-  // Set this to true if null_value is ever fixed in ES
+  // Set this to true if we decide to us null_value in ES rather than explicit
+  // values sent by the connector.
   protected final static boolean useNullValue = false;
   
   protected Client client;
@@ -163,23 +164,45 @@ public class MCFAuthorizerTest
     {
       addDoc("da12",
         "allow_token_document", "token1",
-        "allow_token_document", "token2");
+        "allow_token_document", "token2",
+        "deny_token_document", null,
+        "allow_token_share", null,
+        "deny_token_share", null,
+        "allow_token_parent", null,
+        "deny_token_parent", null);
       addDoc("da13-dd3",
         "allow_token_document", "token1",
         "allow_token_document", "token3",
-        "deny_token_document", "token3");
+        "deny_token_document", "token3",
+        "allow_token_share", null,
+        "deny_token_share", null,
+        "allow_token_parent", null,
+        "deny_token_parent", null);
       addDoc("sa123-sd13",
         "allow_token_share", "token1",
         "allow_token_share", "token2",
         "allow_token_share", "token3",
         "deny_token_share", "token1",
-        "deny_token_share", "token3");
+        "deny_token_share", "token3",
+        "allow_token_document", null,
+        "deny_token_document", null,
+        "allow_token_parent", null,
+        "deny_token_parent", null);
       addDoc("sa3-sd1-da23",
         "allow_token_document", "token2",
         "allow_token_document", "token3",
         "allow_token_share", "token3",
-        "deny_token_share", "token1");
-      addDoc("notoken");
+        "deny_token_share", "token1",
+        "deny_token_document", null,
+        "allow_token_parent", null,
+        "deny_token_parent", null);
+      addDoc("notoken",
+        "allow_token_document", null,
+        "deny_token_document", null,
+        "allow_token_share", null,
+        "deny_token_share", null,
+        "allow_token_parent", null,
+        "deny_token_parent", null);
     }
     else
     {