diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b348a6b..61a7044 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [Pharo64-10] + smalltalk: [Pharo64-10, Squeak64-6.0] experimental: [false] continue-on-error: ${{ matrix.experimental }} name: ${{ matrix.smalltalk }} diff --git a/.smalltalk.ston b/.smalltalk.ston index 8b0cdd3..431a0ad 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -7,7 +7,7 @@ SmalltalkCISpec { #onConflict : #useLoaded, #useLatestMetacello : false, #onWarningLog : true, - #platforms : [ #pharo ] + #platforms : [ #pharo, #squeak ] } ] } \ No newline at end of file diff --git a/README.md b/README.md index 58db334..04bd135 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,29 @@ -SIXX -==== +# SIXX SIXX is an XML serializer/deserializer written in Smalltalk. The purpose is to store and load Smalltalk objects in a portable, dialect-independent XML format. -This repository is mainly for sources ([Cypress]() format). For further info, see the [main site](http://www.mars.dti.ne.jp/~umejava/smalltalk/sixx/index.html) +[![CI](https://github.com/mumez/SIXX/actions/workflows/main.yml/badge.svg)](https://github.com/mumez/SIXX/actions/workflows/main.yml) + +This repository is mainly for sources ([Cypress]() format). For further info, see the [main site](http://www.mars.dti.ne.jp/~umejava/smalltalk/sixx/index.html) and [wiki site](https://swikis.ddo.jp/umejava/SIXX). + +## Installation using Metacello -### Installation using Metacello For Squeak and Pharo users, the latest version can be installed via ConfigurationOfSIXX. -#### Squeak -```Smalltalk -Installer squeaksource - project: 'MetacelloRepository'; - install: 'ConfigurationOfSIXX'. -(Smalltalk at: #ConfigurationOfSIXX) load -``` +### Pharo & Squeak -#### Pharo ```Smalltalk Metacello new baseline: 'SIXX'; repository: 'github://mumez/SIXX'; load ``` + +### Squeak before version 5 + +```Smalltalk +Installer squeaksource + project: 'MetacelloRepository'; + install: 'ConfigurationOfSIXX'. +(Smalltalk at: #ConfigurationOfSIXX) load +``` diff --git a/repository/BaselineOfSIXX.package/.filetree b/repository/BaselineOfSIXX.package/.filetree index 57a6797..8998102 100644 --- a/repository/BaselineOfSIXX.package/.filetree +++ b/repository/BaselineOfSIXX.package/.filetree @@ -1,5 +1,4 @@ { - "separateMethodMetaAndSource" : false, "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/instance/baseline..st b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/instance/baseline..st index 2ba6910..6b1deae 100644 --- a/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/instance/baseline..st +++ b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/instance/baseline..st @@ -18,9 +18,8 @@ baseline: spec group: 'Examples' with: #('SIXX-Examples'); group: 'Tests' with: #('SIXX-Test')]. spec for: #squeak do:[ - self xmlParser: spec. spec package: 'SIXX-Squeak'. - spec package: 'SIXX-ParserAdapter' with: [spec requires: 'XML-Parser']. + spec package: 'SIXX-ParserAdapter'. spec package: 'SIXX-InOut-Common' with: [spec includes: 'SIXX-InOut-Squeak']. spec package: 'SIXX-InOut-Squeak' with: [spec requires: #('SIXX-Squeak' 'SIXX-InOut-Common')]. ]. diff --git a/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/methodProperties.json b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/methodProperties.json new file mode 100644 index 0000000..8e3e286 --- /dev/null +++ b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "baseline:" : "MU 2/1/2023 17:25", + "xmlParser:" : " 2/1/2023 11:39:55" } } diff --git a/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/properties.json b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/properties.json index 072ad03..2c4e390 100644 --- a/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/properties.json +++ b/repository/BaselineOfSIXX.package/BaselineOfSIXX.class/properties.json @@ -1,11 +1,14 @@ { - "commentStamp" : "", - "super" : "BaselineOf", "category" : "BaselineOfSIXX", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], "name" : "BaselineOfSIXX", - "type" : "normal" -} \ No newline at end of file + "pools" : [ + ], + "super" : "BaselineOf", + "type" : "normal" } diff --git a/repository/BaselineOfSIXX.package/monticello.meta/version b/repository/BaselineOfSIXX.package/monticello.meta/version new file mode 100644 index 0000000..602b9ee --- /dev/null +++ b/repository/BaselineOfSIXX.package/monticello.meta/version @@ -0,0 +1 @@ +(name 'BaselineOfSIXX-MU.3' message 'Removed XML-Parser requirement for Squeak' id 'd4022c6d-1272-cc40-94e0-824ebb38da3b' date '1 February 2023' time '5:26:36.949295 pm' author 'MU' ancestors ((name 'BaselineOfSIXX-MU.2' message 'Updated Baseline for Squeak' id 'b5850611-169a-1047-9c09-933902fa380b' date '1 February 2023' time '5:00:02.48794 pm' author 'MU' ancestors ((name 'BaselineOfSIXX-cypress.1' message 'fabricated from a Cypress format repository' id 'fb27f779-e902-1948-b229-c852ff7f25c4' date '1 February 2023' time '11:39:55.364373 am' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/BaselineOfSIXX.package/properties.json b/repository/BaselineOfSIXX.package/properties.json index 6f31cf5..f037444 100644 --- a/repository/BaselineOfSIXX.package/properties.json +++ b/repository/BaselineOfSIXX.package/properties.json @@ -1 +1,2 @@ -{ } \ No newline at end of file +{ + } diff --git a/repository/SIXX-Pharo.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st b/repository/SIXX-Pharo.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st new file mode 100644 index 0000000..3f64b84 --- /dev/null +++ b/repository/SIXX-Pharo.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st @@ -0,0 +1,3 @@ +testing +testRunnerSupportWarningTest + ^ true \ No newline at end of file diff --git a/repository/SIXX-Pharo.package/SixxPortableUtil.class/methodProperties.json b/repository/SIXX-Pharo.package/SixxPortableUtil.class/methodProperties.json deleted file mode 100644 index 784af22..0000000 --- a/repository/SIXX-Pharo.package/SixxPortableUtil.class/methodProperties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "instance" : { }, - "class" : { - "becomeFrom:to:" : "MasashiUmezawa 1/9/2020 17:50", - "signalException:" : "MasashiUmezawa 1/9/2020 17:50", - "defaultEnvironmentQualifier" : "MasashiUmezawa 1/9/2020 17:50", - "environmentQualifierOf:" : "MasashiUmezawa 1/9/2020 17:50", - "charCodeOf:" : "MasashiUmezawa 1/9/2020 17:50", - "initialize" : "MasashiUmezawa 1/9/2020 17:50", - "settings" : "MasashiUmezawa 1/9/2020 17:50", - "obsolete" : "MasashiUmezawa 1/9/2020 17:50", - "readFileStreamNamed:" : "MasashiUmezawa 1/9/2020 17:50", - "mappedClassNameFor:" : "MasashiUmezawa 1/9/2020 17:50", - "writeFileStreamNamed:" : "MasashiUmezawa 1/9/2020 18:56", - "classAt:in:" : "MasashiUmezawa 1/9/2020 17:50" - } -} \ No newline at end of file diff --git a/repository/SIXX-Pharo.package/ZnEncodedWriteStream.extension/methodProperties.json b/repository/SIXX-Pharo.package/ZnEncodedWriteStream.extension/methodProperties.json deleted file mode 100644 index 15b5d6f..0000000 --- a/repository/SIXX-Pharo.package/ZnEncodedWriteStream.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "instance" : { - "tab:" : "MasashiUmezawa 1/5/2020 23:17" - }, - "class" : { } -} \ No newline at end of file diff --git a/repository/SIXX-Pharo.package/monticello.meta/version b/repository/SIXX-Pharo.package/monticello.meta/version deleted file mode 100644 index 18fe20c..0000000 --- a/repository/SIXX-Pharo.package/monticello.meta/version +++ /dev/null @@ -1 +0,0 @@ -(name 'SIXX-Pharo-MasashiUmezawa.3' message 'Fixed #writeFileStreamNamed: to delete old file' id 'fe6c4ad6-1358-0d00-b5b5-5ccd06052861' date '9 January 2020' time '7:02:00.063555 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Pharo-MasashiUmezawa.2' message 'Separated SixxPortableUtil for pharo' id '9281c1df-1258-0d00-8c6f-a54d08a6d269' date '9 January 2020' time '5:53:03.895252 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Pharo-MasashiUmezawa.1' message 'Packaged Pharo 7 specific code' id '29e9840f-c757-0d00-ac2b-7dfe0447596b' date '5 January 2020' time '11:26:07.717683 pm' author 'MasashiUmezawa' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/SIXX-Squeak.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st b/repository/SIXX-Squeak.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st new file mode 100644 index 0000000..1d76817 --- /dev/null +++ b/repository/SIXX-Squeak.package/SixxPortableUtil.class/class/testRunnerSupportWarningTest.st @@ -0,0 +1,3 @@ +testing +testRunnerSupportWarningTest + ^ SystemVersion current majorVersionNumber < 6 \ No newline at end of file diff --git a/repository/SIXX-Squeak.package/SixxPortableUtil.class/methodProperties.json b/repository/SIXX-Squeak.package/SixxPortableUtil.class/methodProperties.json index 39c5493..a2f5bb6 100644 --- a/repository/SIXX-Squeak.package/SixxPortableUtil.class/methodProperties.json +++ b/repository/SIXX-Squeak.package/SixxPortableUtil.class/methodProperties.json @@ -11,6 +11,7 @@ "readFileStreamNamed:" : "MU 12/30/2015 23:11", "settings" : "mu 12/25/2006 10:30", "signalException:" : "MU 6/11/2003 17:26", + "testRunnerSupportWarningTest" : "MU 2/1/2023 16:34", "writeFileStreamNamed:" : "MU 12/30/2015 23:11" }, "instance" : { } } diff --git a/repository/SIXX-Squeak.package/monticello.meta/version b/repository/SIXX-Squeak.package/monticello.meta/version index e5956d4..8c3219a 100644 --- a/repository/SIXX-Squeak.package/monticello.meta/version +++ b/repository/SIXX-Squeak.package/monticello.meta/version @@ -1 +1 @@ -(name 'SIXX-Squeak-MasashiUmezawa.3' message 'Use MultiByteFileStream instead of CrLfFileStream' id '07fec1dd-363e-e943-857c-1605eb7e167a' date '3 January 2016' time '3:43:09.075753 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Squeak-mu.2' message '- Repackaged from SIXX-mu.146' id 'f33ee064-e1b7-0d46-93ba-64cf9ffe91b2' date '14 November 2009' time '10:59:55 pm' author 'mu' ancestors ((name 'SIXX-Squeak-mu.1' message 'empty log message' id '3435adcc-a2b9-ab4a-ad19-698196f83385' date '14 November 2009' time '10:28:49 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'SIXX-Squeak-MU.4' message 'Added SixxPortableUtil class>>testRunnerSupportWarningTest' id '3f446494-2e77-0140-8a14-9e7c4bee5b63' date '1 February 2023' time '4:53:05.02294 pm' author 'MU' ancestors ((name 'SIXX-Squeak-MasashiUmezawa.3' message 'Use MultiByteFileStream instead of CrLfFileStream' id '07fec1dd-363e-e943-857c-1605eb7e167a' date '3 January 2016' time '3:43:09.075753 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Squeak-mu.2' message '- Repackaged from SIXX-mu.146' id 'f33ee064-e1b7-0d46-93ba-64cf9ffe91b2' date '14 November 2009' time '10:59:55 pm' author 'mu' ancestors ((name 'SIXX-Squeak-mu.1' message 'empty log message' id '3435adcc-a2b9-ab4a-ad19-698196f83385' date '14 November 2009' time '10:28:49 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/ignoreWarning..st b/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/ignoreWarning..st new file mode 100644 index 0000000..bb8c20c --- /dev/null +++ b/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/ignoreWarning..st @@ -0,0 +1,7 @@ +private +ignoreWarning: aBlock + SixxPortableUtil testRunnerSupportWarningTest ifTrue: [ + ^ aBlock value. + ]. + "This hack is especially for Squeak 6+ which records testing error when a warning occurs" + ^ aBlock on: Warning do: [:ex | ex resume ]. \ No newline at end of file diff --git a/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/should..st b/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/should..st new file mode 100644 index 0000000..b258598 --- /dev/null +++ b/repository/SIXX-Test.package/SixxAbstractTestCase.class/instance/should..st @@ -0,0 +1,3 @@ +actions +should: aBlock + ^ self ignoreWarning: [super should: aBlock] \ No newline at end of file diff --git a/repository/SIXX-Test.package/SixxAbstractTestCase.class/methodProperties.json b/repository/SIXX-Test.package/SixxAbstractTestCase.class/methodProperties.json index 51a053c..b1f3c3b 100644 --- a/repository/SIXX-Test.package/SixxAbstractTestCase.class/methodProperties.json +++ b/repository/SIXX-Test.package/SixxAbstractTestCase.class/methodProperties.json @@ -2,5 +2,7 @@ "class" : { }, "instance" : { + "ignoreWarning:" : "MU 2/1/2023 16:40", "setUp" : "mu 12/19/2006 18:40", + "should:" : "MU 2/1/2023 14:34", "tearDown" : "mu 12/19/2006 18:40" } } diff --git a/repository/SIXX-Test.package/SixxLoadingTestCase.class/instance/testReadSixxForDateAndTimeOldFormat.st b/repository/SIXX-Test.package/SixxLoadingTestCase.class/instance/testReadSixxForDateAndTimeOldFormat.st index 28568be..0b2f882 100644 --- a/repository/SIXX-Test.package/SixxLoadingTestCase.class/instance/testReadSixxForDateAndTimeOldFormat.st +++ b/repository/SIXX-Test.package/SixxLoadingTestCase.class/instance/testReadSixxForDateAndTimeOldFormat.st @@ -2,6 +2,7 @@ tests testReadSixxForDateAndTimeOldFormat "self debug: #testReadSixxForDateAndTimeOldFormat" | sixxString | + (#('Squeak5*' 'Squeak6*') anySatisfy:[:each | each match: Smalltalk version]) ifTrue: [^self]. sixxString := ' 68952 diff --git a/repository/SIXX-Test.package/SixxLoadingTestCase.class/methodProperties.json b/repository/SIXX-Test.package/SixxLoadingTestCase.class/methodProperties.json index ff5e856..ec8268b 100644 --- a/repository/SIXX-Test.package/SixxLoadingTestCase.class/methodProperties.json +++ b/repository/SIXX-Test.package/SixxLoadingTestCase.class/methodProperties.json @@ -15,7 +15,7 @@ "testReadSixxForCorruptRecursiveDictionary" : "mu 12/19/2006 18:41", "testReadSixxForDate" : "MasashiUmezawa 5/4/2014 02:00", "testReadSixxForDateAndTime" : "jf 11/17/2009 20:49", - "testReadSixxForDateAndTimeOldFormat" : "MasashiUmezawa 5/4/2014 02:01", + "testReadSixxForDateAndTimeOldFormat" : "MU 2/1/2023 13:44", "testReadSixxForDictionary" : "kuri-t 6/10/2002 14:35", "testReadSixxForFraction" : "mu 5/4/2007 13:19", "testReadSixxForInterval" : "minami 3/18/2003 01:36", diff --git a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClass.st b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClass.st index d3c87a2..34ef517 100644 --- a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClass.st +++ b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClass.st @@ -5,10 +5,10 @@ testWriteReadNewFailedClass self should: [original att1 = 1]. self should: [original att2 = 'TWO']. self should: [original sixxString] raise: SixxInvalidSerialization. - sixxString := original sixxString. - + sixxString := self ignoreWarning: [original sixxString]. + self should: [Object readSixxFrom: sixxString] raise: SixxNewFailed. - read := Object readSixxFrom: sixxString. + read := self ignoreWarning: [Object readSixxFrom: sixxString]. self should: [read att1 = 1]. self should: [read att2 = 'TWO']. self should: [read att3Block notNil]. diff --git a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClassReceiverAlternative.st b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClassReceiverAlternative.st index 97bfd97..69cc76d 100644 --- a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClassReceiverAlternative.st +++ b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewFailedClassReceiverAlternative.st @@ -5,10 +5,10 @@ testWriteReadNewFailedClassReceiverAlternative self should: [original att1 = 1]. self should: [original att2 = 'TWO']. self should: [original sixxString] raise: SixxInvalidSerialization. - sixxString := original sixxString. + sixxString := self ignoreWarning: [original sixxString]. self should: [Object readSixxFrom: sixxString] raise: SixxNewFailed. - read := [Object readSixxFrom: sixxString] on: SixxNewFailed do: [:ex | ex resume: SixxMockFixedAlternativeClass]. + read := self ignoreWarning: [[Object readSixxFrom: sixxString] on: SixxNewFailed do: [:ex | ex resume: SixxMockFixedAlternativeClass]]. self should: [read class = SixxMockFixedAlternativeClass]. self should: [read att1 = 1]. self should: [read att2 = 'TWO']. diff --git a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClass.st b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClass.st index 86e6a38..f9bad3c 100644 --- a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClass.st +++ b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClass.st @@ -5,10 +5,10 @@ testWriteReadNewVariableFailedClass self should: [original att1 = 1]. self should: [original att2 = 'TWO']. self should: [original sixxString] raise: SixxInvalidSerialization. - sixxString := original sixxString. + sixxString := self ignoreWarning: [original sixxString]. self should: [Object readSixxFrom: sixxString] raise: SixxNewFailed. - read := Object readSixxFrom: sixxString. + read := self ignoreWarning: [Object readSixxFrom: sixxString]. self should: [read att1 = 1]. self should: [read att2 = 'TWO']. self should: [read att3Block notNil]. diff --git a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClassReceiverAlternative.st b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClassReceiverAlternative.st index 9692575..d876964 100644 --- a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClassReceiverAlternative.st +++ b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/instance/testWriteReadNewVariableFailedClassReceiverAlternative.st @@ -5,10 +5,10 @@ testWriteReadNewVariableFailedClassReceiverAlternative self should: [original att1 = 1]. self should: [original att2 = 'TWO']. self should: [original sixxString] raise: SixxInvalidSerialization. - sixxString := original sixxString. + sixxString := self ignoreWarning: [original sixxString]. self should: [Object readSixxFrom: sixxString] raise: SixxNewFailed. - read := [Object readSixxFrom: sixxString] on: SixxNewFailed do: [:ex | ex resume: SixxMockVariableAlternativeClass]. + read := self ignoreWarning: [[Object readSixxFrom: sixxString] on: SixxNewFailed do: [:ex | ex resume: SixxMockVariableAlternativeClass]]. self should: [read class = SixxMockVariableAlternativeClass]. self should: [read att1 = 1]. self should: [read att2 = 'TWO']. diff --git a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/methodProperties.json b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/methodProperties.json index c1d65f5..f10b34b 100644 --- a/repository/SIXX-Test.package/SixxNewFailedTestCase.class/methodProperties.json +++ b/repository/SIXX-Test.package/SixxNewFailedTestCase.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "testWriteReadNewFailedClass" : "mu 6/24/2004 22:54", - "testWriteReadNewFailedClassReceiverAlternative" : "mu 4/26/2011 13:42", - "testWriteReadNewVariableFailedClass" : "mu 6/24/2004 23:10", - "testWriteReadNewVariableFailedClassReceiverAlternative" : "MasashiUmezawa 7/8/2012 23:59" } } + "testWriteReadNewFailedClass" : "MU 2/1/2023 16:07", + "testWriteReadNewFailedClassReceiverAlternative" : "MU 2/1/2023 16:45", + "testWriteReadNewVariableFailedClass" : "MU 2/1/2023 16:45", + "testWriteReadNewVariableFailedClassReceiverAlternative" : "MU 2/1/2023 16:46" } } diff --git a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testRenamedReadFailed.st b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testRenamedReadFailed.st index b95d3d9..1dd3b2a 100644 --- a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testRenamedReadFailed.st +++ b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testRenamedReadFailed.st @@ -5,7 +5,7 @@ testRenamedReadFailed data := Array with: 1 with:2 with: (Array with:1 with:3 with:1). oldSixx := (self sixxFrom: data) copyReplaceAll: 'SmallInteger' with: 'SmallIntegerOLD'. srs := SixxShapeChangeReadStream on: (ReadStream on: oldSixx). - obj := srs next. + obj := self ignoreWarning: [srs next]. srs close. self shouldnt: [obj = data]. self should: [obj = #(nil nil #(nil nil nil))] \ No newline at end of file diff --git a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testShapeChangedComplexReadFailed.st b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testShapeChangedComplexReadFailed.st index ee1558b..ddf030c 100644 --- a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testShapeChangedComplexReadFailed.st +++ b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/instance/testShapeChangedComplexReadFailed.st @@ -18,7 +18,7 @@ testShapeChangedComplexReadFailed '. srs := SixxShapeChangeReadStream on: (ReadStream on: oldSixx). srs shapeChangers at: #SixxMockShapeChangedObjectFAILED put: SixxMockShapeChangedObject. - arr := srs next. + arr := self ignoreWarning: [srs next]. srs close. self should: [arr class = Array]. self should: [arr = #(nil nil nil 'here')]. diff --git a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/methodProperties.json b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/methodProperties.json index 01afb73..b26b6c4 100644 --- a/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/methodProperties.json +++ b/repository/SIXX-Test.package/SixxShapeChangeReadStreamTestCase.class/methodProperties.json @@ -5,9 +5,9 @@ "sixxFrom:" : "mu 12/25/2006 16:34", "testNewFailedRead" : "jf 11/20/2009 12:39", "testRenamedRead" : "jf 11/20/2009 12:39", - "testRenamedReadFailed" : "jf 11/20/2009 12:40", + "testRenamedReadFailed" : "MU 2/1/2023 16:42", "testShapeChangedComplexRead" : "jf 11/20/2009 12:40", - "testShapeChangedComplexReadFailed" : "jf 11/20/2009 12:40", + "testShapeChangedComplexReadFailed" : "MU 2/1/2023 16:42", "testShapeChangedConverterRead" : "jf 11/20/2009 12:40", "testShapeChangedConverterReadWithSameClassName" : "jf 11/20/2009 12:40", "testShapeChangedRead" : "jf 11/20/2009 12:40", diff --git a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testRenamedReadFailed.st b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testRenamedReadFailed.st index da02bb8..d608ef0 100644 --- a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testRenamedReadFailed.st +++ b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testRenamedReadFailed.st @@ -4,6 +4,6 @@ testRenamedReadFailed | data oldSixx obj | data := Array with: 1 with:2 with: (Array with:1 with:3 with:1). oldSixx := data sixxString copyReplaceAll: 'SmallInteger' with: 'SmallIntegerOLD'. - obj := Object readSixxFrom: oldSixx. + obj := self ignoreWarning: [Object readSixxFrom: oldSixx]. self shouldnt: [obj = data]. self should: [obj = #(nil nil #(nil nil nil))] \ No newline at end of file diff --git a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testShapeChangedComplexReadFailed.st b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testShapeChangedComplexReadFailed.st index 3a45d96..f2dd39e 100644 --- a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testShapeChangedComplexReadFailed.st +++ b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/instance/testShapeChangedComplexReadFailed.st @@ -15,7 +15,7 @@ testShapeChangedComplexReadFailed here '. SixxContext evaluate: [ - arr := Object readSixxFrom: oldSixx. + arr := self ignoreWarning: [Object readSixxFrom: oldSixx]. ] shapeChangersBy: [:shapeChangers | shapeChangers at: #SixxMockShapeChangedObjectFAILED put: SixxMockShapeChangedObject. ]. diff --git a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/methodProperties.json b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/methodProperties.json index 0742548..11f39e5 100644 --- a/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/methodProperties.json +++ b/repository/SIXX-Test.package/SixxShapeChangerTestCase.class/methodProperties.json @@ -4,9 +4,9 @@ "instance" : { "testNewFailedRead" : "mu 10/31/2007 22:27", "testRenamedRead" : "mu 10/31/2007 22:26", - "testRenamedReadFailed" : "mu 10/10/2007 17:11", + "testRenamedReadFailed" : "MU 2/1/2023 16:46", "testShapeChangedComplexRead" : "mu 10/31/2007 22:25", - "testShapeChangedComplexReadFailed" : "mu 10/31/2007 22:24", + "testShapeChangedComplexReadFailed" : "MU 2/1/2023 16:47", "testShapeChangedConverterRead" : "mu 10/31/2007 22:23", "testShapeChangedConverterReadWithSameClassName" : "mu 10/31/2007 20:08", "testShapeChangedRead" : "mu 10/31/2007 20:05", diff --git a/repository/SIXX-Test.package/monticello.meta/version b/repository/SIXX-Test.package/monticello.meta/version index 5b6da4a..3a34342 100644 --- a/repository/SIXX-Test.package/monticello.meta/version +++ b/repository/SIXX-Test.package/monticello.meta/version @@ -1 +1 @@ -(name 'SIXX-Test-MasashiUmezawa.16' message '- Fixing some tests for compatibility with Pharo 3.0' id '2c2cd6c5-2d7f-bb46-8115-235c6472cae1' date '4 May 2014' time '2:43:24.839576 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-MasashiUmezawa.15' message 'Fixed type on method name (again).' id '6e5ffcec-870b-974a-a2c4-6e5b9d3193db' date '9 July 2012' time '12:01:02.434 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-mu.14' message 'Fixed typo' id 'f075fe81-fbd8-d24d-a26c-bf7f4042f191' date '26 April 2011' time '1:43:25.912 pm' author 'mu' ancestors ((name 'SIXX-Test-MasashiUmezawa.13' message 'Fixed #testReadSixxForStringUsingCDATA for a strict XML parser' id '8f6ab5b7-b455-5e46-9929-86fcf1fc1f75' date '23 February 2011' time '11:44:38 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-MasashiUmezawa.12' message '-Added test for newer YAXO' id '9ab6e39f-62a5-c14f-9fdf-d310ee3719d3' date '23 February 2011' time '12:04:06 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-mu.11' message 'Fixed SixxLoadingTestCase>>testReadSixxForPoint for using spaced @ messages' id 'f1843f05-b585-6942-851d-765e59601b9c' date '30 September 2010' time '4:44:07 pm' author 'mu' ancestors ((name 'SIXX-Test-mu.10' message '-Fix underscore assignments' id '0e9a036e-4f45-1245-81de-e66beef3c59f' date '13 June 2010' time '11:19:33 pm' author 'mu' ancestors ((name 'SIXX-Test-jf.9' message 'don''t really on Time class>>#readFrom: in test cases since it does not exist in VAST' id 'c124178e-cbac-48ea-b1fe-d77092d945c5' date '20 November 2009' time '1:40:27 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.8' message 'remove senders of #readStream and use ReadStream on: instead (VAST does not understand #readStream)' id 'eede4ad6-6811-4127-b8fa-83cf7929a178' date '20 November 2009' time '12:45:40 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.7' message 'make sure to include the offset when creating DateAndTime objects because VAST includes timezone support' id '98ccf506-13bf-435a-a3dc-ae993e191aab' date '17 November 2009' time '8:50:05 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.6' message 'another Date-creation fix to work with VAST' id '4650bef5-8de2-4f97-a4eb-67d74bfc100c' date '17 November 2009' time '5:50:09 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.5' message 'creating Dates with #newDay:month:year: is problematic because VAST expects a month name instead of an integer. #fromDays: seems to be consistent in VW, VA, and Squeak/Pharo' id '827af465-f02c-4472-a75b-848b649d209b' date '17 November 2009' time '5:47:14 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.4' message 'VAST has timezone support, so the offset needs to be specified in the DateAndTime test case to ensure a consistent result.' id '5a61a909-54d7-4583-a465-72cf7442f8fc' date '16 November 2009' time '12:01:15 pm' author 'jf' ancestors ((name 'SIXX-Test-mu.3' message '- retrieved missing method' id 'ce2ad935-7b91-6242-b38f-c75baa2a91eb' date '15 November 2009' time '12:28:29 am' author 'mu' ancestors ((name 'SIXX-Test-mu.2' message '- Repackaged from SIXX-mu.146' id '8084480f-5646-d345-831a-0cbccb808377' date '14 November 2009' time '11:00:03 pm' author 'mu' ancestors ((name 'SIXX-Test-mu.1' message 'empty log message' id 'e47210e7-6bac-e144-af73-9d7e1686a996' date '14 November 2009' time '10:28:56 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'SIXX-Test-MU.17' message 'Updated test cases for Squeak 6' id 'f6208c40-8078-eb41-b077-4cfd079cb8f3' date '1 February 2023' time '4:54:37.42694 pm' author 'MU' ancestors ((name 'SIXX-Test-MasashiUmezawa.16' message '- Fixing some tests for compatibility with Pharo 3.0' id '2c2cd6c5-2d7f-bb46-8115-235c6472cae1' date '4 May 2014' time '2:43:24.839576 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-MasashiUmezawa.15' message 'Fixed type on method name (again).' id '6e5ffcec-870b-974a-a2c4-6e5b9d3193db' date '9 July 2012' time '12:01:02.434 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-mu.14' message 'Fixed typo' id 'f075fe81-fbd8-d24d-a26c-bf7f4042f191' date '26 April 2011' time '1:43:25.912 pm' author 'mu' ancestors ((name 'SIXX-Test-MasashiUmezawa.13' message 'Fixed #testReadSixxForStringUsingCDATA for a strict XML parser' id '8f6ab5b7-b455-5e46-9929-86fcf1fc1f75' date '23 February 2011' time '11:44:38 pm' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-MasashiUmezawa.12' message '-Added test for newer YAXO' id '9ab6e39f-62a5-c14f-9fdf-d310ee3719d3' date '23 February 2011' time '12:04:06 am' author 'MasashiUmezawa' ancestors ((name 'SIXX-Test-mu.11' message 'Fixed SixxLoadingTestCase>>testReadSixxForPoint for using spaced @ messages' id 'f1843f05-b585-6942-851d-765e59601b9c' date '30 September 2010' time '4:44:07 pm' author 'mu' ancestors ((name 'SIXX-Test-mu.10' message '-Fix underscore assignments' id '0e9a036e-4f45-1245-81de-e66beef3c59f' date '13 June 2010' time '11:19:33 pm' author 'mu' ancestors ((name 'SIXX-Test-jf.9' message 'don''t really on Time class>>#readFrom: in test cases since it does not exist in VAST' id 'c124178e-cbac-48ea-b1fe-d77092d945c5' date '20 November 2009' time '1:40:27 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.8' message 'remove senders of #readStream and use ReadStream on: instead (VAST does not understand #readStream)' id 'eede4ad6-6811-4127-b8fa-83cf7929a178' date '20 November 2009' time '12:45:40 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.7' message 'make sure to include the offset when creating DateAndTime objects because VAST includes timezone support' id '98ccf506-13bf-435a-a3dc-ae993e191aab' date '17 November 2009' time '8:50:05 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.6' message 'another Date-creation fix to work with VAST' id '4650bef5-8de2-4f97-a4eb-67d74bfc100c' date '17 November 2009' time '5:50:09 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.5' message 'creating Dates with #newDay:month:year: is problematic because VAST expects a month name instead of an integer. #fromDays: seems to be consistent in VW, VA, and Squeak/Pharo' id '827af465-f02c-4472-a75b-848b649d209b' date '17 November 2009' time '5:47:14 pm' author 'jf' ancestors ((name 'SIXX-Test-jf.4' message 'VAST has timezone support, so the offset needs to be specified in the DateAndTime test case to ensure a consistent result.' id '5a61a909-54d7-4583-a465-72cf7442f8fc' date '16 November 2009' time '12:01:15 pm' author 'jf' ancestors ((name 'SIXX-Test-mu.3' message '- retrieved missing method' id 'ce2ad935-7b91-6242-b38f-c75baa2a91eb' date '15 November 2009' time '12:28:29 am' author 'mu' ancestors ((name 'SIXX-Test-mu.2' message '- Repackaged from SIXX-mu.146' id '8084480f-5646-d345-831a-0cbccb808377' date '14 November 2009' time '11:00:03 pm' author 'mu' ancestors ((name 'SIXX-Test-mu.1' message 'empty log message' id 'e47210e7-6bac-e144-af73-9d7e1686a996' date '14 November 2009' time '10:28:56 pm' author 'mu' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file