- Changed MpSettings>>formatVersion's default to 2013.

mumez · mumez · commit 62f18a7d92a4 · 2015-06-21T20:47:00.000+09:00
- Updated old format tests to use non-default settings.
diff --git a/repository/MessagePack-Core.package/MpSettings.class/instance/formatVersion.st b/repository/MessagePack-Core.package/MpSettings.class/instance/formatVersion.st
@@ -1,4 +1,4 @@
 accessing
 formatVersion
 	"2008, 2013"
-	^self at: #formatVersion ifAbsent: [2008]
+	^self at: #formatVersion ifAbsent: [2013]
diff --git a/repository/MessagePack-Core.package/MpSettings.class/instance/legacyFormat.st b/repository/MessagePack-Core.package/MpSettings.class/instance/legacyFormat.st
@@ -0,0 +1,3 @@
+accessing
+legacyFormat
+	^self formatVersion: 2008
diff --git a/repository/MessagePack-Core.package/MpSettings.class/methodProperties.json b/repository/MessagePack-Core.package/MpSettings.class/methodProperties.json
@@ -16,11 +16,12 @@
 		"encodeMode:" : "MasashiUmezawa 2/2/2013 00:30",
 		"fastBulkWrite" : "mu 10/29/2011 23:24",
 		"fastBulkWrite:" : "mu 10/29/2011 22:52",
-		"formatVersion" : "mu 8/19/2013 00:57",
+		"formatVersion" : "MasashiUmezawa 6/21/2015 16:12",
 		"formatVersion:" : "mu 8/19/2013 00:37",
 		"includesKey:" : "mu 4/29/2011 15:12",
 		"initialize" : "mu 4/29/2011 15:12",
 		"keys" : "mu 4/29/2011 15:12",
+		"legacyFormat" : "MasashiUmezawa 6/21/2015 16:20",
 		"printOn:" : "MasashiUmezawa 2/2/2013 00:18",
 		"settingsDict" : "mu 4/29/2011 15:12",
 		"stringAsBytes" : "mu 5/2/2012 12:04",
diff --git a/repository/MessagePack-Core.package/monticello.meta/version b/repository/MessagePack-Core.package/monticello.meta/version
@@ -1 +1 @@
-(name 'MessagePack-Core-MasashiUmezawa.33' message 'Fixed a mapping bug in MpDecodeTypeMapper>>bytesAsString' id 'd6135ce8-d710-444d-b3b0-2a6c24168765' date '23 May 2015' time '11:36:39.85456 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.32' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '7672363c-2b3d-422c-a18d-63de7ceb21ba' date '18 May 2015' time '10:54:43.647181 am' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-mu.31' message '- Ext and Fixext encoding/decoding are now working' id '958b6113-8b9b-214c-a28e-38c991a8b70b' date '8 December 2013' time '3:47:05.753 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
+(name 'MessagePack-Core-MasashiUmezawa.34' message 'MpSettings>>formatVersion -> 2013 is now default' id '51579c03-5587-47f1-9ebf-8a5ef7470230' date '21 June 2015' time '4:34:16.532914 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.33' message 'Fixed a mapping bug in MpDecodeTypeMapper>>bytesAsString' id 'd6135ce8-d710-444d-b3b0-2a6c24168765' date '23 May 2015' time '11:36:39.85456 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.32' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '7672363c-2b3d-422c-a18d-63de7ceb21ba' date '18 May 2015' time '10:54:43.647181 am' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-mu.31' message '- Ext and Fixext encoding/decoding are now working' id '958b6113-8b9b-214c-a28e-38c991a8b70b' date '8 December 2013' time '3:47:05.753 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackStringArrayAsArrayOfBytes.st b/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackStringArrayAsArrayOfBytes.st
@@ -2,10 +2,13 @@ testing
 testPackStringArrayAsArrayOfBytes
 	"self debug: #testPackStringArrayAsArrayOfBytes"
 	| bytes |
-	self should: [self simpleStringContainedArray messagePacked] raise: MpError.
+	self should: [self simpleStringContainedArray messagePacked: [:settings | settings legacyFormat]] raise: MpError.
 	
-	bytes := self simpleStringContainedArray messagePacked: [:settings | settings stringAsBytes: true].
+	bytes := self simpleStringContainedArray messagePacked: [:settings | settings 
+				legacyFormat;
+				stringAsBytes: true].
 	
-	self assert: (bytes = (self simpleStringContainedArray collect: [:each | (MpPortableUtil default bytesFromString: each)]) messagePacked)
+	self assert: (bytes = ((self simpleStringContainedArray 	collect: [:each | each asByteArray]) 
+									messagePacked: [:settings | settings legacyFormat]))
 			
 		
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackStringAsBytes.st b/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackStringAsBytes.st
@@ -2,10 +2,12 @@ testing
 testPackStringAsBytes
 	"self debug: #testPackStringAsBytes"
 	| bytes |
-	self should: [self simpleString messagePacked] raise: MpError.
+	self should: [self simpleString messagePacked:[:se | se legacyFormat]] raise: MpError.
 	
-	bytes := self simpleString messagePacked: [:settings | settings stringAsBytes: true].
+	bytes := self simpleString messagePacked: [:settings | settings legacyFormat; stringAsBytes: true].
 	
-	self assert: (bytes = (MpPortableUtil default bytesFromString: self simpleString) messagePacked)
+	self assert: (bytes = (self simpleString asByteArray messagePacked:[:se | se legacyFormat])).
+	
+	self deny: (bytes = (self simpleString asByteArray messagePacked))
 			
 		
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackUnpackComplexIdentityDictionary.st b/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackUnpackComplexIdentityDictionary.st
@@ -4,12 +4,12 @@ testPackUnpackComplexIdentityDictionary
 	| bytes convertedDic unpacked1 unpacked2 |
 	self should: [self complexIdentityDictionary messagePacked] raise: MpError.
 	
-	bytes := self complexIdentityDictionary messagePacked: [:se | se stringAsBytes: true; encodeMode: #loose].
+	bytes := self complexIdentityDictionary messagePacked: [:se | se legacyFormat; stringAsBytes: true; encodeMode: #loose].
 	
 	convertedDic := self complexDictionaryAfterConverted.
 	
-	unpacked1 := Object fromMessagePack:  bytes setting: [:se | se bytesAsString: true].
-	unpacked2 := Object fromMessagePack:  convertedDic messagePacked setting: [:se | se bytesAsString: true].
+	unpacked1 := Object fromMessagePack: bytes setting: [:se | se legacyFormat; bytesAsString: true].
+	unpacked2 := Object fromMessagePack: (convertedDic messagePacked: [:se | se legacyFormat]) setting: [:se | se legacyFormat; bytesAsString: true].
 	
 	self should: [self collectionEquals: unpacked1 with: unpacked2]
 			
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackUnpackSimpleIdentityDictionary.st b/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testPackUnpackSimpleIdentityDictionary.st
@@ -4,13 +4,13 @@ testPackUnpackSimpleIdentityDictionary
 	| bytes convertedDic unpacked1 unpacked2 |
 	self should: [self simpleIdentityDictionary messagePacked] raise: MpError.
 	
-	bytes := self simpleIdentityDictionary messagePacked: [:se | se stringAsBytes: true; encodeMode: #loose].
+	bytes := self simpleIdentityDictionary messagePacked: [:se | se legacyFormat; stringAsBytes: true; encodeMode: #loose].
 	
 	convertedDic := Dictionary new.
 	self simpleIdentityDictionary keysAndValuesDo: [:k :v | convertedDic at:  (MpPortableUtil default bytesFromString: k) put: (MpPortableUtil default bytesFromString: v)].
 	
-	unpacked1 := Object fromMessagePack:  bytes setting: [:se | se bytesAsString: true].
-	unpacked2 := Object fromMessagePack:  convertedDic messagePacked setting: [:se | se bytesAsString: true].
+	unpacked1 := Object fromMessagePack: bytes setting: [:se | se legacyFormat; bytesAsString: true].
+	unpacked2 := Object fromMessagePack: (convertedDic messagePacked: [:se | se legacyFormat] ) setting: [:se | se legacyFormat; bytesAsString: true].
 	
 	self should: [self collectionEquals: unpacked1 with: unpacked2]
 			
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testUnpackBytesAsString.st b/repository/MessagePackTest.package/MpSettingsTestCase.class/instance/testUnpackBytesAsString.st
@@ -2,11 +2,11 @@ testing
 testUnpackBytesAsString
 	"self debug: #testUnpackBytesAsString"
 	| bytes unpackedAsByteArrays unpacked  |
-	bytes := self simpleStringContainedArray messagePacked: [:se | se stringAsBytes: true].
-	unpackedAsByteArrays := Object fromMessagePack: bytes.
-	self assert: (unpackedAsByteArrays = (self simpleStringContainedArray collect: [:each | MpPortableUtil default bytesFromString: each])).
+	bytes := self simpleStringContainedArray messagePacked: [:se | se legacyFormat; stringAsBytes: true].
+	unpackedAsByteArrays := Object fromMessagePack: bytes setting: [:se | se legacyFormat].
+	self assert: (unpackedAsByteArrays = (self simpleStringContainedArray collect: [:each | each asByteArray])).
 	
-	unpacked := Object fromMessagePack: bytes setting: [:se | se bytesAsString: true].
+	unpacked := Object fromMessagePack: bytes setting: [:se | se legacyFormat; bytesAsString: true].
 	self assert: (unpacked = self simpleStringContainedArray)
 			
 		
diff --git a/repository/MessagePackTest.package/MpSettingsTestCase.class/methodProperties.json b/repository/MessagePackTest.package/MpSettingsTestCase.class/methodProperties.json
@@ -14,11 +14,11 @@
 		"simpleStringContainedArray" : "MasashiUmezawa 2/2/2013 21:16",
 		"stringSizes" : "MasashiUmezawa 2/2/2013 21:13",
 		"stringsArray" : "MasashiUmezawa 2/2/2013 21:17",
-		"testPackStringArrayAsArrayOfBytes" : "MasashiUmezawa 2/2/2013 21:17",
-		"testPackStringAsBytes" : "MasashiUmezawa 2/2/2013 20:56",
+		"testPackStringArrayAsArrayOfBytes" : "MasashiUmezawa 6/21/2015 16:32",
+		"testPackStringAsBytes" : "MasashiUmezawa 6/21/2015 16:26",
 		"testPackUnknownContainedArray" : "MasashiUmezawa 2/2/2013 21:03",
 		"testPackUnknownContainedDictionary" : "MasashiUmezawa 2/2/2013 21:07",
-		"testPackUnpackComplexIdentityDictionary" : "MasashiUmezawa 2/2/2013 21:50",
-		"testPackUnpackSimpleIdentityDictionary" : "MasashiUmezawa 2/2/2013 21:35",
+		"testPackUnpackComplexIdentityDictionary" : "MasashiUmezawa 6/21/2015 20:30",
+		"testPackUnpackSimpleIdentityDictionary" : "MasashiUmezawa 6/21/2015 20:31",
 		"testPackUnpackStrings" : "MasashiUmezawa 2/2/2013 21:21",
-		"testUnpackBytesAsString" : "MasashiUmezawa 2/2/2013 22:00" } }
+		"testUnpackBytesAsString" : "MasashiUmezawa 6/21/2015 16:29" } }
diff --git a/repository/MessagePackTest.package/monticello.meta/version b/repository/MessagePackTest.package/monticello.meta/version
@@ -1 +1 @@
-(name 'MessagePackTest-MasashiUmezawa.11' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '0743d0ea-4883-40eb-8632-c39dad337679' date '18 May 2015' time '10:55:09.715775 am' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.10' message '-Added testPackUnpackExt, testPackUnpackFixExt test cases' id 'd9431577-e13c-724a-b3ff-642435692c12' date '8 December 2013' time '3:47:56.186 pm' author 'mu' ancestors ((name 'MessagePackTest-MasashiUmezawa.9' message '-Fixed MpStringUnpackTestCase>>testUnpackString8 to run on Pharo' id '4fedb785-bf5b-bb42-9245-6a0b2973d013' date '15 October 2013' time '1:07:32.7 am' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.8' message '- Added PackUnpack tests for new Binary type- Added tests for String (formerly Raw) type' id '5f057f80-8c27-084b-89b1-5c3cc7ae9f9c' date '26 August 2013' time '12:34:48.825 am' author 'mu' ancestors ((name 'MessagePackTest-mu.7' message 'Added decoder tests for str8, bin8, bin16, bin32.See the proposal: https://gist.github.com/frsyuki/5432559' id 'da119030-ed83-6241-847c-2795a61d804a' date '12 August 2013' time '1:41:12.542 am' author 'mu' ancestors ((name 'MessagePackTest-MasashiUmezawa.6' message 'Avoid sending #asByteArray for portability' id 'c9be1c45-49c4-8947-93d5-16ccbf7e7df3' date '2 February 2013' time '10:02:03.626 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-MasashiUmezawa.5' message 'Confirmed all tests are green' id '9667ec89-9c26-1c46-8a89-fad027e006bc' date '2 February 2013' time '9:57:02.029 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-MasashiUmezawa.4' message 'Adding test cases for new encode/decode options' id '61bbf0a0-053d-c24c-bd29-8332d8e99a57' date '2 February 2013' time '9:36:55.589 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.3' message 'Changes for portablity' id '06a6b0a5-0061-104a-bec2-a82f96c6a87c' date '23 June 2011' time '5:09:30.249 pm' author 'mu' ancestors ((name 'MessagePackTest-mu.2' message 'empty log message' id '77d3b945-c29d-c34f-84e7-81b255f6a638' date '2 May 2011' time '12:02:08.182 am' author 'mu' ancestors ((name 'MessagePackTest-mu.1' message 'empty log message' id '0ba4d187-aa2e-c94d-8aed-2dd83925c6b8' date '1 May 2011' time '11:43:57.135 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'MessagePackTest-MasashiUmezawa.12' message '- Changed tests for older format' id '7917bb4f-8326-4932-bb01-bf96b1b8542f' date '21 June 2015' time '8:36:04.342843 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-MasashiUmezawa.11' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '0743d0ea-4883-40eb-8632-c39dad337679' date '18 May 2015' time '10:55:09.715775 am' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.10' message '-Added testPackUnpackExt, testPackUnpackFixExt test cases' id 'd9431577-e13c-724a-b3ff-642435692c12' date '8 December 2013' time '3:47:56.186 pm' author 'mu' ancestors ((name 'MessagePackTest-MasashiUmezawa.9' message '-Fixed MpStringUnpackTestCase>>testUnpackString8 to run on Pharo' id '4fedb785-bf5b-bb42-9245-6a0b2973d013' date '15 October 2013' time '1:07:32.7 am' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.8' message '- Added PackUnpack tests for new Binary type- Added tests for String (formerly Raw) type' id '5f057f80-8c27-084b-89b1-5c3cc7ae9f9c' date '26 August 2013' time '12:34:48.825 am' author 'mu' ancestors ((name 'MessagePackTest-mu.7' message 'Added decoder tests for str8, bin8, bin16, bin32.See the proposal: https://gist.github.com/frsyuki/5432559' id 'da119030-ed83-6241-847c-2795a61d804a' date '12 August 2013' time '1:41:12.542 am' author 'mu' ancestors ((name 'MessagePackTest-MasashiUmezawa.6' message 'Avoid sending #asByteArray for portability' id 'c9be1c45-49c4-8947-93d5-16ccbf7e7df3' date '2 February 2013' time '10:02:03.626 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-MasashiUmezawa.5' message 'Confirmed all tests are green' id '9667ec89-9c26-1c46-8a89-fad027e006bc' date '2 February 2013' time '9:57:02.029 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-MasashiUmezawa.4' message 'Adding test cases for new encode/decode options' id '61bbf0a0-053d-c24c-bd29-8332d8e99a57' date '2 February 2013' time '9:36:55.589 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePackTest-mu.3' message 'Changes for portablity' id '06a6b0a5-0061-104a-bec2-a82f96c6a87c' date '23 June 2011' time '5:09:30.249 pm' author 'mu' ancestors ((name 'MessagePackTest-mu.2' message 'empty log message' id '77d3b945-c29d-c34f-84e7-81b255f6a638' date '2 May 2011' time '12:02:08.182 am' author 'mu' ancestors ((name 'MessagePackTest-mu.1' message 'empty log message' id '0ba4d187-aa2e-c94d-8aed-2dd83925c6b8' date '1 May 2011' time '11:43:57.135 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+accessing`
	`2`	`+legacyFormat`
	`3`	`+ ^self formatVersion: 2008`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-(name 'MessagePack-Core-MasashiUmezawa.33' message 'Fixed a mapping bug in MpDecodeTypeMapper>>bytesAsString' id 'd6135ce8-d710-444d-b3b0-2a6c24168765' date '23 May 2015' time '11:36:39.85456 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.32' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '7672363c-2b3d-422c-a18d-63de7ceb21ba' date '18 May 2015' time '10:54:43.647181 am' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-mu.31' message '- Ext and Fixext encoding/decoding are now working' id '958b6113-8b9b-214c-a28e-38c991a8b70b' date '8 December 2013' time '3:47:05.753 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
	`1`	+(name 'MessagePack-Core-MasashiUmezawa.34' message 'MpSettings>>formatVersion -> 2013 is now default' id '51579c03-5587-47f1-9ebf-8a5ef7470230' date '21 June 2015' time '4:34:16.532914 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.33' message 'Fixed a mapping bug in MpDecodeTypeMapper>>bytesAsString' id 'd6135ce8-d710-444d-b3b0-2a6c24168765' date '23 May 2015' time '11:36:39.85456 pm' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-MasashiUmezawa.32' message 'Renamed MpConstants typecode methods for compatibility with GemStone.https://github.com/msgpack/msgpack-smalltalk/issues/4' id '7672363c-2b3d-422c-a18d-63de7ceb21ba' date '18 May 2015' time '10:54:43.647181 am' author 'MasashiUmezawa' ancestors ((name 'MessagePack-Core-mu.31' message '- Ext and Fixext encoding/decoding are now working' id '958b6113-8b9b-214c-a28e-38c991a8b70b' date '8 December 2013' time '3:47:05.753 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())