From ee88a7cfdc8434a2ff439736aa740d6a9fe13111 Mon Sep 17 00:00:00 2001
From: Patrick Hammer <patham9@gmail.com>
Date: Wed, 11 Apr 2018 10:22:39 -0400
Subject: [PATCH] 2 remaining nal8 tests failing
---
nal/test/nal8.1.18.nal | 2 +-
nal/test/nal8.1.19.nal | 2 +-
nal/test/nal8.1.4.nal | 2 +-
nal/test/nal8.2.2.nal | 4 ++--
nal/test/nal8.4.3.nal | 2 +-
nal/test/nal8.4.5.nal | 7 -------
nal/test/nal8.5.4.nal | 6 ++++--
nal/test/nal8.5.5.nal | 8 ++++----
8 files changed, 14 insertions(+), 19 deletions(-)
delete mode 100644 nal/test/nal8.4.5.nal
diff --git a/nal/test/nal8.1.18.nal b/nal/test/nal8.1.18.nal
index a838020b5e..513b829887 100755
--- a/nal/test/nal8.1.18.nal
+++ b/nal/test/nal8.1.18.nal
@@ -2,4 +2,4 @@
<(*,SELF,{t002}) --> hold>. :|:
(&/,<(*,SELF,{t002}) --> hold>,+100,<(*,SELF,{t001}) --> at>,+100,(^open,{SELF},{t001}))!
30
-''outputMustContain('(&/,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001}))! :!0: %1.00;0.73%')
+''outputMustContain('(&/,<(*,SELF,{t001}) --> at>,+100,(^open,{SELF},{t001}))! :!100: %1.00;0.73%')
diff --git a/nal/test/nal8.1.19.nal b/nal/test/nal8.1.19.nal
index 4771288127..bd66b1061e 100755
--- a/nal/test/nal8.1.19.nal
+++ b/nal/test/nal8.1.19.nal
@@ -1,5 +1,5 @@
********** [03 + 28 -> 30]
<(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001}))=/><{t001} --> [opened]>>. %1.00;0.90% {0 : 1}
<(*,SELF,{t002}) --> hold>. :|:
-20
+200
''outputMustContain('<(&/,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001})) =/> <{t001} --> [opened]>>. %1.00;0.43%')
diff --git a/nal/test/nal8.1.4.nal b/nal/test/nal8.1.4.nal
index 309764c5c8..841b9f040f 100755
--- a/nal/test/nal8.1.4.nal
+++ b/nal/test/nal8.1.4.nal
@@ -2,4 +2,4 @@
<(*,{t002},{t003}) --> on>. :|:
(&|,<(*,{t002},#1) --> on>,<(*,#1,SELF) --> at>)!
350
-''outputMustContain('<(*,{t003},SELF) --> at>! :\: %1.00;0.81%')
+''outputMustContain('<(*,{t003},SELF) --> at>! %1.00;0.43%')
diff --git a/nal/test/nal8.2.2.nal b/nal/test/nal8.2.2.nal
index 9b7e8683b9..415722698f 100644
--- a/nal/test/nal8.2.2.nal
+++ b/nal/test/nal8.2.2.nal
@@ -2,5 +2,5 @@
********** [06 + 07 -> 12]
<(&|,<(*,$1,$2) --> on>,<(*,Self,$2) --> at>) =|> <(*,Self,$1) --> reachable>>.
<(*,{t002},{t003}) --> on>. :|:
-8
-''outputMustContain('<<(*,Self,{t003}) --> at> =|> <(*,Self,{t002}) --> reachable>>. :\: %1.00;0.81%')
+80
+''outputMustContain('<<(*,Self,{t003}) --> at> =|> <(*,Self,{t002}) --> reachable>>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.4.3.nal b/nal/test/nal8.4.3.nal
index ec4b6e5880..6f0cd28556 100644
--- a/nal/test/nal8.4.3.nal
+++ b/nal/test/nal8.4.3.nal
@@ -3,4 +3,4 @@
1
<(*,Self,key001) --> hold>. :|:
5
-''outputMustContain('<(*,Self,key001) --> hold>. :!1: %1.00;0.93%%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!1: %1.00;0.93%')
diff --git a/nal/test/nal8.4.5.nal b/nal/test/nal8.4.5.nal
deleted file mode 100644
index 341ce6950a..0000000000
--- a/nal/test/nal8.4.5.nal
+++ /dev/null
@@ -1,7 +0,0 @@
-
-********** [07 + 11 -> 12]:
-(^pick,key001). :\:
-<(*,Self,key001) --> hold>. :|:
-5
-''outputMustContain('<(&/,(^pick,key001),+3) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%')
-'adjusted +2 to +3
\ No newline at end of file
diff --git a/nal/test/nal8.5.4.nal b/nal/test/nal8.5.4.nal
index 3b960de11c..379b12bf5a 100644
--- a/nal/test/nal8.5.4.nal
+++ b/nal/test/nal8.5.4.nal
@@ -1,8 +1,10 @@
********** [07 + 09 -> 11]:
-(^pick,key001). :|: %1.00;0.90%
+<a --> A>. :|:
+10
+(^pick,{SELF},key001). :|: %1.00;0.90%
11
<(*,Self,key001) --> hold>. :|:
16
-''outputMustContain('<(&/,(^pick,key001),+4) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%)
+''outputMustContain('<(&/,<a --> A>,+10,(^pick,{SELF},key001),+11) =/> <(*,Self,key001) --> hold>>. :!21: %1.00;0.42%)
'adjusted +3 to +4 ^
diff --git a/nal/test/nal8.5.5.nal b/nal/test/nal8.5.5.nal
index 25164c9798..b798582404 100644
--- a/nal/test/nal8.5.5.nal
+++ b/nal/test/nal8.5.5.nal
@@ -1,7 +1,7 @@
********** [05 + 11 -> 12]:
-<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81% {0 : 0 : 1}
-11
-<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45% {1 : 1 : 2}
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81%
+1
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%
10
-''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.84%')
+''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :!1: %1.00;0.84%')
--
GitLab