Bug fix: referencing '\''zipFilename'\'' caused Value Error

aplteam · May 22, 2019 · 3da45d3 · 3da45d3
1 parent 5c5dcca
commit 3da45d3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/APLSource/SevenZip-21.aplc b/APLSource/SevenZip-21.aplc
@@ -40,13 +40,13 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←(Last⍕⎕THIS)'2.2.4.4' '2019-02-18'
+      r←(Last⍕⎕THIS)'2.2.5.8' '2019-05-22'
     ∇
 
     ∇ History
       :Access Public Shared
-    ⍝ * 2.2.4:
-    ⍝   * :Include APLTreeUtils fixed
+    ⍝ * 2.2.5:
+    ⍝   * The `zipFilename` property caused, wehn referenced, a Value Error due to a typo.
     ⍝\\
     ⍝ For information regarding older versions see <https://github.com/aplteam/SevenZip/releases>
     ∇
@@ -55,7 +55,7 @@
     :Access Public Instance
     ⍝ The name of the archive the instance is dealing with
         ∇ r←get
-          r←refToUtils.FilesAndDirs.(EnforceBackSlash NormalizePath)zipFilename_
+          r←refToUtils.FilesAndDirs.(EnforceBackslash NormalizePath)zipFilename_
         ∇
     :EndProperty
 

diff --git a/APLSource/TestCases-11/Test_0018-1.aplf b/APLSource/TestCases-11/Test_0018-1.aplf
@@ -0,0 +1,22 @@
+ r←Test_0018(stopFlag batchFlag);zipFilename;myZipper;rc;more;⎕TRAP;found;filename
+ ⍝ Check the `zipFilename` property; was once a bug
+ r←∆Failed
+ ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
+
+ zipFilename←∆OutputPath,'zip_001.zip'
+ filename←∆InputPath,'ZIP.DWS'
+
+⍝ Delete any left overs
+ #.FilesAndDirs.DeleteFile zipFilename
+
+⍝ The test
+ myZipper←⎕NEW ##.SevenZip(,⊂zipFilename)
+ rc←myZipper.Add filename
+ →GoToTidyUp 0≠⊃rc
+ →GoToTidyUp zipFilename≢myZipper.zipFilename
+
+ r←∆OK
+
+∆TidyUp:
+ {}#.FilesAndDirs.RmDir ∆TempPath
+ #.FilesAndDirs.DeleteFile zipFilename
diff --git a/publish.config b/publish.config
@@ -1 +1 @@
-<tool name="SevenZip">  <version>2.2.4</version>  <date>2019-02-18</date>  <container>#._SevenZip</container>  <addToBundle>1</addToBundle>  <files></files>  <needs>    <script>APLTreeUtils</script>    <script>Execute</script>    <script>OS</script>    <script>FilesAndDirs</script>    <script>Tester</script>  </needs>  <scriptOnly>1</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>4</buildid></tool>
+<tool name="SevenZip">  <version>2.2.5</version>  <date>2019-05-22</date>  <container>#._SevenZip</container>  <addToBundle>1</addToBundle>  <files></files>  <needs>    <script>APLTreeUtils</script>    <script>Execute</script>    <script>OS</script>    <script>FilesAndDirs</script>    <script>Tester</script>  </needs>  <scriptOnly>1</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>8</buildid></tool>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<tool name="SevenZip"> <version>2.2.4</version> <date>2019-02-18</date> <container>#._SevenZip</container> <addToBundle>1</addToBundle> <files></files> <needs> <script>APLTreeUtils</script> <script>Execute</script> <script>OS</script> <script>FilesAndDirs</script> <script>Tester</script> </needs> <scriptOnly>1</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>4</buildid></tool>
		<tool name="SevenZip"> <version>2.2.5</version> <date>2019-05-22</date> <container>#._SevenZip</container> <addToBundle>1</addToBundle> <files></files> <needs> <script>APLTreeUtils</script> <script>Execute</script> <script>OS</script> <script>FilesAndDirs</script> <script>Tester</script> </needs> <scriptOnly>1</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>8</buildid></tool>
Expand Down