D-10596: added testing for Guid datatypes null values and valids values

Author: veplechuc

src/main/java/com/versionone/apiclient/AttributeDefinition.java

@@ -7,6 +7,7 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.lang.NullArgumentException;
+import org.apache.commons.lang.StringUtils;
 import org.w3c.dom.Element;
 
 import com.versionone.DB;
@@ -117,7 +118,7 @@ public Object coerce(Object value) throws V1Exception {
             case Blob:
                 return value;
             case Guid:
-                if (value == null)
+                if (value == null || StringUtils.isEmpty(value.toString()))
                     throw new NullArgumentException("value");
                 return UUID.fromString(new DB.Str(value).getValue());    
 			default:

src/test/java/com/versionone/sdk/unit/tests/ServicesTests.java

@@ -2,8 +2,15 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.sun.jna.platform.win32.Guid.GUID;
 import com.versionone.apiclient.*;
+import com.versionone.apiclient.exceptions.APIException;
+import com.versionone.apiclient.exceptions.ConnectionException;
+import com.versionone.apiclient.exceptions.OidException;
 import com.versionone.apiclient.exceptions.V1Exception;
+import com.versionone.apiclient.filters.FilterTerm;
+
+import org.apache.commons.lang.NullArgumentException;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -14,6 +21,7 @@
 import com.versionone.apiclient.services.QueryResult;
 
 import java.net.MalformedURLException;
+import java.util.UUID;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
@@ -155,4 +163,48 @@ public void TestHasChangedOnAttributeSet() throws Exception {
 		asset.setAttributeValue(nameAttributeDefinition, "Fred");
 		Assert.assertTrue(asset.hasChanged());
 	}
+	
+	@Test
+	public void Asset_with_valid_Guid_Attribute() throws ConnectionException, APIException, OidException {
+		UUID payloadGuid = UUID.fromString("98771fb4-71b8-42ec-be8b-69414daa020e");
+
+		Services subject = new Services(getMeta(), getDataConnector());
+		IAssetType publicationType = getMeta().getAssetType("Publication");
+		IAttributeDefinition payloadAttribute = publicationType.getAttributeDefinition("Payload");
+
+		Query query = new Query(publicationType);
+		query.getSelection().add(payloadAttribute);
+		FilterTerm filter = new FilterTerm(payloadAttribute);
+		filter.equal(payloadGuid);
+		query.setFilter(filter);
+
+		QueryResult result = subject.retrieve(query);
+
+		UUID payloadFromResult = (UUID) result.getAssets()[0].getAttribute(payloadAttribute).getValue();
+
+		Assert.assertEquals(payloadGuid, payloadFromResult);
+	}
+
+	@Test
+	public void Asset_with_null_Guid_Attribute() throws OidException {
+		Services subject = new Services(getMeta(), getDataConnector());
+		Query query = new Query(Oid.fromToken("Publication:12346", getMeta()));
+
+		IAssetType publicationType = getMeta().getAssetType("Publication");
+		IAttributeDefinition payloadAttribute = publicationType
+				.getAttributeDefinition("Payload");
+		query.getSelection().add(payloadAttribute);
+
+		try {
+			subject.retrieve(query);
+		} catch (NullArgumentException ex) {
+			Assert.assertEquals(
+					"value must not be null.",
+					ex.getMessage());
+			return;
+		} catch (Exception ex) {
+			Assert.fail("Expected to raise ApiException, but did not.");
+		}
+	}
+	 
 }

testdata/TestData.xml

@@ -418,6 +418,32 @@
 			  <Asset href="/VersionOne/rest-1.v1/Data/Member/1001" idref="Member:1001" />
 			</Relation>
 		</Response>
+		<Response path="meta.v1/Publication">
+			<AssetType href="/v1.six/meta.v1/Publication" version="16.3.2.207" name="Publication" token="Publication" displayname="AssetType'Publication" abstract="False">
+				<DefaultOrderBy href="/v1.six/meta.v1/Publication/Name" tokenref="Publication.Name"/>
+				<DefaultDisplayBy href="/v1.six/meta.v1/Publication/Name" tokenref="Publication.Name"/>
+				<Name href="/v1.six/meta.v1/Publication/Name" tokenref="Publication.Name"/>
+				<AttributeDefinition name="ID" token="Publication.ID" displayname="AttributeDefinition'ID'Publication" attributetype="Relation" isreadonly="True" isrequired="False" ismultivalue="False" iscanned="True" iscustom="False">
+					<ReciprocalRelation href="/v1.six/meta.v1/Publication/ID" tokenref="Publication.ID"/>
+					<OrderByAttribute href="/v1.six/meta.v1/Publication/ID" tokenref="Publication.ID"/>
+					<DisplayByAttribute href="/v1.six/meta.v1/Publication/Name" tokenref="Publication.Name"/>
+					<RelatedAsset nameref="Publication" href="/v1.six/meta.v1/Publication"/>
+				</AttributeDefinition>
+				<AttributeDefinition href="/v1.six/meta.v1/Publication/Payload" of="/v1.six/meta.v1/Publication" version="16.3.2.207" name="Payload" token="Publication.Payload" displayname="AttributeDefinition'Payload'Publication" attributetype="Guid" isreadonly="False" isrequired="True" ismultivalue="False" iscanned="True" iscustom="False">
+					<OrderByAttribute href="/v1.six/meta.v1/Publication/Payload" tokenref="Publication.Payload"/>
+				</AttributeDefinition>
+			</AssetType>
+		</Response>
+		<Response path="rest-1.v1/Data/Publication?sel=Publication.Payload&amp;where=Publication.Payload='98771fb4-71b8-42ec-be8b-69414daa020e'">
+			<Asset href="/V1Production/rest-1.v1/Publication/12345" id="Publication:12345">
+				<Attribute name="Payload">98771fb4-71b8-42ec-be8b-69414daa020e</Attribute>
+			</Asset>
+		</Response>
+		<Response path="rest-1.v1/Data/Publication/12346/Payload?">
+     		<Asset href="/V1Production/rest-1.v1/Publication/12346" id="Publication:12346">
+       			<Attribute name="Payload"></Attribute>
+     		</Asset>
+   		</Response>
 	</Test>
 	<Test name="V1ConfigurationTester">
 		<Response path="config.v1/TrueOffOff">