[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Remove ambiguity related to `datamodel.Lexeme` module
Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354248 )
Change subject: Remove ambiguity related to `datamodel.Lexeme` module
..
Remove ambiguity related to `datamodel.Lexeme` module
Class was named `wikibase.datamodel.Lexeme` but module was
named `wikibase.lexeme.datamodel.Lexeme`.
Now they both are is `wikibase.lexeme.datamodel.Lexeme`
Change-Id: I1f1478105e71f227f36d6266de5e6ea5aada3dd5
---
M resources/datamodel/Lexeme.js
M resources/serialization/LexemeDeserializer.js
M tests/qunit/datamodel/Lexeme.tests.js
M tests/qunit/serialization/LexemeDeserializer.tests.js
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/48/354248/1
diff --git a/resources/datamodel/Lexeme.js b/resources/datamodel/Lexeme.js
index 2b66caa..9ae196d 100644
--- a/resources/datamodel/Lexeme.js
+++ b/resources/datamodel/Lexeme.js
@@ -5,7 +5,7 @@
var StatementProvider = wb.datamodel.StatementProvider;
/**
-* @class wikibase.datamodel.Lexeme
+* @class wikibase.lexeme.datamodel.Lexeme
* @extends wikibase.datamodel.Entity
* @license GNU GPL v2+
* @author Adrian Heine
@@ -18,7 +18,7 @@
*
* @throws {Error} if a required parameter is not specified properly.
*/
- var SELF = wb.datamodel.Lexeme = util.inherit(
+ var SELF = wb.lexeme.datamodel.Lexeme = util.inherit(
'WbDataModelLexeme',
PARENT,
function ( lexemeId, statementGroupSet ) {
diff --git a/resources/serialization/LexemeDeserializer.js
b/resources/serialization/LexemeDeserializer.js
index 53ff3d9..c9dc0d7 100644
--- a/resources/serialization/LexemeDeserializer.js
+++ b/resources/serialization/LexemeDeserializer.js
@@ -17,12 +17,12 @@
/**
* @inheritdoc
*
-* @return {wikibase.datamodel.Lexeme}
+* @return {wikibase.lexeme.datamodel.Lexeme}
*
* @throws {Error} if serialization does not resolve to a
serialized Lexeme.
*/
deserialize: function ( serialization ) {
- if ( serialization.type !== wb.datamodel.Lexeme.TYPE ) {
+ if ( serialization.type !==
wb.lexeme.datamodel.Lexeme.TYPE ) {
throw new Error( 'Serialization does not
resolve to a Lexeme' );
}
@@ -34,7 +34,7 @@
return this.deserializeForm( form );
}.bind( this ) );
- var lexeme = new wikibase.datamodel.Lexeme(
+ var lexeme = new wikibase.lexeme.datamodel.Lexeme(
serialization.id,
termMapDeserializer.deserialize(
serialization.labels ),
statementGroupSetDeserializer.deserialize(
serialization.claims )
diff --git a/tests/qunit/datamodel/Lexeme.tests.js
b/tests/qunit/datamodel/Lexeme.tests.js
index d178c88..bf76eca 100644
--- a/tests/qunit/datamodel/Lexeme.tests.js
+++ b/tests/qunit/datamodel/Lexeme.tests.js
@@ -1,10 +1,10 @@
(function ( wb, QUnit ) {
'use strict';
- QUnit.module( 'wikibase.datamodel.Lexeme' );
+ QUnit.module( 'wikibase.lexeme.datamodel.Lexeme' );
- /** @type {wikibase.datamodel.Lexeme} */
- var Lexeme = wb.datamodel.Lexeme;
+ /** @type {wikibase.lexeme.datamodel.Lexeme} */
+ var Lexeme = wb.lexeme.datamodel.Lexeme;
/** @type {wikibase.lexeme.datamodel.LexemeForm} */
var LexemeForm = wb.lexeme.datamodel.LexemeForm;
diff --git a/tests/qunit/serialization/LexemeDeserializer.tests.js
b/tests/qunit/serialization/LexemeDeserializer.tests.js
index dbda4fc..daae556 100644
--- a/tests/qunit/serialization/LexemeDeserializer.tests.js
+++ b/tests/qunit/serialization/LexemeDeserializer.tests.js
@@ -35,7 +35,7 @@
new wb.datamodel.PropertyNoValueSnak( 'P1' ),
null, 'L1$1' ) )
] ) )
] );
- var expectedDataModel = new wikibase.datamodel.Lexeme(
+ var expectedDataModel = new wikibase.lexeme.datamodel.Lexeme(
'L1',
null,
expectedStatementGroupSet
--
To view, visit https://gerrit.wikimedia.org/r/354248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f1478105e71f227f36d6266de5e6ea5aada3dd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/me
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Remove ambiguity related to `datamodel.Lexeme` module
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354248 )
Change subject: Remove ambiguity related to `datamodel.Lexeme` module
..
Remove ambiguity related to `datamodel.Lexeme` module
Class was named `wikibase.datamodel.Lexeme` but module was
named `wikibase.lexeme.datamodel.Lexeme`.
Now they both are `wikibase.lexeme.datamodel.Lexeme`
Change-Id: I1f1478105e71f227f36d6266de5e6ea5aada3dd5
---
M resources/datamodel/Lexeme.js
M resources/serialization/LexemeDeserializer.js
A tests/qunit/datamodel/Lexeme.tests.js
M tests/qunit/serialization/LexemeDeserializer.tests.js
4 files changed, 70 insertions(+), 6 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/datamodel/Lexeme.js b/resources/datamodel/Lexeme.js
index a309443..d58fd2d 100644
--- a/resources/datamodel/Lexeme.js
+++ b/resources/datamodel/Lexeme.js
@@ -4,7 +4,7 @@
var PARENT = wb.datamodel.Entity;
/**
-* @class wikibase.datamodel.Lexeme
+* @class wikibase.lexeme.datamodel.Lexeme
* @extends wikibase.datamodel.Entity
* @license GNU GPL v2+
* @author Adrian Heine
@@ -18,7 +18,7 @@
*
* @throws {Error} if a required parameter is not specified properly.
*/
- var SELF = wb.datamodel.Lexeme = util.inherit(
+ var SELF = wb.lexeme.datamodel.Lexeme = util.inherit(
'WbDataModelLexeme',
PARENT,
function ( lexemeId, labels, statementGroupSet ) {
diff --git a/resources/serialization/LexemeDeserializer.js
b/resources/serialization/LexemeDeserializer.js
index 4a81cd6..2259c7d 100644
--- a/resources/serialization/LexemeDeserializer.js
+++ b/resources/serialization/LexemeDeserializer.js
@@ -17,12 +17,12 @@
/**
* @inheritdoc
*
-* @return {wikibase.datamodel.Lexeme}
+* @return {wikibase.lexeme.datamodel.Lexeme}
*
* @throws {Error} if serialization does not resolve to a
serialized Lexeme.
*/
deserialize: function ( serialization ) {
- if ( serialization.type !== wb.datamodel.Lexeme.TYPE ) {
+ if ( serialization.type !==
wb.lexeme.datamodel.Lexeme.TYPE ) {
throw new Error( 'Serialization does not
resolve to a Lexeme' );
}
@@ -34,7 +34,7 @@
return this.deserializeForm( form );
}.bind( this ) );
- var lexeme = new wikibase.datamodel.Lexeme(
+ var lexeme = new wikibase.lexeme.datamodel.Lexeme(
serialization.id,
termMapDeserializer.deserialize(
serialization.labels ),
statementGroupSetDeserializer.deserialize(
serialization.claims )
diff --git a/tests/qunit/datamodel/Lexeme.tests.js
b/tests/qunit/datamodel/Lexeme.tests.js
new file mode 100644
index 000..b4ab404
--- /dev/null
+++ b/tests/qunit/datamodel/Lexeme.tests.js
@@ -0,0 +1,64 @@
+( function ( wb, QUnit ) {
+ 'use strict';
+
+ QUnit.module( 'wikibase.lexeme.datamodel.Lexeme' );
+
+ /** @type {wikibase.lexeme.datamodel.Lexeme} */
+ var Lexeme = wb.lexeme.datamodel.Lexeme;
+ /** @type {wikibase.lexeme.datamodel.LexemeForm} */
+ var LexemeForm = wb.lexeme.datamodel.LexemeForm;
+
+ QUnit.test( 'Can create with ID and get it', function ( assert ) {
+ var lexeme = new Lexeme( 'L1' );
+
+ assert.equal( lexeme.getId(), 'L1' );
+ } );
+
+ QUnit.test( 'Can set statements and get them back', function ( assert )
{
+ var statementGroupSet =
createStatementGroupWithSingleStatement( 'P1', 'L1$1' );
+
+ var lexeme = new Lexeme( 'L1', statementGroupSet );
+
+ assert.equal( lexeme.getStatements(), statementGroupSet );
+ } );
+
+ QUnit.test( 'Can find existing statement on the Lexeme by GUID',
function ( assert ) {
+ var guid = 'L1$1';
+ var statementGroupSet =
createStatementGroupWithSingleStatement( 'P1', guid );
+
+ var lexeme = new Lexeme( 'L1', statementGroupSet );
+
+ assert.ok( lexeme.findStatementByGuid( guid ) instanceof
wb.datamodel.Statement );
+ } );
+
+ QUnit.test( 'Can`t find nonexistent statement - returns null', function
( assert ) {
+ var statementGroupSet =
createStatementGroupWithSingleStatement( 'P1', 'L1$existing' );
+
+ var lexeme = new Lexeme( 'L1', statementGroupSet );
+
+ assert.equal( lexeme.findStatementByGuid( 'L1$nonexistent' ),
null );
+ } );
+
+ QUnit.test(
+ 'Ca
