Changeset 06acc69 in tol

Timestamp:

Aug 18, 2015, 10:16:51 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

ed6ba49

Parents:

da4a80a7

Message:

Refs #1868
Se modifica el test de #730 para no verse afectado.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6812 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol_tests/tol/Bugzilla/bug_000730/test.tol (modified) (4 diffs)

tol_tests/tol/Bugzilla/bug_000730/test.tol

@@ -3 +3 @@
 // FILE   : test.tol
 // PURPOSE: test for a resolved bug
+//////////////////////////////////////////////////////////////////////////////
+
+Real InstanceExist(Text class, Text name) {
+  If(ObjectExist("NameBlock", name), IsInstanceOf(Eval(name), class), False)
+};
+
 //////////////////////////////////////////////////////////////////////////////
 
@@ -28 +34 @@
   @CPrincipal ej1 = [[Real _.a = 1]];
 
-  Real ok.1.1 =  ObjectExist("@CPrincipal","ej1");
-  Real ok.1.2 = !ObjectExist("@CDerivada", "ej1");
+  Real ok.1.1 =  InstanceExist("@CPrincipal","ej1");
+  Real ok.1.2 = !InstanceExist("@CDerivada", "ej1");
   
   @CDerivada ej2 = [[Real _.a = 1; Real _.b = 2]];
 
-  Real ok.2.1 = ObjectExist("@CPrincipal","ej2");
-  Real ok.2.2 = ObjectExist("@CDerivada", "ej2");
+  Real ok.2.1 = InstanceExist("@CPrincipal","ej2");
+  Real ok.2.2 = InstanceExist("@CDerivada", "ej2");
    
   @CDerivada CDerivada.New(Real a, Real b) {
@@ -46 +52 @@
   @CDerivada ej3 = { CDerivada.New(Real a = 1; Real b = 2) };
   
-  Real ok.3.1 = ObjectExist("@CPrincipal","ej3");
-  Real ok.3.2 = ObjectExist("@CDerivada", "ej3");
+  Real ok.3.1 = InstanceExist("@CPrincipal","ej3");
+  Real ok.3.2 = InstanceExist("@CDerivada", "ej3");
   
   // Si asignamos una referencia a un objeto de @CPrincipal con una
@@ -56 +62 @@
   // ej4 no posee los métodos propios de @CDerivada
   
-  Real ok.4.1 = ObjectExist("@CPrincipal","ej4");
-  Real ok.4.2 = ObjectExist("@CDerivada","ej4");
+  Real ok.4.1 = InstanceExist("@CPrincipal","ej4");
+  Real ok.4.2 = InstanceExist("@CDerivada","ej4");