Skip to content

Commit

Permalink
[mod] tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
@apb2006
apb2006 committed May 11, 2023
1 parent 31e2b1c commit a088031
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 287 deletions.
4 changes: 2 additions & 2 deletions test/module_resolver_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ vows.describe('Test Module URI Resolver').addBatch({
var sctx = new StaticContext();
var index = JSON.parse(fs.readFileSync('test/index.json', 'utf-8'));
sctx.setModulesFromXQDoc(index);
var linter = new XQLint(fs.readFileSync('test/queries/zorba/merry.xq', 'utf-8'), { fileName: 'merry.xq', staticContext: sctx });
var linter = new XQLint(fs.readFileSync('test/queries/merry.xq', 'utf-8'), { fileName: 'merry.xq', staticContext: sctx });
var markers = linter.getMarkers();
console.log("TEST12",markers);
// currently "chars#1": undeclared function'
Expand Down Expand Up @@ -230,7 +230,7 @@ vows.describe('Test Module URI Resolver').addBatch({
var sctx = new StaticContext();
var index = JSON.parse(fs.readFileSync('test/exports.json', 'utf-8'));
sctx.setModules(index);
var linter = new XQLint(source, { fileName: 'test/queries/zorba/merry.xq', staticContext: sctx });
var linter = new XQLint(source, { fileName: 'test/queries/merry.xq', staticContext: sctx });
var markers = linter.getErrors();
assert.equal(markers.length, 0, 'Number of markers');
},
Expand Down
84 changes: 37 additions & 47 deletions test/namespace_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var XQLint = require('../lib/xqlint').XQLint;
var StaticContext = require('../lib/compiler/static_context').StaticContext;

vows.describe('Test Namespace declarations').addBatch({
'test XQST0047 (1)': function(){
'test XQST0047 (1)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/1.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 2, 'Number of markers');
Expand All @@ -19,69 +19,69 @@ vows.describe('Test Namespace declarations').addBatch({
var warning = markers[1];
assert.equal(warning.type, 'warning', 'Type of marker');
},
'test XQST0047 (2)': function(){

'test XQST0047 (2)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/2.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0047]'), 0, 'Is Error [XQST0047]');
},

'test XQST0047 (3)': function(){
'test XQST0047 (3)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/mainModule6.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0047]'), 0, 'Is Error [XQST0047]');
},
'test XQST0047 (4)': function(){

'test XQST0047 (4)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/5.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
assert.equal(markers[0].type, 'warning', 'Type of marker');
// assert.equal(markers[1].type, 'warning', 'Type of marker');
},
'test XQST0049 (4)': function(){

'test XQST0049 (4)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/7.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getErrors();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0049]'), 0, 'Is Error [XQST0049]');
},
'test XQST0033 (1)': function(){

'test XQST0033 (1)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/3.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 2, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0033]'), 0, 'Is Error [XQST0033]');
},
'test XQST0033 (2)': function(){

'test XQST0033 (2)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/4.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0033]'), 0, 'Is Error [XQST0033]');
},
'test XQST0033 (3)': function(){

'test XQST0033 (3)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/6.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0033]'), 0, 'Is Error [XQST0033]');
},
'test XQST0088 (1)': function(){

'test XQST0088 (1)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/mainModule7.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
//assert.equal(markers.length, 2, 'Number of markers');
Expand All @@ -91,52 +91,42 @@ vows.describe('Test Namespace declarations').addBatch({
//error = markers[1];
//assert.equal(error.type, 'error', 'Type of marker');
},
'test XQST0088 (2)': function(){

'test XQST0088 (2)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/noTns.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0088]'), 0, 'Is Error [XQST0088]');
},
'test Module Declaration': function(){


'test Module Declaration': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/8.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
assert.equal(error.message.indexOf('[XQST0048]'), 0, 'Is Error [XQST0048]');
},
'test Function Declaration': function(){

'test Function Declaration': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/9.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var error = markers[0];
assert.equal(error.type, 'error', 'Type of marker');
//assert.equal(error.message.indexOf('[XQST0088]'), 0, 'Is Error [XQST0088]');
},


'test XQST0009 (1)': function(){
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/11.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
var warning = markers[0];
assert.equal(warning.type, 'warning', 'Type of marker');
assert.equal(warning.message.indexOf('[XQST0009]'), 0, 'Is warning [XQST0009]');
},

'test unused namespace (3)': function(){

'test unused namespace (3)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/12.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getErrors();
assert.equal(markers.length, 0, 'Number of markers');
},
'test unused namespace (4)': function(){

'test unused namespace (4)': function () {
var linter = new XQLint(fs.readFileSync('test/xqlint_queries/namespaces/13.xq', 'utf-8'), { styleCheck: false });
var markers = linter.getMarkers();
assert.equal(markers.length, 2, 'Number of markers');
Expand All @@ -145,8 +135,8 @@ vows.describe('Test Namespace declarations').addBatch({
warning = markers[1];
assert.equal(warning.type, 'warning', 'Type of marker');
},
'test unused namespace (5)': function(){

'test unused namespace (5)': function () {
var sctx = new StaticContext();
var index = JSON.parse(fs.readFileSync('test/index.json', 'utf-8'));
sctx.setModulesFromXQDoc(index);
Expand All @@ -157,32 +147,32 @@ vows.describe('Test Namespace declarations').addBatch({
assert.equal(warnings.length, 0, 'Number of warnings');
},

'test resolution': function(){
'test resolution': function () {
var linter = new XQLint('declare variable $foo:bar as xs:integer := 1; 1 + 1');
var markers = linter.getMarkers();
assert.equal(markers.length, 1, 'Number of markers');
},

'test module function names (1)': function(){
'test module function names (1)': function () {
var linter = new XQLint(fs.readFileSync('test/queries/rbtree.xq/map.xq', 'utf-8'), { styleCheck: false });
var errors = linter.getErrors();
assert.equal(errors.length, 0, 'Number of errors');
},
'test module function names (2)': function(){

'test module function names (2)': function () {
var linter = new XQLint(fs.readFileSync('test/queries/rbtree.xq/rbtree.xq', 'utf-8'), { styleCheck: false });
var errors = linter.getErrors();
assert.equal(errors.length, 0, 'Number of errors');
},

'test module function names (3)': function(){
'test module function names (3)': function () {
var linter = new XQLint(fs.readFileSync('test/queries/rbtree.xq/rbtree2.xq', 'utf-8'), { styleCheck: false });
var errors = linter.getErrors();
assert.equal(errors.length, 0, 'no errors');
},
'test module default function ns #24': function(){
'test module default function ns #24': function () {
var linter = new XQLint(fs.readFileSync('test/queries/rbtree.xq/map.xq', 'utf-8'), { styleCheck: false });
var xqdoc = linter.getXQDoc();
assert.equal(13, xqdoc.functions.length, "there are some functions");
},
assert.equal(13, xqdoc.functions.length, "there are 13 functions");
},
}).export(module);

0 comments on commit a088031

Please sign in to comment.