Skip to content

Commit

Permalink
Update tests:
Browse files Browse the repository at this point in the history
  - rename assert.eql to assert.equal. assert.eql is undefined in Node v0.3.1+  (http://nodejs.org/docs/v0.3.1/api/assert.html)
  - require accepts relative paths
  • Loading branch information
NV committed Oct 29, 2011
1 parent 01da667 commit 09b53da
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -24,7 +24,7 @@
"url": "git://github.com/kpdecker/jsdiff.git" "url": "git://github.com/kpdecker/jsdiff.git"
}, },
"engines": { "engines": {
"node": ">=0.1.9" "node": ">=0.3.1"
}, },
"main": "./diff", "main": "./diff",
"scripts": { "scripts": {
Expand Down
44 changes: 22 additions & 22 deletions test/diffTest.js
@@ -1,21 +1,21 @@
const VERBOSE = false; const VERBOSE = false;


var assert = require('assert'), var assert = require('assert'),
diff = require('diff'); diff = require('../diff');


function log() { function log() {
VERBOSE && console.log.apply(console, arguments); VERBOSE && console.log.apply(console, arguments);
} }


exports['Whitespace diff'] = function() { exports['Whitespace diff'] = function() {
diffResult = diff.diffWords("New Value", "New ValueMoreData"); diffResult = diff.diffWords("New Value", "New ValueMoreData");
assert.eql( assert.equal(
"New <ins>ValueMoreData</ins><del>Value</del>", "New <ins>ValueMoreData</ins><del>Value</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Single whitespace diffResult Value"); "Single whitespace diffResult Value");


diffResult = diff.diffWords("New Value ", "New ValueMoreData "); diffResult = diff.diffWords("New Value ", "New ValueMoreData ");
assert.eql( assert.equal(
"New <ins>ValueMoreData</ins><del>Value</del> ", "New <ins>ValueMoreData</ins><del>Value</del> ",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Multiple whitespace diffResult Value"); "Multiple whitespace diffResult Value");
Expand All @@ -24,22 +24,22 @@ exports['Whitespace diff'] = function() {
// Diff on word boundary // Diff on word boundary
exports['Word Diff'] = function() { exports['Word Diff'] = function() {
diffResult = diff.diffWords("New :Value:Test", "New ValueMoreData "); diffResult = diff.diffWords("New :Value:Test", "New ValueMoreData ");
assert.eql( assert.equal(
"New <ins>ValueMoreData </ins><del>:Value:Test</del>", "New <ins>ValueMoreData </ins><del>:Value:Test</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Nonmatching word boundary diffResult Value"); "Nonmatching word boundary diffResult Value");
diffResult = diff.diffWords("New Value:Test", "New Value:MoreData "); diffResult = diff.diffWords("New Value:Test", "New Value:MoreData ");
assert.eql( assert.equal(
"New Value:<ins>MoreData </ins><del>Test</del>", "New Value:<ins>MoreData </ins><del>Test</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Word boundary diffResult Value"); "Word boundary diffResult Value");
diffResult = diff.diffWords("New Value-Test", "New Value:MoreData "); diffResult = diff.diffWords("New Value-Test", "New Value:MoreData ");
assert.eql( assert.equal(
"New Value<ins>:MoreData </ins><del>-Test</del>", "New Value<ins>:MoreData </ins><del>-Test</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Uninque boundary diffResult Value"); "Uninque boundary diffResult Value");
diffResult = diff.diffWords("New Value", "New Value:MoreData "); diffResult = diff.diffWords("New Value", "New Value:MoreData ");
assert.eql( assert.equal(
"New Value<ins>:MoreData </ins>", "New Value<ins>:MoreData </ins>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Word boundary diffResult Value"); "Word boundary diffResult Value");
Expand All @@ -48,17 +48,17 @@ exports['Word Diff'] = function() {
// Diff without changes // Diff without changes
exports['Diff without changes'] = function() { exports['Diff without changes'] = function() {
diffResult = diff.diffWords("New Value", "New Value"); diffResult = diff.diffWords("New Value", "New Value");
assert.eql( assert.equal(
"New Value", "New Value",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"No changes diffResult Value"); "No changes diffResult Value");
diffResult = diff.diffWords("New Value", "New Value"); diffResult = diff.diffWords("New Value", "New Value");
assert.eql( assert.equal(
"New Value", "New Value",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"No changes whitespace diffResult Value"); "No changes whitespace diffResult Value");
diffResult = diff.diffWords("", ""); diffResult = diff.diffWords("", "");
assert.eql( assert.equal(
"", "",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Empty no changes diffResult Value"); "Empty no changes diffResult Value");
Expand All @@ -67,21 +67,21 @@ exports['Diff without changes'] = function() {
// Empty diffs // Empty diffs
exports['Empty diffs'] = function() { exports['Empty diffs'] = function() {
diffResult = diff.diffWords("New Value", ""); diffResult = diff.diffWords("New Value", "");
assert.eql(1, diffResult.length, "Empty diff result length"); assert.equal(1, diffResult.length, "Empty diff result length");
assert.eql( assert.equal(
"<del>New Value</del>", "<del>New Value</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Empty diffResult Value"); "Empty diffResult Value");
diffResult = diff.diffWords("", "New Value"); diffResult = diff.diffWords("", "New Value");
assert.eql( assert.equal(
"<ins>New Value</ins>", "<ins>New Value</ins>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Empty diffResult Value"); "Empty diffResult Value");
}; };


// With without anchor (the Heckel algorithm error case) // With without anchor (the Heckel algorithm error case)
diffResult = diff.diffWords("New Value New Value", "Value Value New New"); diffResult = diff.diffWords("New Value New Value", "Value Value New New");
assert.eql( assert.equal(
"<ins>Value</ins><del>New</del> Value New <ins>New</ins><del>Value</del>", "<ins>Value</ins><del>New</del> Value New <ins>New</ins><del>Value</del>",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"No anchor diffResult Value"); "No anchor diffResult Value");
Expand All @@ -91,7 +91,7 @@ exports['CSS diffs'] = function() {
diffResult = diff.diffCss( diffResult = diff.diffCss(
".test,#value .test{margin-left:50px;margin-right:-40px}", ".test,#value .test{margin-left:50px;margin-right:-40px}",
".test2, #value2 .test {\nmargin-top:50px;\nmargin-right:-400px;\n}"); ".test2, #value2 .test {\nmargin-top:50px;\nmargin-right:-400px;\n}");
assert.eql( assert.equal(
"<ins>.test2</ins><del>.test</del>,<del>#value</del> <ins>#value2 </ins>.test<ins> </ins>{<ins>\n" "<ins>.test2</ins><del>.test</del>,<del>#value</del> <ins>#value2 </ins>.test<ins> </ins>{<ins>\n"
+ "margin-top</ins><del>margin-left</del>:50px;<ins>\n</ins>" + "margin-top</ins><del>margin-left</del>:50px;<ins>\n</ins>"
+ "margin-right:<ins>-400px;\n</ins><del>-40px</del>}", + "margin-right:<ins>-400px;\n</ins><del>-40px</del>}",
Expand All @@ -104,14 +104,14 @@ exports['Line diffs'] = function() {
diffResult = diff.diffLines( diffResult = diff.diffLines(
"line\nold value\nline", "line\nold value\nline",
"line\nnew value\nline"); "line\nnew value\nline");
assert.eql( assert.equal(
"line\n<ins>new value\n</ins><del>old value\n</del>line", "line\n<ins>new value\n</ins><del>old value\n</del>line",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Line diffResult Value"); "Line diffResult Value");
diffResult = diff.diffLines( diffResult = diff.diffLines(
"line\nvalue\nline", "line\nvalue\nline",
"line\nvalue\nline"); "line\nvalue\nline");
assert.eql( assert.equal(
"line\nvalue\nline", "line\nvalue\nline",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Line same diffResult Value"); "Line same diffResult Value");
Expand All @@ -120,7 +120,7 @@ exports['Line diffs'] = function() {
"line\nvalue\nline"); "line\nvalue\nline");
log("diffResult", diffResult); log("diffResult", diffResult);
log("diffResult", diff.convertChangesToXML(diffResult)); log("diffResult", diff.convertChangesToXML(diffResult));
assert.eql( assert.equal(
"line\n<ins>value\n</ins><del>value \n</del>line", "line\n<ins>value\n</ins><del>value \n</del>line",
diff.convertChangesToXML(diffResult), diff.convertChangesToXML(diffResult),
"Line whitespace diffResult Value"); "Line whitespace diffResult Value");
Expand Down Expand Up @@ -354,8 +354,8 @@ exports['Large Test'] = function() {
} }


log("diffResult remove length: " + removeCount); log("diffResult remove length: " + removeCount);
assert.eql(largeTest.replace(/s+/g, ""), removeChanges.join("").replace(/s+/g, ""), "New Diff results match"); assert.equal(largeTest.replace(/s+/g, ""), removeChanges.join("").replace(/s+/g, ""), "New Diff results match");
assert.eql(largeNewValue.replace(/s+/g, ""), addChanges.join("").replace(/s+/g, ""), "Old Diff results match"); assert.equal(largeNewValue.replace(/s+/g, ""), addChanges.join("").replace(/s+/g, ""), "Old Diff results match");
}; };


exports['Patch'] = function() { exports['Patch'] = function() {
Expand Down Expand Up @@ -485,7 +485,7 @@ exports['Patch'] = function() {
+ "\\ No newline at end of file\n"; + "\\ No newline at end of file\n";


diffResult = diff.createPatch("testFileName", oldFile, newFile, "Old Header", "New Header"); diffResult = diff.createPatch("testFileName", oldFile, newFile, "Old Header", "New Header");
assert.eql( assert.equal(
expectedResult, expectedResult,
diffResult, diffResult,
"Patch diffResult Value"); "Patch diffResult Value");
Expand All @@ -497,7 +497,7 @@ exports['Patch'] = function() {
+ "+++ testFileName\tNew Header\n" + "+++ testFileName\tNew Header\n"
+ "\\ No newline at end of file\n"; + "\\ No newline at end of file\n";
diffResult = diff.createPatch("testFileName", oldFile, oldFile, "Old Header", "New Header"); diffResult = diff.createPatch("testFileName", oldFile, oldFile, "Old Header", "New Header");
assert.eql( assert.equal(
expectedResult, expectedResult,
diffResult, diffResult,
"Patch same diffResult Value"); "Patch same diffResult Value");
Expand Down

0 comments on commit 09b53da

Please sign in to comment.