Author: kwright
Date: Fri Apr 24 05:59:11 2015
New Revision: 1675783
URL: http://svn.apache.org/r1675783
Log:
Pull up temporary disabling of test failure from trunk
Modified:
manifoldcf/branches/release-2.1-branch/ (props changed)
manifoldcf/branches/release-2.1-branch/connectors/searchblox/connector/src/test/java/org/apache/manifoldcf/agents/output/searchblox/tests/SearchBloxDocumentTest.java
Propchange: manifoldcf/branches/release-2.1-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 05:59:11 2015
@@ -125,4 +125,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1673722
+/manifoldcf/trunk:1673722,1675781
Modified:
manifoldcf/branches/release-2.1-branch/connectors/searchblox/connector/src/test/java/org/apache/manifoldcf/agents/output/searchblox/tests/SearchBloxDocumentTest.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.1-branch/connectors/searchblox/connector/src/test/java/org/apache/manifoldcf/agents/output/searchblox/tests/SearchBloxDocumentTest.java?rev=1675783&r1=1675782&r2=1675783&view=diff
==============================================================================
---
manifoldcf/branches/release-2.1-branch/connectors/searchblox/connector/src/test/java/org/apache/manifoldcf/agents/output/searchblox/tests/SearchBloxDocumentTest.java
(original)
+++
manifoldcf/branches/release-2.1-branch/connectors/searchblox/connector/src/test/java/org/apache/manifoldcf/agents/output/searchblox/tests/SearchBloxDocumentTest.java
Fri Apr 24 05:59:11 2015
@@ -1,8 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.manifoldcf.agents.output.searchblox.tests;
import com.google.common.collect.Lists;
-import junit.framework.TestCase;
+//import junit.framework.TestCase;
import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
@@ -11,6 +27,8 @@ import org.apache.manifoldcf.agents.outp
import
org.apache.manifoldcf.agents.output.searchblox.SearchBloxDocument.IndexingFormat;
import org.apache.manifoldcf.agents.output.searchblox.SearchBloxException;
import org.junit.Test;
+import org.junit.Ignore;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -25,7 +43,7 @@ import java.util.Map;
* 07/03/2015
* mcf-searchblox-connector
*/
-public class SearchBloxDocumentTest extends TestCase{
+public class SearchBloxDocumentTest /*extends TestCase */ {
SearchBloxDocument toTest;
RepositoryDocument rd;
@@ -38,7 +56,8 @@ public class SearchBloxDocumentTest exte
}
@Test
- public void testUpdateXmlString() throws SearchBloxException {
+ @Ignore("fails on jdk 8 due to hash order")
+ public void updateXmlString() throws SearchBloxException {
String xmlGenerated=toTest.toString(IndexingFormat.XML,
DocumentAction.ADD_UPDATE);
System.out.println(xmlGenerated);
String xmlExpected="<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@@ -55,14 +74,16 @@ public class SearchBloxDocumentTest exte
}
@Test
- public void testUpdateJsonString() throws SearchBloxException {
+ @Ignore("fails on jdk 8 due to hash order")
+ public void updateJsonString() throws SearchBloxException {
String jsonGenerated=toTest.toString(IndexingFormat.JSON,
DocumentAction.ADD_UPDATE);
String expectedJson="{\"document\":{\"content\":\"I am a nice content
in english!\",\"uid\":\"URI\",\"title\":\"I am a nice
title\",\"description\":\"I am a little tiny
description\",\"contenttype\":\"html\",\"colname\":\"collection1\",\"meta\":{\"meta2\":[\"I
am META2!\"],\"meta1\":[\"I am
META1!\"],\"share_allow\":[\"user3\",\"user2\",\"user1\"],\"share_deny\":[\"user4\",\"user5\"],\"document_deny\":[\"user52\",\"user42\"],\"document_allow\":[\"user22\",\"user12\",\"user33\"]},\"size\":\"100\"},\"apikey\":\"apikey\"}";
assertEquals(expectedJson,jsonGenerated);
}
@Test
- public void testDeleteJsonString() throws SearchBloxException {
+ @Ignore("fails on jdk 8 due to hash order")
+ public void deleteJsonString() throws SearchBloxException {
String jsonGenerated=toTest.toString(IndexingFormat.JSON,
DocumentAction.DELETE);
System.out.println(jsonGenerated);
String
xmlExpected="{\"document\":{\"uid\":\"URI\",\"colname\":\"collection1\"},\"apikey\":\"apikey\"}";
@@ -70,7 +91,8 @@ public class SearchBloxDocumentTest exte
}
@Test
- public void testDeleteXmlString() throws SearchBloxException {
+ @Ignore("fails on jdk 8 due to hash order")
+ public void deleteXmlString() throws SearchBloxException {
String xmlGenerated=toTest.toString(IndexingFormat.XML,
DocumentAction.DELETE);
System.out.println(xmlGenerated);
String xmlExpected="<?xml version=\"1.0\"
encoding=\"UTF-8\"?><searchblox apikey=\"apikey\"><document
colname=\"collection1\" uid=\"URI\"/></searchblox>";
