Make sure that all ZnCharacterEncoders self identify correctly (see Z…

…nCharacterEncoderTest>>#testKnownEncodingIdentifiers)
svenvc · Nov 4, 2023 · f90402b · f90402b
1 parent 9ccd711
commit f90402b
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 10 deletions.
diff --git a/...haracter-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/class/newForEncoding..st b/...haracter-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/class/newForEncoding..st
@@ -5,6 +5,7 @@ newForEncoding: string
 
 	| encoder |
 	encoder := self new.
+	encoder identifier: string.
 	(string asLowercase endsWith: 'be') ifTrue: [ encoder beBigEndian ].
 	(string asLowercase endsWith: 'le') ifTrue: [ encoder beLittleEndian ].
 	^ encoder
diff --git a/...inc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/^equals.st b/...inc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/^equals.st
@@ -1,3 +1,3 @@
 comparing
 = anObject
-	^ super = anObject and: [ self endianness == anObject endianness ]
+	^ super = anObject and: [ self identifier == anObject identifier ]
diff --git a/...y/Zinc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/hash.st b/...y/Zinc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/hash.st
@@ -1,3 +1,3 @@
 comparing
 hash
-	^ super hash bitXor: self endianness hash
+	^ self identifier hash
diff --git a/...Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/identifier..st b/...Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/identifier..st
@@ -0,0 +1,3 @@
+accessing
+identifier: anObject
+	identifier := anObject
diff --git a/...UTF16Encoder.class/instance/identifier.st → ...veUTFEncoder.class/instance/identifier.st b/...UTF16Encoder.class/instance/identifier.st → ...veUTFEncoder.class/instance/identifier.st
@@ -1,3 +1,3 @@
 accessing
 identifier
-	^ #utf16
+	^ identifier
diff --git a/...nc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/printOn..st b/...nc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/instance/printOn..st
@@ -2,5 +2,6 @@ printing
 printOn: stream
 	super printOn: stream.
 	stream nextPut: $(.
+	stream print: self identifier asString; space.
 	stream nextPutAll: endianness; nextPutAll: ' endian'.
 	stream nextPut: $)
diff --git a/...ry/Zinc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/properties.json b/...ry/Zinc-Character-Encoding-Core.package/ZnEndianSensitiveUTFEncoder.class/properties.json
@@ -6,7 +6,8 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"endianness"
+		"endianness",
+		"identifier"
 	],
 	"name" : "ZnEndianSensitiveUTFEncoder",
 	"type" : "normal"

diff --git a/repository/Zinc-Character-Encoding-Core.package/ZnNullEncoder.class/instance/identifier.st b/repository/Zinc-Character-Encoding-Core.package/ZnNullEncoder.class/instance/identifier.st
@@ -1,3 +1,3 @@
 accessing
 identifier
-	^ #ascii
+	^ #null
diff --git a/repository/Zinc-Character-Encoding-Core.package/ZnUTF32Encoder.class/instance/identifier.st b/repository/Zinc-Character-Encoding-Core.package/ZnUTF32Encoder.class/instance/identifier.st
diff --git a/...oding-Tests.package/ZnCharacterEncoderTest.class/instance/testKnownEncodingIdentifiers.st b/...oding-Tests.package/ZnCharacterEncoderTest.class/instance/testKnownEncodingIdentifiers.st
@@ -1,6 +1,6 @@
 testing
 testKnownEncodingIdentifiers
-	| all minimal asciiString |
+	| all minimal asciiString notSelfIdentifying|
 	all := ZnCharacterEncoder knownEncodingIdentifiers asSet.
 	minimal := #(utf8 latin1 null ascii iso88591) asSet.
 	"make sure at least a minimal set is present"
@@ -12,4 +12,8 @@ testKnownEncodingIdentifiers
 		| encoder bytes |
 		encoder := ZnCharacterEncoder newForEncoding: each.
 		bytes := encoder encodeString: asciiString.
-		self assert: (encoder decodeBytes: bytes) equals: asciiString ]
+		self assert: (encoder decodeBytes: bytes) equals: asciiString ].
+	"make sure identifiers are preserved"
+	notSelfIdentifying := ZnCharacterEncoder knownEncodingIdentifiers reject: [ :each | 
+		each asZnCharacterEncoder identifier = each ].
+	self assert: notSelfIdentifying isEmpty