diff --git a/src/main/java/io/github/gagern/nodeJavaDeserialization/TestCases.java b/src/main/java/io/github/gagern/nodeJavaDeserialization/TestCases.java index e2f67ce..0a437ff 100644 --- a/src/main/java/io/github/gagern/nodeJavaDeserialization/TestCases.java +++ b/src/main/java/io/github/gagern/nodeJavaDeserialization/TestCases.java @@ -201,9 +201,9 @@ public void nulls() throws Exception { checkStrictEqual("itm.class.name", "'io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'"); checkStrictEqual("itm.class.super.name", "'io.github.gagern.nodeJavaDeserialization.BaseClassWithField'"); checkStrictEqual("itm.class.super.super", "null"); - checkStrictEqual("itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.bar", "234"); - checkStrictEqual("itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.foo", "undefined"); - checkStrictEqual("itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo", "123"); + checkStrictEqual("itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].bar", "234"); + checkStrictEqual("itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].foo", "undefined"); + checkStrictEqual("itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo", "123"); checkStrictEqual("itm.bar", "234"); checkStrictEqual("itm.foo", "123"); } @@ -213,8 +213,8 @@ public void nulls() throws Exception { checkStrictEqual("itm.class.name", "'io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField'"); checkStrictEqual("itm.class.super.name", "'io.github.gagern.nodeJavaDeserialization.BaseClassWithField'"); checkStrictEqual("itm.class.super.super", "null"); - checkStrictEqual("itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField.foo", "345"); - checkStrictEqual("itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo", "123"); + checkStrictEqual("itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField'].foo", "345"); + checkStrictEqual("itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo", "123"); checkStrictEqual("itm.foo", "345"); } diff --git a/src/test/node/generated.js b/src/test/node/generated.js index aa6b096..e1fd721 100644 --- a/src/test/node/generated.js +++ b/src/test/node/generated.js @@ -30,13 +30,6 @@ function testCase(b64data, checks) { describe('Deserialization of', function() { - it('string', testCase( - 'rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAJ0AAVCZWdpbnEAfgABdAAIc29tZXRleHR1cQB+AAAAAAACcQB+AAR0AANFbmQ=', - function(itm) { - expect(typeof itm, "typeof itm").to.equal('string'); - expect(itm, "itm").to.equal('sometext'); - })); - it('Exception as regular object', testCase( 'H4sIAAAAAAAAAIVSXWvUQBS9m83WNqAufmGrriBaUWQXQYWSIthllWKsoBWEBWU2ud1OnUzizMSNCqKIr+KrgvoHfBX8AX48FEQEH330TZ99seDc1P2Qgs7DTHJz7plzTu6rH1DJFGxvByvsFqsLJrv1i50VDI3/5OPVl1V9RDgAeQoAjoHKHHa5vAn3oKQVTA1bLmXS8BhbeYip4Yl8cX3snHfi4TfqtexD4ADxaW3/6Sl/79sNiMVllfRYR+CX9ycPz/TerJbBDaASskyjgZ2FzgYhGwOkH8DmCA3j4gJqzboWt20Ed9koLrt+GzxtWHhjUbHQImrtvyD9Dy2BMUpjKXfoLE2VJcRooFobqK63ZYaLRsC18fOUAvEMjJ1nnSSJbZy10Tg3cjtnj87Orh2Y6SdLYe75RwObePds+tTXRw648+AJLnEhizuoAtgSYSgY2WsKpjUJ2RTA+BIXuMBi/PPuxWiWk2hQKS69a6DcFNbQuN3rdLstWKDVMl1oIYf1ZiKEHQayfvCKjJOIL3GKnJz/2nro+Ovvj6sOlAJwha0Q+4T9ncf+TzCsT87B/dVrP2sFTSk0sGsk4SHM5qz7g1Iwn1GK3SYd+YPP+55+YM/LUJoHV/M7WBiEnkt7TqJ25xkdtBx6mLReWzL6DS3112r+AgAA', function(itm) { @@ -44,6 +37,13 @@ describe('Deserialization of', function() { expect(itm.detailMessage, "itm.detailMessage").to.equal('Kaboom'); })); + it('string', testCase( + 'rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAJ0AAVCZWdpbnEAfgABdAAIc29tZXRleHR1cQB+AAAAAAACcQB+AAR0AANFbmQ=', + function(itm) { + expect(typeof itm, "typeof itm").to.equal('string'); + expect(itm, "itm").to.equal('sometext'); + })); + it('canaries only', testCase( 'rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAJ0AAVCZWdpbnEAfgABdXEAfgAAAAAAAnEAfgADdAADRW5k', function() { @@ -115,9 +115,9 @@ describe('Deserialization of', function() { expect(itm.class.name, "itm.class.name").to.equal('io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'); expect(itm.class.super.name, "itm.class.super.name").to.equal('io.github.gagern.nodeJavaDeserialization.BaseClassWithField'); expect(itm.class.super.super, "itm.class.super.super").to.equal(null); - expect(itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.bar, "itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.bar").to.equal(234); - expect(itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.foo, "itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField.foo").to.equal(undefined); - expect(itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo, "itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo").to.equal(123); + expect(itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].bar, "itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].bar").to.equal(234); + expect(itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].foo, "itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithAnotherField'].foo").to.equal(undefined); + expect(itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo, "itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo").to.equal(123); expect(itm.bar, "itm.bar").to.equal(234); expect(itm.foo, "itm.foo").to.equal(123); })); @@ -128,8 +128,8 @@ describe('Deserialization of', function() { expect(itm.class.name, "itm.class.name").to.equal('io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField'); expect(itm.class.super.name, "itm.class.super.name").to.equal('io.github.gagern.nodeJavaDeserialization.BaseClassWithField'); expect(itm.class.super.super, "itm.class.super.super").to.equal(null); - expect(itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField.foo, "itm.extends.io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField.foo").to.equal(345); - expect(itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo, "itm.extends.io.github.gagern.nodeJavaDeserialization.BaseClassWithField.foo").to.equal(123); + expect(itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField'].foo, "itm.extends['io.github.gagern.nodeJavaDeserialization.DerivedClassWithSameField'].foo").to.equal(345); + expect(itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo, "itm.extends['io.github.gagern.nodeJavaDeserialization.BaseClassWithField'].foo").to.equal(123); expect(itm.foo, "itm.foo").to.equal(345); }));