From 70ecf4da8c81574f5481b66ccbcaf989eae8ef15 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 9 Jan 2012 07:18:43 +0000
Subject: [PATCH] adapt test because of r24109
SVN: 24127
---
.../systemtest/SetSessionUserTest.java | 8 ++---
.../api/v1/GeneralInformationServiceTest.java | 30 ++++++++++++-------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
index b9a1a311a65..7a3924a4951 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
@@ -70,8 +70,8 @@ public class SetSessionUserTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: None of method roles '[INSTANCE_ADMIN]' "
- + "could be found in roles of user 'observer'.", ex.getMessage());
+ assertEquals("Authorization failure: ERROR: \"None of method roles '[INSTANCE_ADMIN]' "
+ + "could be found in roles of user 'observer'.\".", ex.getMessage());
}
}
@@ -158,8 +158,8 @@ public class SetSessionUserTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: None of method roles '[INSTANCE_ADMIN]' "
- + "could be found in roles of user 'observer'.", ex.getMessage());
+ assertEquals("Authorization failure: ERROR: \"None of method roles '[INSTANCE_ADMIN]' "
+ + "could be found in roles of user 'observer'.\".", ex.getMessage());
}
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
index 7303a50b439..dd17849995d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
@@ -146,7 +146,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -175,7 +176,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -204,7 +206,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -239,7 +242,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -271,7 +275,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -310,7 +315,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -429,7 +435,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -454,7 +461,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -479,7 +487,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
@@ -502,7 +511,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
fail("AuthorizationFailureException expected");
} catch (AuthorizationFailureException ex)
{
- assertEquals("Authorization failure: User 'observer' does not have enough privileges.",
+ assertEquals(
+ "Authorization failure: ERROR: \"User 'observer' does not have enough privileges.\".",
ex.getMessage());
}
}
--
GitLab