From 0607a6953d627000a7b43d3ea6d8c7f8dd45e897 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 22 May 2012 11:10:09 +0000
Subject: [PATCH] SP-32, BIS-14: Adapt tests to changed exception message
SVN: 25328
---
.../web/server/calculator/RowCalculatorTest.java | 10 ++++++----
.../server/resultset/CachedResultSetManagerTest.java | 7 ++++---
.../client/web/server/util/CustomColumnUtilsTest.java | 4 ++--
.../dynamic_property/DynamicPropertyEvaluatorTest.java | 3 ++-
.../calculator/DynamicPropertyCalculatorTest.java | 4 +++-
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
index 1ca59ae8858..dfb2433f033 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
@@ -224,8 +224,9 @@ public class RowCalculatorTest extends AssertJUnit
fail("EvaluatorException expected");
} catch (EvaluatorException e)
{
- assertEquals("Error evaluating 'minOrDefault([0.0,None,' ',-2,'-3'])': "
- + "TypeError: minOrDefault(): expected 2 args; got 1", e.getMessage());
+ assertEquals(
+ "Error occurred in line 1 of the script when evaluating 'minOrDefault([0.0,None,' ',-2,'-3'])': "
+ + "TypeError: minOrDefault(): expected 2 args; got 1", e.getMessage());
}
calculator = createCalculator(parameters, "minOrDefault([${x},None,' ',-2,'-3'], 38.6)");
@@ -248,8 +249,9 @@ public class RowCalculatorTest extends AssertJUnit
fail("EvaluatorException expected");
} catch (EvaluatorException e)
{
- assertEquals("Error evaluating 'maxOrDefault([0.0,None,' ',-2,'-3'])': "
- + "TypeError: maxOrDefault(): expected 2 args; got 1", e.getMessage());
+ assertEquals(
+ "Error occurred in line 1 of the script when evaluating 'maxOrDefault([0.0,None,' ',-2,'-3'])': "
+ + "TypeError: maxOrDefault(): expected 2 args; got 1", e.getMessage());
}
calculator = createCalculator(parameters, "maxOrDefault([${x},None,' ',-2,'-3'], 38.6)");
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
index b1812274e75..a78d1e33aa9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
@@ -844,9 +844,10 @@ public final class CachedResultSetManagerTest extends AssertJUnit
list = resultSet.getList();
assertEquals(1, list.size());
- assertEquals("0-a0 Error: (Error evaluating 'row.col('blabla')': "
- + "java.lang.IllegalArgumentException: "
- + "java.lang.IllegalArgumentException: Unknown column ID: blabla).",
+ assertEquals(
+ "0-a0 Error: (Error occurred in line 1 of the script when evaluating 'row.col('blabla')': "
+ + "java.lang.IllegalArgumentException: "
+ + "java.lang.IllegalArgumentException: Unknown column ID: blabla).",
render(list.get(0)));
context.assertIsSatisfied();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
index a4ed41e054f..fcd4130092f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
@@ -140,8 +140,8 @@ public class CustomColumnUtilsTest extends AssertJUnit
GridExpressionUtils.evalCustomColumn(dataProvider, customColumn, true);
assertEquals(
- "[Error: (Error evaluating 'junk + 10': NameError: name 'junk' is not defined).]",
- values.toString());
+ "[Error: (Error occurred in line 1 of the script when evaluating 'junk + 10': "
+ + "NameError: name 'junk' is not defined).]", values.toString());
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
index a67f4ba566c..c149d491d88 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
@@ -150,7 +150,8 @@ public class DynamicPropertyEvaluatorTest extends AbstractBOTest
assertEquals(expectedDp1ErrorValue, dp1Error.getValue());
assertEquals(properties.size() + "", dp2.getValue());
final String expectedDp3ErrorValue =
- expectedErrorMessage("Error evaluating '" + s3
+ expectedErrorMessage("Error occurred in line 1 of the script when evaluating '"
+ + s3
+ "': AttributeError: 'ch.systemsx.cisd.openbis.generic.server.business.b'"
+ " object has no attribute 'getCode'");
assertEquals(expectedDp3ErrorValue, dp3Error.getValue());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
index 70d3a8d18c2..c92d78fc213 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
@@ -127,7 +127,9 @@ public class DynamicPropertyCalculatorTest extends AssertJUnit
fail("expected EvaluatorException");
} catch (EvaluatorException e)
{
- final String expectedMsg = "Error evaluating 'calculate()': NameError: name 'calculate' is not defined";
+ final String expectedMsg =
+ "Error occurred in line 1 of the script when evaluating 'calculate()': "
+ + "NameError: name 'calculate' is not defined";
assertEquals("expected exception message: " + expectedMsg, expectedMsg, e.getMessage());
}
}
--
GitLab