Bug 516441 - Fix SimpleMetaStore junits

eclipse · May 10, 2017 · b66fc34 · b66fc34
1 parent 53a31df
commit b66fc34
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ver.tests/src/org/eclipse/orion/server/tests/servlets/workspace/WorkspaceServiceTest.java b/...ver.tests/src/org/eclipse/orion/server/tests/servlets/workspace/WorkspaceServiceTest.java
@@ -219,7 +219,8 @@ public void testMoveFolderToProject() throws IOException, SAXException, JSONExce
 		assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
 		String destinationLocation = response.getHeaderField(ProtocolConstants.HEADER_LOCATION);
 		responseObject = new JSONObject(response.getText());
-		String destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_CONTENT_LOCATION);
+		String destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_CONTENT_LOCATION, null);
+		if (destinationContentLocation == null) destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_LOCATION, null);
 
 		//assert the move took effect
 		assertFalse(sourceLocation.equals(destinationLocation));
@@ -422,7 +423,8 @@ public void testCopyFolderToProject() throws IOException, SAXException, JSONExce
 		assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
 		String destinationLocation = response.getHeaderField(ProtocolConstants.HEADER_LOCATION);
 		responseObject = new JSONObject(response.getText());
-		String destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_CONTENT_LOCATION);
+		String destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_CONTENT_LOCATION, null);
+		if (destinationContentLocation == null) destinationContentLocation = responseObject.optString(ProtocolConstants.KEY_LOCATION, null);
 
 		//assert the copy took effect
 		assertFalse(sourceLocation.equals(destinationLocation));