aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Eck II2012-11-16 12:47:04 (EST)
committerTim Eck II2012-11-16 12:47:04 (EST)
commitc0d1621b51e45f32b8a71376d841a4502d0febf9 (patch)
tree47cf190b05df56f745b1ab6e323ae945e51d897b
parent01ac4f01c546c6b2e6848aa9dab665fb10545779 (diff)
downloadorg.eclipse.lyo.testsuite-c0d1621b51e45f32b8a71376d841a4502d0febf9.zip
org.eclipse.lyo.testsuite-c0d1621b51e45f32b8a71376d841a4502d0febf9.tar.gz
org.eclipse.lyo.testsuite-c0d1621b51e45f32b8a71376d841a4502d0febf9.tar.bz2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=394202 -Improved test coverage in the rdf/xml/json formats for the asset management spec -Fixed problems in the json tests to more accurately reflect the asset management spec
-rw-r--r--org.eclipse.lyo.testsuite.server/config/rio-asset/json/create.json4
-rw-r--r--org.eclipse.lyo.testsuite.server/config/rio-asset/json/createCategory.json16
-rw-r--r--org.eclipse.lyo.testsuite.server/config/rio-asset/json/createRelationship.json11
-rw-r--r--org.eclipse.lyo.testsuite.server/config/rio-asset/json/update.json4
-rw-r--r--org.eclipse.lyo.testsuite.server/config/rio-asset/setup.properties2
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/CreateAssetJsonTest.java2
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateJsonTests.java22
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateRdfXmlTests.java94
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateXmlTests.java94
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/UsageCaseJsonTests.java6
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/util/OSLCConstants.java9
11 files changed, 236 insertions, 28 deletions
diff --git a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/create.json b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/create.json
index d1a8d54..70f0d38 100644
--- a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/create.json
+++ b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/create.json
@@ -10,9 +10,9 @@
"rdf:type": {
"rdf:resource" : "http://localhost:8080/ram.ws/internal/types/classif/assetTypesSchema.xmi#documentation"
},
- "community":
+ "ram_asset:community":
{
- "resource":"http://localhost:8080/ram.ws/internal/communities/1001"
+ "rdf:resource":"http://localhost:8080/ram.ws/internal/communities/1001"
},
"dcterms:abstract" : "OSLCv2 Creation test case",
"dcterms:title" : "Created Asset"
diff --git a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createCategory.json b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createCategory.json
index dddcd39..ea37701 100644
--- a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createCategory.json
+++ b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createCategory.json
@@ -10,13 +10,17 @@
"rdf:type": {
"rdf:resource" : "http://localhost:8080/ram.ws/internal/types/classif/assetTypesSchema.xmi#documentation"
},
- "oslc_asset:categorization" : {
- "rdf:resource" : "http://localhost:8080/ram.ws/internal/communities/1001"
- },
- "community":
+ "oslc_asset:categorization" : [{
+ "rdf:resource" : "http://localhost:8080/ram.ws/internal/categories/classif/software_development.xmi#open_source"
+ }],
+ "ram_asset:community":
{
- "resource":"http://localhost:8080/ram.ws/internal/communities/1001"
+ "rdf:resource":"http://localhost:8080/ram.ws/internal/communities/1001"
},
"dcterms:abstract" : "OSLCv2 Creation test case",
- "dcterms:title" : "OSLCv2 asset testing"
+ "dcterms:title" : "OSLCv2 asset testing",
+ "dcterms:type":
+ {
+ "rdf:resource":"http://localhost:8080/ram.ws/internal/types/classif/assetTypesSchema.xmi#documentation"
+ }
}
diff --git a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createRelationship.json b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createRelationship.json
index 07ea0f2..0bb58d1 100644
--- a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createRelationship.json
+++ b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/createRelationship.json
@@ -10,16 +10,15 @@
"rdf:type": {
"rdf:resource" : "http://localhost:8080/ram.ws/internal/types/classif/assetTypesSchema.xmi#documentation"
},
- "dcterms:relation" : {
- "rdf:ID" : "relationship1",
- "rdf:resource" : "%s",
+ "dcterms:relation" : [{
+ "rdf:about" : "%s",
"oslc_asset:relationshipType" : {
"rdf:resource" : "http://localhost:8080/ram.ws/internal/relationshipTypes/documentation"
}
- },
- "community":
+ }],
+ "ram_asset:community":
{
- "resource":"http://localhost:8080/ram.ws/internal/communities/1001"
+ "rdf:resource":"http://localhost:8080/ram.ws/internal/communities/1001"
},
"dcterms:abstract" : "OSLCv2 Creation test case",
"dcterms:title" : "OSLCv2 asset testing"
diff --git a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/update.json b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/update.json
index 966ddb0..43f298a 100644
--- a/org.eclipse.lyo.testsuite.server/config/rio-asset/json/update.json
+++ b/org.eclipse.lyo.testsuite.server/config/rio-asset/json/update.json
@@ -10,9 +10,9 @@
"rdf:type": {
"rdf:resource" : "http://localhost:8080/ram.ws/internal/types/classif/assetTypesSchema.xmi#documentation"
},
- "community":
+ "ram_asset:community":
{
- "resource":"http://localhost:8080/ram.ws/internal/communities/1001"
+ "rdf:resource":"http://localhost:8080/ram.ws/internal/communities/1001"
},
"dcterms:abstract" : "OSLCv2 Creation test case",
"dcterms:title" : "Updated Asset"
diff --git a/org.eclipse.lyo.testsuite.server/config/rio-asset/setup.properties b/org.eclipse.lyo.testsuite.server/config/rio-asset/setup.properties
index 06d7564..81dba6a 100644
--- a/org.eclipse.lyo.testsuite.server/config/rio-asset/setup.properties
+++ b/org.eclipse.lyo.testsuite.server/config/rio-asset/setup.properties
@@ -16,7 +16,7 @@ testVersions=http://open-services.net/ns/asset#
#The query parameter that should be used to test equality
queryEqualityProperty=dcterms:title
#The parameter value used with the parameter to test equality (record with this value should exist in the system)
-queryEqualityValue=Customer Care Web Application
+queryEqualityValue="Customer Care Web Application"
#The query parameter that should be used to test equality
queryComparisonProperty=dcterms:modified
#The parameter value used with the parameter to test comparisons (should split the results into two non-empty sets)
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/CreateAssetJsonTest.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/CreateAssetJsonTest.java
index 373e5c8..322e2a7 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/CreateAssetJsonTest.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/CreateAssetJsonTest.java
@@ -46,7 +46,7 @@ public class CreateAssetJsonTest extends CreateAssetBase {
assetUrl = createAsset(readFileFromProperty("createWithCategoryTemplateJsonFile"));
String resp = getAssetAsString();
JSONObject asset = new JSONObject(resp);
- assertTrue("The category was not set", asset.get("oslc_asset:categorization") != null);
+ assertTrue("The category was not set", asset.containsKey("oslc_asset:categorization"));
}
@Test
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateJsonTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateJsonTests.java
index d940ca1..74cb2ec 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateJsonTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateJsonTests.java
@@ -40,12 +40,26 @@ import org.xml.sax.SAXException;
@RunWith(Parameterized.class)
public class GetAndUpdateJsonTests extends GetAndUpdateBase {
+ private JSONObject hasJson;
- public GetAndUpdateJsonTests(String thisUrl) throws IOException {
+ public GetAndUpdateJsonTests(String thisUrl) throws IOException, JSONException {
super(thisUrl, OSLCConstants.CT_JSON, OSLCConstants.CT_JSON);
assetUrl = createAsset(jsonCreateTemplate);
assertTrue("The location of the asset after it was create was not returned", assetUrl != null);
+
+ String resp = getAssetAsString();
+ hasJson = new JSONObject(resp);
+ }
+
+ @Test
+ public void assetHasArtifactFactory() {
+ assertTrue("Artifact Factory was not found", hasJson.has("oslc_asset:artifactFactory"));
+ }
+
+ @Test
+ public void assetHasTitle() {
+ assertTrue("Title was not found", hasJson.has(OSLCConstants.DCTERMS_TITLE));
}
@Test
@@ -82,7 +96,7 @@ public class GetAndUpdateJsonTests extends GetAndUpdateBase {
JSONObject asset = new JSONObject(resp);
JSONObject factory = (JSONObject) asset.get("oslc_asset:artifactFactory");
- String artifactFactory = asset.getString("base") + factory.getString("resource");
+ String artifactFactory = factory.getString("rdf:resource");
assertTrue("There needs to be an artifact factory url",
artifactFactory != null && artifactFactory.length() > 0);
@@ -137,7 +151,7 @@ public class GetAndUpdateJsonTests extends GetAndUpdateBase {
resp = getAssetAsString();
asset = new JSONObject(resp);
- assertTrue("The artifact was not removed", asset.get("oslc_asset:artifact") != null);
+ assertTrue("The artifact was not removed", !asset.containsKey("oslc_asset:artifact"));
}
private String JSONToString(JSONObject jsonObject) throws JSONException {
@@ -153,7 +167,7 @@ public class GetAndUpdateJsonTests extends GetAndUpdateBase {
JSONObject asset = new JSONObject(resp);
// Gets the artifact factory from the asset
JSONObject factory = (JSONObject) asset.get("oslc_asset:artifactFactory");
- String artifactFactory = asset.getString("base") + factory.getString("resource");
+ String artifactFactory = factory.getString("rdf:resource");
assertTrue("There needs to be an artifact factory",
artifactFactory != null && artifactFactory.length() > 0);
return artifactFactory;
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateRdfXmlTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateRdfXmlTests.java
index 1bbfeab..d1f9828 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateRdfXmlTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateRdfXmlTests.java
@@ -46,6 +46,7 @@ import com.hp.hpl.jena.rdf.model.StmtIterator;
@RunWith(Parameterized.class)
public class GetAndUpdateRdfXmlTests extends GetAndUpdateBase {
private String baseUrl;
+ private Model hasModel;
public GetAndUpdateRdfXmlTests(String thisUrl) throws IOException {
super(thisUrl, OSLCConstants.CT_RDF, OSLCConstants.CT_RDF);
@@ -53,9 +54,91 @@ public class GetAndUpdateRdfXmlTests extends GetAndUpdateBase {
assetUrl = createAsset(rdfXmlCreateTemplate);
assertTrue("The location of the asset after it was create was not returned", assetUrl != null);
baseUrl = setupProps.getProperty("baseUrl");
+
+ HttpResponse resp = getAssetResponse();
+
+ hasModel = ModelFactory.createDefaultModel();
+ hasModel.read(resp.getEntity().getContent(), baseUrl);
+ EntityUtils.consume(resp.getEntity());
+ }
+
+ @Test
+ public void assetHasAtMostOneModel() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.ASSET_MODEL_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneSerialNumber() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.ASSET_SERIAL_NUMBER_PROP));
+ }
+
+ @Test
+ public void assetHasArtifactFactory() {
+ assertTrue("Artifact Factory was not found", getPropertyValue(hasModel, OSLCConstants.ASSET_ARTIFACT_FACTORY_PROP) != null);
+ }
+
+ @Test
+ public void assetHasAtMostOneGuid() {
+ assertTrue("Multiple guids returned", isOneOrNone(hasModel, OSLCConstants.ASSET_GUID_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneVersion() {
+ assertTrue("Multiple versions returned", isOneOrNone(hasModel, OSLCConstants.ASSET_VERSION_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneAbstract() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_ABSTRACT_PROP));
}
+
@Test
+ public void assetHasAtMostOneType() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_TYPE_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneState() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.ASSET_STATE_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneManufacturer() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.ASSET_MANUFACTURER_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneIdentifier(){
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_ID_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneDescription() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_DESC_PROP));
+ }
+
+ @Test
+ public void assetHasTitle() {
+ assertTrue("Title was not found", getPropertyValue(hasModel, OSLCConstants.DC_TITLE_PROP) != null);
+ }
+
+ @Test
+ public void assetHasAtMostOneCreatedDate() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_CREATED_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneModifiedDate() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.DC_MODIFIED_PROP));
+ }
+
+ @Test
+ public void assetHasAtMostOneInstanceShape() {
+ assertTrue(isOneOrNone(hasModel, OSLCConstants.INST_SHAPE_PROP));
+ }
+
+ @Test
public void updateAnAssetProperty() throws IOException {
HttpResponse resp = getAssetResponse();
@@ -175,6 +258,17 @@ public class GetAndUpdateRdfXmlTests extends GetAndUpdateBase {
return null;
}
+ /**
+ * Determines if there is at most one of the properties found
+ * @return true is properties count <= 1, else false
+ */
+ private boolean isOneOrNone(Model model, String uri) {
+ Property property = model.getProperty(uri);
+ Selector select = new SimpleSelector(null, property, (RDFNode)null);
+ StmtIterator statements = model.listStatements(select);
+ return statements.toList().size() <= 1;
+ }
+
private void setPropertyValue(Model model, String uri, String newValue) {
Property property = model.getProperty(uri);
Selector select = new SimpleSelector(null, property, (RDFNode)null);
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateXmlTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateXmlTests.java
index 447a3d5..8eebd6f 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateXmlTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/GetAndUpdateXmlTests.java
@@ -45,14 +45,94 @@ import org.xml.sax.SAXException;
@RunWith(Parameterized.class)
public class GetAndUpdateXmlTests extends GetAndUpdateBase {
-
- public GetAndUpdateXmlTests(String thisUrl) throws IOException {
+ private Document hasDocument;
+
+ public GetAndUpdateXmlTests(String thisUrl) throws IOException, ParserConfigurationException, SAXException {
super(thisUrl, OSLCConstants.CT_XML, OSLCConstants.CT_XML);
assetUrl = createAsset(xmlCreateTemplate);
assertTrue("The location of the asset after it was create was not returned", assetUrl != null);
+
+ String resp = getAssetAsString();
+ hasDocument = OSLCUtils.createXMLDocFromResponseBody(resp);
}
-
+
+ @Test
+ public void assetHasAtMostOneModel() {
+ assertTrue(isOneOrNone(hasDocument, "oslc_asset:model"));
+ }
+
+ @Test
+ public void assetHasAtMostOneSerialNumber() {
+ assertTrue(isOneOrNone(hasDocument, "oslc_asset:serialNumber"));
+ }
+
+ @Test
+ public void assetHasArtifactFactory() {
+ assertTrue("Artifact Factory was not found", hasNode(hasDocument, "oslc_asset:artifactFactory"));
+ }
+
+ @Test
+ public void assetHasAtMostOneGuid() {
+ assertTrue("Multiple guids returned", isOneOrNone(hasDocument, "oslc_asset:guid"));
+ }
+
+ @Test
+ public void assetHasAtMostOneVersion() {
+ assertTrue("Multiple versions returned", isOneOrNone(hasDocument, "oslc_asset:version"));
+ }
+
+ @Test
+ public void assetHasAtMostOneAbstract() {
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_ABSTRACT));
+ }
+
+
+ @Test
+ public void assetHasAtMostOneType() {
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_TYPE));
+ }
+
+ @Test
+ public void assetHasAtMostOneState() {
+ assertTrue(isOneOrNone(hasDocument, "oslc_asset:state"));
+ }
+
+ @Test
+ public void assetHasAtMostOneManufacturer() {
+ assertTrue(isOneOrNone(hasDocument, "oslc_asset:manufacturer"));
+ }
+
+ @Test
+ public void assetHasAtMostOneIdentifier(){
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_ID));
+ }
+
+ @Test
+ public void assetHasAtMostOneDescription() {
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_DESC));
+ }
+
+ @Test
+ public void assetHasTitle() {
+ assertTrue("Title was not found", hasNode(hasDocument, OSLCConstants.DCTERMS_TITLE));
+ }
+
+ @Test
+ public void assetHasAtMostOneCreatedDate() {
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_CREATED));
+ }
+
+ @Test
+ public void assetHasAtMostOneModifiedDate() {
+ assertTrue(isOneOrNone(hasDocument, OSLCConstants.DCTERMS_MODIFIED));
+ }
+
+ @Test
+ public void assetHasAtMostOneInstanceShape() {
+ assertTrue(isOneOrNone(hasDocument, "oslc:instanceShape"));
+ }
+
@Test
public void updateAnAssetProperty()
throws IOException, ParseException, ParserConfigurationException, SAXException,
@@ -159,6 +239,14 @@ public class GetAndUpdateXmlTests extends GetAndUpdateBase {
}
}
+ private boolean hasNode(Document document, String tagName){
+ return document.getElementsByTagName(tagName).getLength() == 1;
+ }
+
+ private boolean isOneOrNone(Document document, String tagName) {
+ return document.getElementsByTagName(tagName).getLength() <= 1;
+ }
+
private NodeList getAssetNodeChildren(Document document) throws XPathExpressionException {
String path = "/rdf:RDF/oslc_asset:Asset";
XPath xpath = OSLCUtils.getXPath();
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/UsageCaseJsonTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/UsageCaseJsonTests.java
index 6ea0a4c..4883cf3 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/UsageCaseJsonTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/asset/UsageCaseJsonTests.java
@@ -45,9 +45,11 @@ import org.xml.sax.SAXException;
@RunWith(Parameterized.class)
public class UsageCaseJsonTests extends UsageCaseBase {
private static JSONObject bestAsset = null;
+ private String baseUrl;
public UsageCaseJsonTests(String thisUrl) {
super(thisUrl, OSLCConstants.CT_JSON, OSLCConstants.CT_JSON);
+ baseUrl = setupProps.getProperty("baseUrl");
}
@Test
@@ -61,7 +63,7 @@ public class UsageCaseJsonTests extends UsageCaseBase {
public void retrieveUsageCase() throws JSONException, IOException {
assertTrue("The asset with the highest version couldn't be found", bestAsset != null);
- assetUrl = bestAsset.getString("about");
+ assetUrl = bestAsset.getString("rdf:about");
String asset = getAssetAsString();
assetUrl = null; // This is required so that the asset is not deleted
retrieveArtifact(asset);
@@ -86,7 +88,7 @@ public class UsageCaseJsonTests extends UsageCaseBase {
JSONObject asset = new JSONObject(resp);
// Gets the artifact factory from the asset
JSONObject factory = (JSONObject) asset.get("oslc_asset:artifactFactory");
- String artifactFactory = asset.getString("base") + factory.getString("resource");
+ String artifactFactory = baseUrl + factory.getString("rdf:resource");
assertTrue("There needs to be an artifact factory",
artifactFactory != null && artifactFactory.length() > 0);
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/util/OSLCConstants.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/util/OSLCConstants.java
index 8a9eb14..1d431c3 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/util/OSLCConstants.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/util/OSLCConstants.java
@@ -88,6 +88,7 @@ public interface OSLCConstants {
public static final String RESOURCE_SHAPE_PROP = OSLC_V2 + "resourceShape";
public static final String LABEL_PROP = OSLC_V2 + "label";
public static final String DESCRIPTION_PROP = OSLC_V2 + "Description";
+
// OSLC CM 2.0
public static final String CM_CHANGE_REQUEST_TYPE = OSLC_CM_V2 + "ChangeRequest";
public static final String CM_CLOSE_DATE_PROP = OSLC_CM_V2 + "closeDate";
@@ -106,6 +107,10 @@ public interface OSLCConstants {
public static final String ASSET_ARTIFACT_PROP = OSLC_ASSET_V2 + "artifact";
public static final String ASSET_ARTIFACT_FACTORY_PROP = OSLC_ASSET_V2 + "artifactFactory";
public static final String ASSET_CATEGORIZATION_PROP = OSLC_ASSET_V2 + "categorization";
+ public static final String ASSET_STATE_PROP = OSLC_ASSET_V2 + "state";
+ public static final String ASSET_MANUFACTURER_PROP = OSLC_ASSET_V2 + "manufacturer";
+ public static final String ASSET_MODEL_PROP = OSLC_ASSET_V2 + "model";
+ public static final String ASSET_SERIAL_NUMBER_PROP = OSLC_ASSET_V2 + "serialNumber";
// OSLC QM 2.0
public static final String QM_TEST_PLAN = OSLC_QM_V2 + "testPlan";
@@ -139,7 +144,8 @@ public interface OSLCConstants {
public static final String DC_NAME_PROP = DC + "name";
public static final String DC_CREATED_PROP = DC + "created";
public static final String DC_MODIFIED_PROP = DC + "modified";
- public static final String DC_RELATION_PROP = DC + "relation";
+ public static final String DC_RELATION_PROP = DC + "relation";
+ public static final String DC_ABSTRACT_PROP = DC + "abstract";
// DCTERMSs
public static final String DCTERMS_TITLE = DCTERMS + "title";
@@ -151,5 +157,6 @@ public interface OSLCConstants {
public static final String DCTERMS_CREATED = DCTERMS + "created";
public static final String DCTERMS_MODIFIED = DCTERMS + "modified";
public static final String DCTERMS_RELATION = DCTERMS + "relation";
+ public static final String DCTERMS_ABSTRACT = DCTERMS + "abstract";
}