[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Tests: Group the segmentation tests per language

2017-08-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374452 )

Change subject: Tests: Group the segmentation tests per language
..


Tests: Group the segmentation tests per language

Segmentation tests were not grouped.

Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
---
M test/segmentation/CXSegmenter.test.js
1 file changed, 21 insertions(+), 25 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/test/segmentation/CXSegmenter.test.js 
b/test/segmentation/CXSegmenter.test.js
index 8df4c04..8cc612c 100644
--- a/test/segmentation/CXSegmenter.test.js
+++ b/test/segmentation/CXSegmenter.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var fs = require( 'fs' ),
-   lang, i, len, lang, test, tests,
+const fs = require( 'fs' ),
assert = require( '../utils/assert.js' ),
LinearDoc = require( '../../lib/lineardoc' ),
Segmenter = require( '../../lib/segmentation/CXSegmenter' ),
@@ -14,32 +13,29 @@
return normalizer.getHtml();
 }
 
-function runTest( test ) {
-   var segmenter, result, testData, expectedResultData;
+function runTest( test, lang ) {
+   let testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
 
-   describe( 'Segmentation tests', function () {
-   testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
-
-   segmenter = new Segmenter( testData, lang );
-   segmenter.segment();
-   result = normalize( segmenter.getSegmentedContent() );
-   expectedResultData = normalize(
-   fs.readFileSync( __dirname + '/data/' + test.result, 
'utf8' )
-   );
-   it( 'should not have any errors when: ' + test.desc, function 
() {
-   assert.deepEqual( result, expectedResultData, 
test.source + ': ' + test.desc || '' );
-   } );
+   let segmenter = new Segmenter( testData, lang );
+   segmenter.segment();
+   let result = normalize( segmenter.getSegmentedContent() );
+   let expectedResultData = normalize(
+   fs.readFileSync( __dirname + '/data/' + test.result, 'utf8' )
+   );
+   it( 'should not have any errors when: ' + test.desc, () => {
+   assert.deepEqual( result, expectedResultData, test.source + ': 
' + test.desc || '' );
} );
 }
 
-for ( lang in allTests ) {
-   tests = allTests[ lang ];
-   len = tests.length;
-   for ( i = 0; i < len; i++ ) {
-   test = tests[ i ];
-   if ( test.skip ) {
-   continue;
+for ( let lang in allTests ) {
+   describe( 'Segmentation tests for ' + lang, () => {
+   let tests = allTests[ lang ];
+   let len = tests.length;
+   for ( let i = 0; i < len; i++ ) {
+   if ( tests[ i ].skip ) {
+   continue;
+   }
+   runTest( tests[ i ], lang );
}
-   runTest( test );
-   }
+   } );
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/374452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Tests: Group the segmentation tests per language

2017-08-28 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374452 )

Change subject: Tests: Group the segmentation tests per language
..

Tests: Group the segmentation tests per language

Segmentation tests were not grouped.

Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
---
M test/segmentation/CXSegmenter.test.js
1 file changed, 21 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/52/374452/1

diff --git a/test/segmentation/CXSegmenter.test.js 
b/test/segmentation/CXSegmenter.test.js
index 8df4c04..8cc612c 100644
--- a/test/segmentation/CXSegmenter.test.js
+++ b/test/segmentation/CXSegmenter.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var fs = require( 'fs' ),
-   lang, i, len, lang, test, tests,
+const fs = require( 'fs' ),
assert = require( '../utils/assert.js' ),
LinearDoc = require( '../../lib/lineardoc' ),
Segmenter = require( '../../lib/segmentation/CXSegmenter' ),
@@ -14,32 +13,29 @@
return normalizer.getHtml();
 }
 
-function runTest( test ) {
-   var segmenter, result, testData, expectedResultData;
+function runTest( test, lang ) {
+   let testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
 
-   describe( 'Segmentation tests', function () {
-   testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
-
-   segmenter = new Segmenter( testData, lang );
-   segmenter.segment();
-   result = normalize( segmenter.getSegmentedContent() );
-   expectedResultData = normalize(
-   fs.readFileSync( __dirname + '/data/' + test.result, 
'utf8' )
-   );
-   it( 'should not have any errors when: ' + test.desc, function 
() {
-   assert.deepEqual( result, expectedResultData, 
test.source + ': ' + test.desc || '' );
-   } );
+   let segmenter = new Segmenter( testData, lang );
+   segmenter.segment();
+   let result = normalize( segmenter.getSegmentedContent() );
+   let expectedResultData = normalize(
+   fs.readFileSync( __dirname + '/data/' + test.result, 'utf8' )
+   );
+   it( 'should not have any errors when: ' + test.desc, () => {
+   assert.deepEqual( result, expectedResultData, test.source + ': 
' + test.desc || '' );
} );
 }
 
-for ( lang in allTests ) {
-   tests = allTests[ lang ];
-   len = tests.length;
-   for ( i = 0; i < len; i++ ) {
-   test = tests[ i ];
-   if ( test.skip ) {
-   continue;
+for ( let lang in allTests ) {
+   describe( 'Segmentation tests for ' + lang, () => {
+   let tests = allTests[ lang ];
+   let len = tests.length;
+   for ( let i = 0; i < len; i++ ) {
+   if ( tests[ i ].skip ) {
+   continue;
+   }
+   runTest( tests[ i ], lang );
}
-   runTest( test );
-   }
+   } );
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/374452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits