Skip to content

Commit 5641dc8

Browse files
rjrudinrjrudin
authored
Merge pull request #1452 from marklogic/feature/move-converted-tests
Moved all converted tests to "fastfunctest"
2 parents f008029 + 1629554 commit 5641dc8

File tree

89 files changed

+919
-1622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+919
-1622
lines changed

‎Jenkinsfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ pipeline{
8181
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
8282
cd java-client-api
8383
./gradlew marklogic-client-api:test || true
84-
./gradlew marklogic-client-api-functionaltests:test --tests "com.marklogic.client.fastfunctest.*" || true
85-
./gradlew marklogic-client-api-functionaltests:test --tests "com.marklogic.client.converted.*" || true
8684
'''
8785
sh label:'ml development tool test', script: '''#!/bin/bash
8886
export JAVA_HOME=$JAVA_HOME_DIR

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestAggregates.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestAggregates.java

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
18-
19-
import static org.junit.Assert.assertEquals;
20-
21-
import java.io.IOException;
22-
import java.security.KeyManagementException;
23-
import java.security.NoSuchAlgorithmException;
24-
import java.text.DecimalFormat;
25-
26-
import javax.xml.parsers.ParserConfigurationException;
27-
import javax.xml.transform.TransformerException;
28-
29-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
30-
import org.custommonkey.xmlunit.exceptions.XpathException;
31-
import org.junit.After;
32-
import org.junit.AfterClass;
33-
import org.junit.BeforeClass;
34-
import org.junit.Test;
35-
import org.xml.sax.SAXException;
17+
package com.marklogic.client.fastfunctest;
3618

3719
import com.marklogic.client.DatabaseClient;
3820
import com.marklogic.client.io.Format;
@@ -42,6 +24,19 @@
4224
import com.marklogic.client.query.AggregateResult;
4325
import com.marklogic.client.query.QueryManager;
4426
import com.marklogic.client.query.ValuesDefinition;
27+
import org.custommonkey.xmlunit.exceptions.XpathException;
28+
import org.junit.After;
29+
import org.junit.Test;
30+
import org.xml.sax.SAXException;
31+
32+
import javax.xml.parsers.ParserConfigurationException;
33+
import javax.xml.transform.TransformerException;
34+
import java.io.IOException;
35+
import java.security.KeyManagementException;
36+
import java.security.NoSuchAlgorithmException;
37+
import java.text.DecimalFormat;
38+
39+
import static org.junit.Assert.assertEquals;
4540

4641
public class TestAggregates extends AbstractFunctionalTest {
4742

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBug18026.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBug18026.java

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
18-
19-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
20-
import static org.junit.Assert.assertTrue;
21-
22-
import java.io.FileInputStream;
23-
import java.io.IOException;
24-
import java.io.InputStream;
25-
import java.security.KeyManagementException;
26-
import java.security.NoSuchAlgorithmException;
27-
import java.util.HashMap;
28-
import java.util.Map;
29-
30-
import javax.xml.parsers.ParserConfigurationException;
31-
32-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
33-
import org.custommonkey.xmlunit.SimpleNamespaceContext;
34-
import org.custommonkey.xmlunit.XMLUnit;
35-
import org.custommonkey.xmlunit.XpathEngine;
36-
import org.custommonkey.xmlunit.exceptions.XpathException;
37-
import org.junit.AfterClass;
38-
import org.junit.BeforeClass;
39-
import org.junit.Test;
40-
import org.w3c.dom.Document;
41-
import org.xml.sax.SAXException;
17+
package com.marklogic.client.fastfunctest;
4218

4319
import com.fasterxml.jackson.databind.JsonNode;
4420
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -50,6 +26,25 @@
5026
import com.marklogic.client.io.StringHandle;
5127
import com.marklogic.client.query.QueryManager;
5228
import com.marklogic.client.query.StringQueryDefinition;
29+
import org.custommonkey.xmlunit.SimpleNamespaceContext;
30+
import org.custommonkey.xmlunit.XMLUnit;
31+
import org.custommonkey.xmlunit.XpathEngine;
32+
import org.custommonkey.xmlunit.exceptions.XpathException;
33+
import org.junit.Test;
34+
import org.w3c.dom.Document;
35+
import org.xml.sax.SAXException;
36+
37+
import javax.xml.parsers.ParserConfigurationException;
38+
import java.io.FileInputStream;
39+
import java.io.IOException;
40+
import java.io.InputStream;
41+
import java.security.KeyManagementException;
42+
import java.security.NoSuchAlgorithmException;
43+
import java.util.HashMap;
44+
import java.util.Map;
45+
46+
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
47+
import static org.junit.Assert.assertTrue;
5348

5449
public class TestBug18026 extends AbstractFunctionalTest {
5550

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBug18920.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBug18920.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,21 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
17+
package com.marklogic.client.fastfunctest;
1818

19-
import static org.junit.Assert.assertTrue;
20-
21-
import java.io.File;
22-
import java.io.IOException;
23-
import java.security.KeyManagementException;
24-
import java.security.NoSuchAlgorithmException;
25-
26-
import javax.xml.parsers.ParserConfigurationException;
27-
28-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
29-
import org.custommonkey.xmlunit.exceptions.XpathException;
30-
import org.junit.AfterClass;
31-
import org.junit.BeforeClass;
32-
import org.junit.Test;
33-
import org.xml.sax.SAXException;
34-
35-
import com.marklogic.client.DatabaseClient;
3619
import com.marklogic.client.FailedRequestException;
3720
import com.marklogic.client.admin.ServerConfigurationManager;
3821
import com.marklogic.client.admin.ServerConfigurationManager.UpdatePolicy;
3922
import com.marklogic.client.document.DocumentDescriptor;
4023
import com.marklogic.client.document.XMLDocumentManager;
4124
import com.marklogic.client.io.FileHandle;
25+
import org.junit.AfterClass;
26+
import org.junit.BeforeClass;
27+
import org.junit.Test;
28+
29+
import java.io.File;
30+
31+
import static org.junit.Assert.assertTrue;
4232

4333
public class TestBug18920 extends AbstractFunctionalTest {
4434

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBug26248.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBug26248.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
18-
19-
import java.io.ByteArrayInputStream;
20-
import java.io.InputStream;
21-
import java.security.KeyManagementException;
22-
import java.security.NoSuchAlgorithmException;
23-
24-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
25-
import org.junit.After;
26-
import org.junit.Before;
27-
import org.junit.Test;
17+
package com.marklogic.client.fastfunctest;
2818

2919
import com.marklogic.client.DatabaseClient;
3020
import com.marklogic.client.document.TextDocumentManager;
3121
import com.marklogic.client.io.InputStreamHandle;
3222
import com.marklogic.client.io.StringHandle;
23+
import org.junit.Test;
24+
25+
import java.io.ByteArrayInputStream;
26+
import java.io.InputStream;
27+
import java.security.KeyManagementException;
28+
import java.security.NoSuchAlgorithmException;
3329

3430
public class TestBug26248 extends AbstractFunctionalTest {
3531

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBulkReadSample1.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkReadSample1.java

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,25 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
17+
package com.marklogic.client.fastfunctest;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertNotNull;
21-
import static org.junit.Assert.assertTrue;
19+
import com.fasterxml.jackson.databind.JsonNode;
20+
import com.fasterxml.jackson.databind.ObjectMapper;
21+
import com.marklogic.client.DatabaseClient;
22+
import com.marklogic.client.document.*;
23+
import com.marklogic.client.io.*;
24+
import org.junit.BeforeClass;
25+
import org.junit.FixMethodOrder;
26+
import org.junit.Test;
27+
import org.junit.runners.MethodSorters;
2228

2329
import java.io.File;
2430
import java.security.KeyManagementException;
2531
import java.security.NoSuchAlgorithmException;
2632
import java.util.HashMap;
2733
import java.util.Map;
2834

29-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
30-
import org.junit.AfterClass;
31-
import org.junit.BeforeClass;
32-
import org.junit.FixMethodOrder;
33-
import org.junit.Ignore;
34-
import org.junit.Test;
35-
import org.junit.runners.MethodSorters;
36-
37-
import com.fasterxml.jackson.databind.JsonNode;
38-
import com.fasterxml.jackson.databind.ObjectMapper;
39-
import com.marklogic.client.DatabaseClient;
40-
import com.marklogic.client.document.BinaryDocumentManager;
41-
import com.marklogic.client.document.DocumentPage;
42-
import com.marklogic.client.document.DocumentRecord;
43-
import com.marklogic.client.document.DocumentWriteSet;
44-
import com.marklogic.client.document.GenericDocumentManager;
45-
import com.marklogic.client.document.JSONDocumentManager;
46-
import com.marklogic.client.document.TextDocumentManager;
47-
import com.marklogic.client.document.XMLDocumentManager;
48-
import com.marklogic.client.io.DOMHandle;
49-
import com.marklogic.client.io.FileHandle;
50-
import com.marklogic.client.io.Format;
51-
import com.marklogic.client.io.JacksonHandle;
52-
import com.marklogic.client.io.StringHandle;
35+
import static org.junit.Assert.*;
5336

5437
/*
5538
* This test is designed to to test simple bulk reads with different types of Managers and different content type like JSON,text,binary,XMl by passing set of uris

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBulkReadWriteMetaDataChange.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkReadWriteMetaDataChange.java

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,29 @@
1717
/**
1818
* This tests meta-data changes for text documents.
1919
*/
20-
package com.marklogic.client.converted;
21-
22-
import static org.junit.Assert.assertEquals;
23-
import static org.junit.Assert.assertTrue;
24-
25-
import java.security.KeyManagementException;
26-
import java.security.NoSuchAlgorithmException;
27-
import java.util.Calendar;
28-
29-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
30-
import com.marklogic.client.functionaltest.Product;
31-
import org.junit.*;
32-
import org.skyscreamer.jsonassert.JSONAssert;
20+
package com.marklogic.client.fastfunctest;
3321

3422
import com.fasterxml.jackson.databind.JsonNode;
35-
import com.marklogic.client.DatabaseClient;
3623
import com.marklogic.client.Transaction;
3724
import com.marklogic.client.document.DocumentManager.Metadata;
38-
import com.marklogic.client.document.DocumentPage;
39-
import com.marklogic.client.document.DocumentRecord;
40-
import com.marklogic.client.document.DocumentWriteSet;
41-
import com.marklogic.client.document.JSONDocumentManager;
42-
import com.marklogic.client.document.TextDocumentManager;
25+
import com.marklogic.client.document.*;
26+
import com.marklogic.client.functionaltest.Product;
4327
import com.marklogic.client.io.DocumentMetadataHandle;
4428
import com.marklogic.client.io.DocumentMetadataHandle.Capability;
4529
import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
4630
import com.marklogic.client.io.DocumentMetadataHandle.DocumentPermissions;
4731
import com.marklogic.client.io.DocumentMetadataHandle.DocumentProperties;
4832
import com.marklogic.client.io.JacksonHandle;
4933
import com.marklogic.client.io.StringHandle;
34+
import org.junit.*;
35+
import org.skyscreamer.jsonassert.JSONAssert;
36+
37+
import java.security.KeyManagementException;
38+
import java.security.NoSuchAlgorithmException;
39+
import java.util.Calendar;
40+
41+
import static org.junit.Assert.assertEquals;
42+
import static org.junit.Assert.assertTrue;
5043

5144
/**
5245
*

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBulkReadWriteWithJacksonDataBind.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkReadWriteWithJacksonDataBind.java

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
17+
package com.marklogic.client.fastfunctest;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertNotNull;
21-
import static org.junit.Assert.assertTrue;
22-
23-
import java.security.KeyManagementException;
24-
import java.security.NoSuchAlgorithmException;
25-
import java.util.Calendar;
26-
import java.util.HashMap;
27-
import java.util.Map;
28-
29-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
30-
import com.marklogic.client.functionaltest.Product;
31-
import org.junit.After;
32-
import org.junit.AfterClass;
33-
import org.junit.Before;
34-
import org.junit.BeforeClass;
35-
import org.junit.Test;
36-
37-
import com.marklogic.client.DatabaseClient;
3819
import com.marklogic.client.document.DocumentManager.Metadata;
3920
import com.marklogic.client.document.DocumentPage;
4021
import com.marklogic.client.document.DocumentRecord;
4122
import com.marklogic.client.document.DocumentWriteSet;
4223
import com.marklogic.client.document.JSONDocumentManager;
24+
import com.marklogic.client.functionaltest.Product;
4325
import com.marklogic.client.io.DocumentMetadataHandle;
4426
import com.marklogic.client.io.DocumentMetadataHandle.Capability;
4527
import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
@@ -49,6 +31,17 @@
4931
import com.marklogic.client.io.JacksonDatabindHandle;
5032
import com.marklogic.client.io.JacksonHandle;
5133
import com.marklogic.client.io.marker.ContentHandleFactory;
34+
import org.junit.After;
35+
import org.junit.Before;
36+
import org.junit.Test;
37+
38+
import java.security.KeyManagementException;
39+
import java.security.NoSuchAlgorithmException;
40+
import java.util.Calendar;
41+
import java.util.HashMap;
42+
import java.util.Map;
43+
44+
import static org.junit.Assert.*;
5245

5346
/*
5447
* This test is designed to to test all of bulk reads and write of JSON with JacksonDataBindHandle Manager by passing set of uris

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/converted/TestBulkReadWriteWithJacksonHandle.java renamed to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkReadWriteWithJacksonHandle.java

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.converted;
18-
19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertNotNull;
21-
import static org.junit.Assert.assertTrue;
22-
23-
import java.io.File;
24-
import java.security.KeyManagementException;
25-
import java.security.NoSuchAlgorithmException;
26-
import java.util.Calendar;
27-
28-
import com.marklogic.client.fastfunctest.AbstractFunctionalTest;
29-
import org.junit.After;
30-
import org.junit.AfterClass;
31-
import org.junit.Before;
32-
import org.junit.BeforeClass;
33-
import org.junit.Test;
34-
import org.skyscreamer.jsonassert.JSONAssert;
17+
package com.marklogic.client.fastfunctest;
3518

3619
import com.fasterxml.jackson.databind.JsonNode;
3720
import com.fasterxml.jackson.databind.ObjectMapper;
38-
import com.marklogic.client.DatabaseClient;
3921
import com.marklogic.client.document.DocumentManager.Metadata;
4022
import com.marklogic.client.document.DocumentPage;
4123
import com.marklogic.client.document.DocumentRecord;
@@ -48,6 +30,18 @@
4830
import com.marklogic.client.io.DocumentMetadataHandle.DocumentProperties;
4931
import com.marklogic.client.io.Format;
5032
import com.marklogic.client.io.JacksonHandle;
33+
import org.junit.After;
34+
import org.junit.Before;
35+
import org.junit.Test;
36+
import org.skyscreamer.jsonassert.JSONAssert;
37+
38+
import java.io.File;
39+
import java.security.KeyManagementException;
40+
import java.security.NoSuchAlgorithmException;
41+
import java.util.Calendar;
42+
43+
import static org.junit.Assert.assertEquals;
44+
import static org.junit.Assert.assertTrue;
5145

5246
/*
5347
* This test is designed to to test all of bulk reads and write of JSON with JacksonHandle Manager by passing set of uris

0 commit comments

Comments
 (0)