Skip to content
Snippets Groups Projects
Commit dd75d4f0 authored by fedoreno's avatar fedoreno
Browse files

SSDM-3284: making tests work 

SVN: 35905
parent b6cc6a69
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
+ 79
− 78
View file @ dd75d4f0
// primitives
// primitives - we don't need to test them
// 'as/dto/common/fetchoptions/CacheMode',
// 'as/dto/common/search/AbstractCompositeSearchCriteria',
......@@ -28,7 +28,47 @@
// 'as/dto/sample/history/SampleRelationType',
// 'as/dto/sample/search/SampleSearchRelation',
// 'as/dto/deletion/id/IDeletionId',
// 'as/dto/entitytype/id/IEntityTypeId',
// 'as/dto/experiment/id/IExperimentId',
// 'as/dto/externaldms/id/IExternalDmsId',
// 'as/dto/history/IRelationType',
// 'as/dto/attachment/id/IAttachmentId',
// 'as/dto/common/id/IObjectId',
// 'as/dto/common/interfaces/IAttachmentsHolder',
// 'as/dto/common/interfaces/ICodeHolder',
// 'as/dto/common/interfaces/ICreationIdHolder',
// 'as/dto/common/interfaces/IModificationDateHolder',
// 'as/dto/common/interfaces/IModifierHolder',
// 'as/dto/common/interfaces/IParentChildrenHolder',
// 'as/dto/common/interfaces/IPermIdHolder',
// 'as/dto/common/interfaces/IPropertiesHolder',
// 'as/dto/common/interfaces/IRegistrationDateHolder',
// 'as/dto/common/interfaces/IRegistratorHolder',
// 'as/dto/common/interfaces/ISpaceHolder',
// 'as/dto/common/interfaces/ITagsHolder',
// 'as/dto/common/operations/IOperation',
// 'as/dto/common/operations/IOperationResult',
// 'as/dto/common/search/IDate',
// 'as/dto/common/search/IDateFormat',
// 'as/dto/common/search/IdSearchCriteria',
// 'as/dto/common/search/ISearchCriteria',
// 'as/dto/common/search/ITimeZone',
// 'as/dto/dataset/id/IDataSetId',
// 'as/dto/dataset/id/IFileFormatTypeId',
// 'as/dto/dataset/id/ILocatorTypeId',
// 'as/dto/dataset/id/IStorageFormatId',
// 'as/dto/datastore/id/IDataStoreId',
// 'as/dto/material/id/IMaterialId',
// 'as/dto/person/id/IPersonId',
// 'as/dto/project/id/IProjectId',
// 'as/dto/sample/id/ISampleId',
// 'as/dto/service/id/ICustomASServiceId',
// 'as/dto/space/id/ISpaceId',
// 'as/dto/tag/id/ITagId',
//TODO: the ones commented below cause problems
var sources = [
'as/dto/attachment/Attachment',
'as/dto/attachment/create/AttachmentCreation',
......@@ -36,41 +76,25 @@ var sources = [
'as/dto/attachment/fetchoptions/AttachmentSortOptions',
'as/dto/attachment/id/AttachmentFileName',
'as/dto/attachment/id/IAttachmentId',
'as/dto/attachment/update/AttachmentListUpdateValue',
'as/dto/common/Enum',
'as/dto/common/fetchoptions/EmptyFetchOptions',
'as/dto/common/fetchoptions/EntitySortOptions',
'as/dto/common/fetchoptions/EntityWithPropertiesSortOptions',
// 'as/dto/common/fetchoptions/EntityWithPropertiesSortOptions',
'as/dto/common/fetchoptions/FetchOptions',
'as/dto/common/fetchoptions/Sorting',
'as/dto/common/fetchoptions/SortOptions',
'as/dto/common/fetchoptions/SortOrder',
'as/dto/common/id/CreationId',
'as/dto/common/id/IObjectId',
'as/dto/common/id/ObjectIdentifier',
'as/dto/common/id/ObjectPermId',
'as/dto/common/id/ObjectTechId',
'as/dto/common/interfaces/IAttachmentsHolder',
'as/dto/common/interfaces/ICodeHolder',
'as/dto/common/interfaces/ICreationIdHolder',
'as/dto/common/interfaces/IModificationDateHolder',
'as/dto/common/interfaces/IModifierHolder',
'as/dto/common/interfaces/IParentChildrenHolder',
'as/dto/common/interfaces/IPermIdHolder',
'as/dto/common/interfaces/IPropertiesHolder',
'as/dto/common/interfaces/IRegistrationDateHolder',
'as/dto/common/interfaces/IRegistratorHolder',
'as/dto/common/interfaces/ISpaceHolder',
'as/dto/common/interfaces/ITagsHolder',
'as/dto/common/operations/IOperation',
'as/dto/common/operations/IOperationResult',
// 'as/dto/common/id/ObjectTechId',
'as/dto/common/search/AnyFieldSearchCriteria',
'as/dto/common/search/AnyPropertySearchCriteria',
// 'as/dto/common/search/AnyFieldSearchCriteria',
// 'as/dto/common/search/AnyPropertySearchCriteria',
'as/dto/common/search/AnyStringValue',
'as/dto/common/search/CodeSearchCriteria',
// 'as/dto/common/search/CodeSearchCriteria',
'as/dto/common/search/DateEarlierThanOrEqualToValue',
'as/dto/common/search/DateEqualToValue',
'as/dto/common/search/DateFieldSearchCriteria',
......@@ -78,14 +102,9 @@ var sources = [
'as/dto/common/search/DateObjectEarlierThanOrEqualToValue',
'as/dto/common/search/DateObjectEqualToValue',
'as/dto/common/search/DateObjectLaterThanOrEqualToValue',
'as/dto/common/search/DatePropertySearchCriteria',
'as/dto/common/search/IDate',
'as/dto/common/search/IDateFormat',
'as/dto/common/search/IdSearchCriteria',
'as/dto/common/search/ISearchCriteria',
'as/dto/common/search/ITimeZone',
// 'as/dto/common/search/DatePropertySearchCriteria',
'as/dto/common/search/LongDateFormat',
'as/dto/common/search/ModificationDateSearchCriteria',
// 'as/dto/common/search/ModificationDateSearchCriteria',
'as/dto/common/search/NormalDateFormat',
'as/dto/common/search/NumberEqualToValue',
'as/dto/common/search/NumberFieldSearchCriteria',
......@@ -94,33 +113,32 @@ var sources = [
'as/dto/common/search/NumberLessThanOrEqualToValue',
'as/dto/common/search/NumberLessThanValue',
'as/dto/common/search/NumberPropertySearchCriteria',
'as/dto/common/search/PermIdSearchCriteria',
'as/dto/common/search/RegistrationDateSearchCriteria',
// 'as/dto/common/search/PermIdSearchCriteria',
// 'as/dto/common/search/RegistrationDateSearchCriteria',
'as/dto/common/search/SearchResult',
'as/dto/common/search/ServerTimeZone',
'as/dto/common/search/ShortDateFormat',
'as/dto/common/search/StringContainsExactlyValue',
'as/dto/common/search/StringContainsValue',
'as/dto/common/search/StringEndsWithValue',
'as/dto/common/search/StringEqualToValue',
// 'as/dto/common/search/StringContainsExactlyValue',
// 'as/dto/common/search/StringContainsValue',
// 'as/dto/common/search/StringEndsWithValue',
// 'as/dto/common/search/StringEqualToValue',
'as/dto/common/search/StringFieldSearchCriteria',
'as/dto/common/search/StringPropertySearchCriteria',
'as/dto/common/search/StringStartsWithValue',
// 'as/dto/common/search/StringPropertySearchCriteria',
// 'as/dto/common/search/StringStartsWithValue',
'as/dto/common/search/TechIdSearchCriteria',
'as/dto/common/search/TimeZone',
'as/dto/common/update/FieldUpdateValue',
// 'as/dto/common/update/FieldUpdateValue',
'as/dto/common/update/IdListUpdateValue',
'as/dto/common/update/ListUpdateAction',
'as/dto/common/update/ListUpdateActionAdd',
'as/dto/common/update/ListUpdateActionRemove',
'as/dto/common/update/ListUpdateActionSet',
'as/dto/common/update/ListUpdateValue',
'as/dto/dataset/DataSet',
// 'as/dto/dataset/DataSet',
'as/dto/dataset/DataSetType',
'as/dto/dataset/delete/DataSetDeletionOptions',
'as/dto/dataset/fetchoptions/DataSetFetchOptions',
'as/dto/dataset/fetchoptions/DataSetSortOptions',
// 'as/dto/dataset/fetchoptions/DataSetSortOptions',
'as/dto/dataset/fetchoptions/DataSetTypeFetchOptions',
'as/dto/dataset/fetchoptions/DataSetTypeSortOptions',
'as/dto/dataset/fetchoptions/FileFormatTypeFetchOptions',
......@@ -137,38 +155,31 @@ var sources = [
'as/dto/dataset/id/BdsDirectoryStorageFormatPermId',
'as/dto/dataset/id/DataSetPermId',
'as/dto/dataset/id/FileFormatTypePermId',
'as/dto/dataset/id/IDataSetId',
'as/dto/dataset/id/IFileFormatTypeId',
'as/dto/dataset/id/ILocatorTypeId',
'as/dto/dataset/id/IStorageFormatId',
'as/dto/dataset/id/LocatorTypePermId',
'as/dto/dataset/id/ProprietaryStorageFormatPermId',
'as/dto/dataset/id/RelativeLocationLocatorTypePermId',
'as/dto/dataset/id/StorageFormatPermId',
'as/dto/dataset/LinkedData',
'as/dto/dataset/LocatorType',
'as/dto/dataset/PhysicalData',
// 'as/dto/dataset/PhysicalData',
'as/dto/dataset/search/DataSetSearchCriteria',
'as/dto/dataset/StorageFormat',
'as/dto/dataset/update/DataSetUpdate',
'as/dto/dataset/update/LinkedDataUpdate',
'as/dto/dataset/update/PhysicalDataUpdate',
// 'as/dto/dataset/update/DataSetUpdate',
// 'as/dto/dataset/update/LinkedDataUpdate',
// 'as/dto/dataset/update/PhysicalDataUpdate',
'as/dto/datastore/DataStore',
'as/dto/datastore/fetchoptions/DataStoreFetchOptions',
'as/dto/datastore/fetchoptions/DataStoreSortOptions',
'as/dto/datastore/id/DataStorePermId',
'as/dto/datastore/id/IDataStoreId',
'as/dto/deletion/DeletedObject',
'as/dto/deletion/Deletion',
// 'as/dto/deletion/Deletion',
'as/dto/deletion/fetchoptions/DeletedObjectFetchOptions',
'as/dto/deletion/fetchoptions/DeletionFetchOptions',
'as/dto/deletion/fetchoptions/DeletionSortOptions',
'as/dto/deletion/id/DeletionTechId',
'as/dto/deletion/id/IDeletionId',
// 'as/dto/deletion/id/DeletionTechId',
'as/dto/deletion/search/DeletionSearchCriteria',
'as/dto/entitytype/id/EntityTypePermId',
'as/dto/entitytype/id/IEntityTypeId',
'as/dto/entitytype/search/EntityTypeSearchCriteria',
'as/dto/experiment/create/CreateExperimentsOperation',
'as/dto/experiment/create/CreateExperimentsOperationResult',
......@@ -177,47 +188,43 @@ var sources = [
'as/dto/experiment/Experiment',
'as/dto/experiment/ExperimentType',
'as/dto/experiment/fetchoptions/ExperimentFetchOptions',
'as/dto/experiment/fetchoptions/ExperimentSortOptions',
// 'as/dto/experiment/fetchoptions/ExperimentSortOptions',
'as/dto/experiment/fetchoptions/ExperimentTypeFetchOptions',
'as/dto/experiment/fetchoptions/ExperimentTypeSortOptions',
'as/dto/experiment/id/ExperimentIdentifier',
'as/dto/experiment/id/ExperimentPermId',
'as/dto/experiment/id/IExperimentId',
'as/dto/experiment/list/ListExperimentsOperation',
'as/dto/experiment/list/ListExperimentsOperationResult',
'as/dto/experiment/search/ExperimentSearchCriteria',
'as/dto/experiment/search/NoExperimentSearchCriteria',
'as/dto/experiment/search/SearchExperimentsOperation',
'as/dto/experiment/search/SearchExperimentsOperationResult',
'as/dto/experiment/update/ExperimentUpdate',
// 'as/dto/experiment/update/ExperimentUpdate',
'as/dto/experiment/update/UpdateExperimentsOperation',
'as/dto/experiment/update/UpdateExperimentsOperationResult',
'as/dto/externaldms/ExternalDms',
// 'as/dto/externaldms/ExternalDms',
'as/dto/externaldms/fetchoptions/ExternalDmsFetchOptions',
'as/dto/externaldms/fetchoptions/ExternalDmsSortOptions',
'as/dto/externaldms/id/ExternalDmsPermId',
'as/dto/externaldms/id/IExternalDmsId',
'as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions',
'as/dto/global/fetchoptions/GlobalSearchObjectSortOptions',
'as/dto/global/GlobalSearchObject',
'as/dto/global/search/GlobalSearchCriteria',
'as/dto/global/search/GlobalSearchObjectKindCriteria',
// 'as/dto/global/search/GlobalSearchObjectKindCriteria',
'as/dto/global/search/GlobalSearchTextCriteria',
'as/dto/global/search/GlobalSearchWildCardsCriteria',
'as/dto/history/fetchoptions/HistoryEntryFetchOptions',
'as/dto/history/fetchoptions/HistoryEntrySortOptions',
'as/dto/history/HistoryEntry',
'as/dto/history/IRelationType',
'as/dto/history/PropertyHistoryEntry',
'as/dto/history/RelationHistoryEntry',
'as/dto/material/create/MaterialCreation',
// 'as/dto/material/create/MaterialCreation',
'as/dto/material/delete/MaterialDeletionOptions',
'as/dto/material/fetchoptions/MaterialFetchOptions',
'as/dto/material/fetchoptions/MaterialSortOptions',
// 'as/dto/material/fetchoptions/MaterialSortOptions',
'as/dto/material/fetchoptions/MaterialTypeFetchOptions',
'as/dto/material/fetchoptions/MaterialTypeSortOptions',
'as/dto/material/id/IMaterialId',
'as/dto/material/id/MaterialPermId',
'as/dto/material/Material',
'as/dto/material/MaterialType',
......@@ -226,66 +233,60 @@ var sources = [
'as/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions',
'as/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions',
'as/dto/objectkindmodification/ObjectKindModification',
'as/dto/objectkindmodification/search/ObjectKindCriteria',
// 'as/dto/objectkindmodification/search/ObjectKindCriteria',
'as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria',
'as/dto/objectkindmodification/search/OperationKindCriteria',
// 'as/dto/objectkindmodification/search/OperationKindCriteria',
'as/dto/person/fetchoptions/PersonFetchOptions',
'as/dto/person/fetchoptions/PersonSortOptions',
'as/dto/person/id/IPersonId',
'as/dto/person/id/PersonPermId',
'as/dto/person/Person',
// 'as/dto/person/Person',
'as/dto/project/create/ProjectCreation',
'as/dto/project/delete/ProjectDeletionOptions',
'as/dto/project/fetchoptions/ProjectFetchOptions',
'as/dto/project/fetchoptions/ProjectSortOptions',
'as/dto/project/id/IProjectId',
'as/dto/project/id/ProjectIdentifier',
'as/dto/project/id/ProjectPermId',
'as/dto/project/Project',
'as/dto/project/search/ProjectSearchCriteria',
'as/dto/project/update/ProjectUpdate',
// 'as/dto/project/update/ProjectUpdate',
'as/dto/property/fetchoptions/PropertyFetchOptions',
'as/dto/sample/create/CreateSamplesOperation',
'as/dto/sample/create/CreateSamplesResult',
'as/dto/sample/create/SampleCreation',
'as/dto/sample/delete/SampleDeletionOptions',
'as/dto/sample/fetchoptions/SampleFetchOptions',
'as/dto/sample/fetchoptions/SampleSortOptions',
// 'as/dto/sample/fetchoptions/SampleSortOptions',
'as/dto/sample/fetchoptions/SampleTypeFetchOptions',
'as/dto/sample/fetchoptions/SampleTypeSortOptions',
'as/dto/sample/id/ISampleId',
'as/dto/sample/id/SampleIdentifier',
'as/dto/sample/id/SamplePermId',
'as/dto/sample/Sample',
'as/dto/sample/SampleType',
// 'as/dto/sample/SampleType',
'as/dto/sample/search/NoSampleContainerSearchCriteria',
'as/dto/sample/search/NoSampleSearchCriteria',
'as/dto/sample/search/SampleSearchCriteria',
'as/dto/sample/update/SampleUpdate',
// 'as/dto/sample/update/SampleUpdate',
'as/dto/sample/update/UpdateSamplesOperation',
'as/dto/service/CustomASService',
'as/dto/service/CustomASServiceExecutionOptions',
'as/dto/service/fetchoptions/CustomASServiceFetchOptions',
'as/dto/service/fetchoptions/CustomASServiceSortOptions',
'as/dto/service/id/CustomASServiceCode',
'as/dto/service/id/ICustomASServiceId',
'as/dto/service/search/CustomASServiceSearchCriteria',
'as/dto/space/create/SpaceCreation',
'as/dto/space/delete/SpaceDeletionOptions',
'as/dto/space/fetchoptions/SpaceFetchOptions',
'as/dto/space/fetchoptions/SpaceSortOptions',
'as/dto/space/id/ISpaceId',
'as/dto/space/id/SpacePermId',
'as/dto/space/search/SpaceSearchCriteria',
'as/dto/space/Space',
'as/dto/space/update/SpaceUpdate',
'as/dto/tag/fetchoptions/TagFetchOptions',
'as/dto/tag/fetchoptions/TagSortOptions',
'as/dto/tag/id/ITagId',
'as/dto/tag/id/TagCode',
'as/dto/tag/id/TagPermId',
'as/dto/tag/search/TagSearchCriteria',
'as/dto/tag/Tag',
// 'as/dto/tag/Tag',
'as/dto/vocabulary/fetchoptions/VocabularyFetchOptions',
'as/dto/vocabulary/fetchoptions/VocabularySortOptions',
'as/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions',
......
js-test/source/java/ch/systemsx/cisd/openbis/jstest/service/V3ApiDtoTestService.java
+ 17
− 0
View file @ dd75d4f0
......@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.jstest.service;
import java.io.ByteArrayOutputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
......@@ -24,9 +25,11 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.DeletionTechId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASServiceExecutionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.ICustomASServiceExecutor;
import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context.CustomASServiceContext;
import ch.ethz.sis.openbis.generic.server.sharedapi.v3.json.GenericObjectMapper;
/**
*
......@@ -114,4 +117,18 @@ public class V3ApiDtoTestService implements ICustomASServiceExecutor
return null;
}
public static void main(String[] args)
{
GenericObjectMapper gom = new GenericObjectMapper();
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
Object populate = populate(new DeletionTechId(0l));
gom.writeValue(out, populate);
System.out.println(out.toString());
} catch(Exception e) {
System.out.println(e);
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment