[Scummvm-git-logs] scummvm master -> cde26704503d78691001a632311d94adc880dd50

[djsrv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a2e713407c DIRECTOR: LINGO: Eliminate factory2 and macros2 tests
cde2670450 DIRECTOR: LINGO: Remove mWritestring from strings test


Commit: a2e713407c2549218a9d8afd35e1e257718fe34b
    https://github.com/scummvm/scummvm/commit/a2e713407c2549218a9d8afd35e1e257718fe34b
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-28T14:56:35-04:00

Commit Message:
DIRECTOR: LINGO: Eliminate factory2 and macros2 tests

Moved tests to the same files as the definitions.

Changed paths:
  R engines/director/lingo/tests/factory2.lingo
  R engines/director/lingo/tests/macros2.lingo
    engines/director/lingo/tests/factory.lingo
    engines/director/lingo/tests/macros.lingo


diff --git a/engines/director/lingo/tests/factory.lingo b/engines/director/lingo/tests/factory.lingo
index 045f926e50..8728e5f1ef 100644
--- a/engines/director/lingo/tests/factory.lingo
+++ b/engines/director/lingo/tests/factory.lingo
@@ -1,3 +1,11 @@
+AimGun2
+
+aim1(mDispose)
+
+set notAMethod = 0
+scummvmAssertError aim2(notAMethod) -- should error
+aim2("notAMethod") -- should run fallback handler
+
 --
 macro AimGun2
 global aim1
diff --git a/engines/director/lingo/tests/factory2.lingo b/engines/director/lingo/tests/factory2.lingo
deleted file mode 100644
index b5b23aa927..0000000000
--- a/engines/director/lingo/tests/factory2.lingo
+++ /dev/null
@@ -1,8 +0,0 @@
-global aim1
-AimGun2
-
-aim1(mDispose)
-
-set notAMethod = 0
-aim2(notAMethod) -- should error
-aim2("notAMethod") -- should run fallback handler
diff --git a/engines/director/lingo/tests/macros.lingo b/engines/director/lingo/tests/macros.lingo
index 0a6cee714d..6a8c1eac6f 100644
--- a/engines/director/lingo/tests/macros.lingo
+++ b/engines/director/lingo/tests/macros.lingo
@@ -1,3 +1,17 @@
+global x, y
+set y = 8
+shipx
+put x
+zipx
+put x
+put y
+
+test
+test()
+put test
+put test()
+if test then test
+
 --
 macro SHIPX
 global x, y
diff --git a/engines/director/lingo/tests/macros2.lingo b/engines/director/lingo/tests/macros2.lingo
deleted file mode 100644
index 094f37e3c6..0000000000
--- a/engines/director/lingo/tests/macros2.lingo
+++ /dev/null
@@ -1,17 +0,0 @@
-check(2, 3)
-global x, y
-set y = 8
-shipx
-put x
-zipx
-put x
-put y
-check(1, 2, 3)
-check 4, 5, 6
-check 7, 8
-
-test
-test()
-put test
-put test()
-if test then test


Commit: cde26704503d78691001a632311d94adc880dd50
    https://github.com/scummvm/scummvm/commit/cde26704503d78691001a632311d94adc880dd50
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-28T14:57:38-04:00

Commit Message:
DIRECTOR: LINGO: Remove mWritestring from strings test

This XObject is not present, so the test doesn't really make sense.

Changed paths:
    engines/director/lingo/tests/strings.lingo


diff --git a/engines/director/lingo/tests/strings.lingo b/engines/director/lingo/tests/strings.lingo
index dba3c4f434..5b7b0ff62e 100644
--- a/engines/director/lingo/tests/strings.lingo
+++ b/engines/director/lingo/tests/strings.lingo
@@ -22,7 +22,6 @@ if the key = Return then
 end if
 
 when keydown then if the key=return then set the stagecolor to random (256)
-file(mWritestring, return)
 
 put return