|
1 | 1 | /* |
2 | | - * Copyright 2014-2019 MarkLogic Corporation |
| 2 | + * Copyright 2014-2020 MarkLogic Corporation |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
@@ -78,22 +78,22 @@ public static void setUpBeforeClass() throws Exception { |
78 | 78 | configureRESTServer(dbName, fNames, false); |
79 | 79 | TestEvalXquery.createUserRolesWithPrevilages("test-js-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "xdmp:invoke-in", "xdmp:invoke", "xdbc:invoke-in", "any-uri", |
80 | 80 | "xdbc:invoke"); |
81 | | - TestEvalXquery.createRESTUser("eval-user", "x", "test-js-eval"); |
| 81 | + TestEvalXquery.createRESTUser("eval-userJS", "x", "test-js-eval"); |
82 | 82 | appServerHostname = getRestAppServerHostName(); |
83 | 83 | } |
84 | 84 |
|
85 | 85 | @AfterClass |
86 | 86 | public static void tearDownAfterClass() throws Exception { |
87 | 87 | System.out.println("In tear down"); |
88 | 88 | cleanupRESTServer(dbName, fNames); |
89 | | - TestEvalXquery.deleteRESTUser("eval-user"); |
| 89 | + TestEvalXquery.deleteRESTUser("eval-userJS"); |
90 | 90 | TestEvalXquery.deleteUserRole("test-js-eval"); |
91 | 91 | } |
92 | 92 |
|
93 | 93 | @Before |
94 | 94 | public void setUp() throws KeyManagementException, NoSuchAlgorithmException, Exception { |
95 | 95 | int restPort = getRestServerPort(); |
96 | | - client = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "eval-user", "x", getConnType()); |
| 96 | + client = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "eval-userJS", "x", getConnType()); |
97 | 97 | } |
98 | 98 |
|
99 | 99 | @After |
@@ -579,8 +579,8 @@ public void testJSReturningDifferentTypesOrder3fromModules() throws Exception { |
579 | 579 | Capability.UPDATE, Capability.READ, Capability.EXECUTE); |
580 | 580 | DocumentManager dm = moduleClient.newDocumentManager(); |
581 | 581 | dm.write("/data/javascriptQueries.sjs", metadataHandle, ish); |
582 | | - DocumentBuilder db = DocumentBuilderFactory.newInstance() |
583 | | - .newDocumentBuilder(); |
| 582 | + /*DocumentBuilder db = DocumentBuilderFactory.newInstance() |
| 583 | + .newDocumentBuilder();*/ |
584 | 584 | InputSource is = new InputSource(); |
585 | 585 | is.setCharacterStream(new StringReader( |
586 | 586 | "<foo attr=\"attribute\"><?processing instruction?><!--comment-->test1</foo>")); |
|
0 commit comments