Skip to content
Snippets Groups Projects
Commit 6672b3fd authored by cramakri's avatar cramakri
Browse files

LMS-2137 Improved UI aesthetics of DataSetUploadClient.

SVN: 20418
parent 448a42ac
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ import org.testng.annotations.Test; ...@@ -23,6 +23,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSetType.DataSetTypeInitializer; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSetType.DataSetTypeInitializer;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyType.PropertyTypeInitializer; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyType.PropertyTypeInitializer;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyTypeGroup.PropertyTypeGroupInitializer; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyTypeGroup.PropertyTypeGroupInitializer;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
/** /**
* @author Chandrasekhar Ramakrishnan * @author Chandrasekhar Ramakrishnan
...@@ -41,6 +42,7 @@ public class DataSetTypeTest extends AssertJUnit ...@@ -41,6 +42,7 @@ public class DataSetTypeTest extends AssertJUnit
PropertyTypeGroupInitializer groupInitializer = new PropertyTypeGroupInitializer(); PropertyTypeGroupInitializer groupInitializer = new PropertyTypeGroupInitializer();
PropertyTypeInitializer propTypeInitializer = new PropertyTypeInitializer(); PropertyTypeInitializer propTypeInitializer = new PropertyTypeInitializer();
propTypeInitializer.setDataType(DataTypeCode.VARCHAR);
propTypeInitializer.setCode("PROP1"); propTypeInitializer.setCode("PROP1");
propTypeInitializer.setLabel("Property 1"); propTypeInitializer.setLabel("Property 1");
groupInitializer.addPropertyType(new PropertyType(propTypeInitializer)); groupInitializer.addPropertyType(new PropertyType(propTypeInitializer));
...@@ -70,6 +72,7 @@ public class DataSetTypeTest extends AssertJUnit ...@@ -70,6 +72,7 @@ public class DataSetTypeTest extends AssertJUnit
initializer.setCode(DATA_SET_TYPE_CODE); initializer.setCode(DATA_SET_TYPE_CODE);
PropertyTypeGroupInitializer groupInitializer = new PropertyTypeGroupInitializer(); PropertyTypeGroupInitializer groupInitializer = new PropertyTypeGroupInitializer();
PropertyTypeInitializer propTypeInitializer = new PropertyTypeInitializer(); PropertyTypeInitializer propTypeInitializer = new PropertyTypeInitializer();
propTypeInitializer.setDataType(DataTypeCode.VARCHAR);
propTypeInitializer.setCode("PROP200"); propTypeInitializer.setCode("PROP200");
propTypeInitializer.setLabel("Property 200"); propTypeInitializer.setLabel("Property 200");
groupInitializer.addPropertyType(new PropertyType(propTypeInitializer)); groupInitializer.addPropertyType(new PropertyType(propTypeInitializer));
...@@ -91,6 +94,7 @@ public class DataSetTypeTest extends AssertJUnit ...@@ -91,6 +94,7 @@ public class DataSetTypeTest extends AssertJUnit
initializer.setCode("code-2"); initializer.setCode("code-2");
groupInitializer = new PropertyTypeGroupInitializer(); groupInitializer = new PropertyTypeGroupInitializer();
propTypeInitializer = new PropertyTypeInitializer(); propTypeInitializer = new PropertyTypeInitializer();
propTypeInitializer.setDataType(DataTypeCode.VARCHAR);
propTypeInitializer.setCode("PROP1"); propTypeInitializer.setCode("PROP1");
propTypeInitializer.setLabel("Property 1"); propTypeInitializer.setLabel("Property 1");
groupInitializer.addPropertyType(new PropertyType(propTypeInitializer)); groupInitializer.addPropertyType(new PropertyType(propTypeInitializer));
...@@ -109,7 +113,7 @@ public class DataSetTypeTest extends AssertJUnit ...@@ -109,7 +113,7 @@ public class DataSetTypeTest extends AssertJUnit
{ {
String stringRepresentation = dataSetType.toString(); String stringRepresentation = dataSetType.toString();
assertEquals( assertEquals(
"DataSetType[dataSet-type,[PropertyTypeGroup[<null>,[PropertyType[PROP1,Property 1,<null>], PropertyType[PROP2,Property 2,Property 2 Description]]]]]", "DataSetType[dataSet-type,[PropertyTypeGroup[<null>,[PropertyType[VARCHAR,PROP1,Property 1,<null>,optional], PropertyType[VARCHAR,PROP2,Property 2,Property 2 Description,optional]]]]]",
stringRepresentation); stringRepresentation);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment