}
	
	@Test
<<<<<<< HEAD
	public void testGetEntityBundle() throws NameConflictException, JSONObjectAdapterException, ServletException, IOException, NotFoundException, DatastoreException, SynapseException {
		// Create an entity
		Study s = EntityCreator.createNewDataset();
		
		// Get/add/update annotations for this entity
		Annotations a = new Annotations();
		a.setEtag(s.getEtag());
		a.addAnnotation("doubleAnno", new Double(45.0001));
		a.addAnnotation("string", "A string");		
		JSONObjectAdapter adapter0 = new JSONObjectAdapterImpl();
		a.writeToJSONObject(adapter0);
		
		// We want the mock response to return JSON
		StringEntity response = new StringEntity(adapter0.toJSONString());
		when(mockResponse.getEntity()).thenReturn(response);
		synapse.updateAnnotations(s.getId(), a);
		
		// Assemble the bundle
		EntityBundle eb = new EntityBundle();
		eb.setEntity(s);
		eb.setAnnotations(a);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl();
		eb.writeToJSONObject(adapter);
		
		// We want the mock response to return JSON
		StringEntity responseEntity = new StringEntity(adapter.toJSONString());
		when(mockResponse.getEntity()).thenReturn(responseEntity);
		
		// Get the bundle, verify contents
		int mask =  EntityBundle.ENTITY + EntityBundle.ANNOTATIONS;
		EntityBundle eb2 = synapse.getEntityBundle(s.getId(), mask);
		
		Study s2 = (Study) eb2.getEntity();
		assertEquals("Retrieved Entity in bundle does not match original one", s, s2);
		
		Annotations a2 = eb2.getAnnotations();
		assertEquals("Retrieved Annotations in bundle do not match original ones", a, a2);
		
		UserEntityPermissions uep = eb2.getPermissions();
		assertNull("Permissions were not requested, but were returned in bundle", uep);
		
		EntityPath path = eb2.getPath();
		assertNull("Path was not requested, but was returned in bundle", path);
	}
=======
	public void testGetVersionInfo() throws Exception {
		VersionInfo expectedVersion = new VersionInfo();
		expectedVersion.setVersion("versionString");
		String jsonString = EntityFactory.createJSONStringForEntity(expectedVersion);
		StringEntity responseEntity = new StringEntity(jsonString);
		when(mockResponse.getEntity()).thenReturn(responseEntity);
		VersionInfo vi = synapse.getVersionInfo();
		assertNotNull(vi);
		assertEquals(vi, expectedVersion);
	};
>>>>>>> 9b6ca7b6389a1cfef2a22ec818c65dbd485be3d0
}

	}
	
	@Test
	public void testGetEntityBundle() throws NameConflictException, JSONObjectAdapterException, ServletException, IOException, NotFoundException, DatastoreException, SynapseException {
		// Create an entity
		Study s = EntityCreator.createNewDataset();
		
		// Get/add/update annotations for this entity
		Annotations a = new Annotations();
		a.setEtag(s.getEtag());
		a.addAnnotation("doubleAnno", new Double(45.0001));
		a.addAnnotation("string", "A string");		
		JSONObjectAdapter adapter0 = new JSONObjectAdapterImpl();
		a.writeToJSONObject(adapter0);
		
		// We want the mock response to return JSON
		StringEntity response = new StringEntity(adapter0.toJSONString());
		when(mockResponse.getEntity()).thenReturn(response);
		synapse.updateAnnotations(s.getId(), a);
		
		// Assemble the bundle
		EntityBundle eb = new EntityBundle();
		eb.setEntity(s);
		eb.setAnnotations(a);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl();
		eb.writeToJSONObject(adapter);
		
		// We want the mock response to return JSON
		StringEntity responseEntity = new StringEntity(adapter.toJSONString());
		when(mockResponse.getEntity()).thenReturn(responseEntity);
		
		// Get the bundle, verify contents
		int mask =  EntityBundle.ENTITY + EntityBundle.ANNOTATIONS;
		EntityBundle eb2 = synapse.getEntityBundle(s.getId(), mask);
		
		Study s2 = (Study) eb2.getEntity();
		assertEquals("Retrieved Entity in bundle does not match original one", s, s2);
		
		Annotations a2 = eb2.getAnnotations();
		assertEquals("Retrieved Annotations in bundle do not match original ones", a, a2);
		
		UserEntityPermissions uep = eb2.getPermissions();
		assertNull("Permissions were not requested, but were returned in bundle", uep);
		
		EntityPath path = eb2.getPath();
		assertNull("Path was not requested, but was returned in bundle", path);
	}

	@Test
	public void testGetVersionInfo() throws Exception {
		VersionInfo expectedVersion = new VersionInfo();
		expectedVersion.setVersion("versionString");
		String jsonString = EntityFactory.createJSONStringForEntity(expectedVersion);
		StringEntity responseEntity = new StringEntity(jsonString);
		when(mockResponse.getEntity()).thenReturn(responseEntity);
		VersionInfo vi = synapse.getVersionInfo();
		assertNotNull(vi);
		assertEquals(vi, expectedVersion);
	};
}