-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add hash to Snak #77
Merged
Add hash to Snak #77
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,11 +8,11 @@ | |
QUnit.module( 'wikibase.datamodel.Snak' ); | ||
|
||
var testSets = [ | ||
[wb.datamodel.PropertyNoValueSnak, ['P1']], | ||
[wb.datamodel.PropertyNoValueSnak, ['P2']], | ||
[wb.datamodel.PropertySomeValueSnak, ['P1']], | ||
[wb.datamodel.PropertyValueSnak, ['P1', new dv.StringValue( 'test' )]], | ||
[wb.datamodel.PropertyValueSnak, ['P2', new dv.StringValue( 'test' )]] | ||
[wb.datamodel.PropertyNoValueSnak, ['P1', undefined]], | ||
[wb.datamodel.PropertyNoValueSnak, ['P2', 'hash']], | ||
[wb.datamodel.PropertySomeValueSnak, ['P1', 'hash']], | ||
[wb.datamodel.PropertyValueSnak, ['P1', new dv.StringValue( 'test' ), undefined]], | ||
[wb.datamodel.PropertyValueSnak, ['P2', new dv.StringValue( 'test' ), 'hash']] | ||
]; | ||
|
||
/** | ||
|
@@ -21,11 +21,11 @@ var testSets = [ | |
* @return {wikibase.datamodel.Snak} | ||
*/ | ||
function constructSnak( SnakConstructor, params ) { | ||
return new SnakConstructor( params[0], params[1] ); | ||
return new SnakConstructor( params[0], params[1], params[2] ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is pretty awkward, because this code always passes three constructor arguments, even if there are only two for two of the subclasses. But the test setup was like this before and the change made in this patch doesn't make it worse. |
||
} | ||
|
||
QUnit.test( 'Constructor', function( assert ) { | ||
assert.expect( 15 ); | ||
assert.expect( 20 ); | ||
|
||
for( var i = 0; i < testSets.length; i++ ) { | ||
var SnakConstructor = testSets[i][0], | ||
|
@@ -48,6 +48,12 @@ QUnit.test( 'Constructor', function( assert ) { | |
SnakConstructor.TYPE, | ||
'Test set #' + i + ': Snak type "' + snak.getType() + '" was set correctly.' | ||
); | ||
|
||
assert.strictEqual( | ||
snak.getHash(), | ||
snakParams[snakParams.length - 1] || null, | ||
'Test set #' + i + ': Snak hash was set correctly.' | ||
); | ||
} | ||
} ); | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the two "undefined" can be omitted, but it doesn't hurt to have them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, they’re necessary because the expected hash is the last array element (
array[array.length-1]
).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, thanks! I see it now.