BIS-1002: More test fixing

server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabularyTermTest.java

@@ -62,9 +62,9 @@ public class UpdateVocabularyTermTest extends AbstractVocabularyTest
                 { "$PLATE_GEOMETRY", SYSTEM_USER, SYSTEM_USER, true, false, null },
                 { "$PLATE_GEOMETRY", SYSTEM_USER, SYSTEM_USER, false, false, null },
                 { "$PLATE_GEOMETRY", SYSTEM_USER, TEST_USER, true, true,
-                        "Terms created by the system user that belong to internal vocabularies can be managed only by the system user" },
+                        "Internal vocabulary terms can be managed only by the system user." },
                 { "$PLATE_GEOMETRY", SYSTEM_USER, TEST_USER, false, true,
-                        "Terms created by the system user that belong to internal vocabularies can be managed only by the system user" },
+                        "Internal vocabulary terms can be managed only by the system user." },
 
                 { "$PLATE_GEOMETRY", TEST_USER, TEST_USER, true, false, null },
                 { "$PLATE_GEOMETRY", TEST_USER, TEST_USER, false, false, null },

server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBOTest.java

@@ -548,8 +548,8 @@ public final class VocabularyBOTest extends AbstractBOTest
 
         VocabularyTermPE term = new VocabularyTermPE();
         term.setRegistrator(systemUser);
-        term.setManagedInternally(true);
         term.setCode("TEST-TERM");
+        term.setManagedInternally(true);
 
         VocabularyPE vocabulary = new VocabularyPE();
         vocabulary.setManagedInternally(true);
@@ -567,7 +567,7 @@ public final class VocabularyBOTest extends AbstractBOTest
         } catch (UserFailureException ex)
         {
             assertEquals(
-                    "Internal vocabulary terms can be managed only by the system user.",
+                    "Authorization failure: Internal vocabulary terms can be managed only by the system user.",
                     ex.getMessage());
         }
     }