BIS-226 SP-341 enhance the vocabularies api dropbox test

SVN: 27570

datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/vocabularies-api/vocabularies-api.py

@@ -29,7 +29,7 @@ def process(transaction):
     vocabulary = transaction.getVocabularyForUpdate("TEST_VOCABULARY")
     vocabulary.setDescription("modified description")
     vocabulary.setManagedInternally(True)
-    vocabulary.setInternalNamespace(True)
+    # vocabulary.setInternalNamespace(True) # setting this would make the vocabulary invisible for search
     vocabulary.setChosenFromList(False)
     vocabulary.setUrlTemplate("localuri")
     

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/VocabularyDropboxApiSystemTest.java

@@ -61,27 +61,29 @@ public class VocabularyDropboxApiSystemTest extends SystemTestCase
 
         assertEquals("RAT", property.getVocabularyTerm().getCode());
 
+        Vocabulary vocabulary = openBISService.tryGetVocabulary("TEST_VOCABULARY");
+
+        assertNotNull(vocabulary);
+        assertEquals("modified description", vocabulary.getDescription());
+        assertEquals(true, vocabulary.isManagedInternally());
+        assertEquals(false, vocabulary.isChosenFromList());
+        assertEquals("localuri", vocabulary.getURLTemplate());
+
         assertSampleForVocabularyTermExists(openBISService, "TEST_TERM_A");
         assertSampleForVocabularyTermExists(openBISService, "TEST_TERM_B");
+
         VocabularyTerm term = assertSampleForVocabularyTermExists(openBISService, "NEW_TERM");
 
         assertEquals(new Long(3), term.getOrdinal());
         assertEquals("new description", term.getDescription());
         assertEquals("new label", term.getLabel());
 
-        Vocabulary vocabulary = openBISService.tryGetVocabulary("TEST_VOCABULARY");
-        assertEquals("modified description", vocabulary.getDescription());
-        assertEquals(true, vocabulary.isManagedInternally());
-        assertEquals(true, vocabulary.isInternalNamespace());
-        assertEquals(false, vocabulary.isChosenFromList());
-        assertEquals("localuri", vocabulary.getURLTemplate());
-
         assertEquals(3, vocabulary.getTerms().size());
+
     }
 
     private VocabularyTerm assertSampleForVocabularyTermExists(
-            IEncapsulatedOpenBISService openBISService,
-            String term)
+            IEncapsulatedOpenBISService openBISService, String term)
     {
         Sample sample =
                 openBISService.tryGetSampleWithExperiment(SampleIdentifier.create("VOC", "NORMAL_"