Bug 516441 - Fix SimpleMetaStore junits

eclipse · May 10, 2017 · 53a31df · 53a31df
1 parent 6a7c70e
commit 53a31df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ion.server.core/src/org/eclipse/orion/internal/server/core/metastore/SimpleMetaStore.java b/...ion.server.core/src/org/eclipse/orion/internal/server/core/metastore/SimpleMetaStore.java
@@ -986,6 +986,7 @@ public void updateProject(ProjectInfo projectInfo) throws CoreException {
 				// remove the temporary properties
 				projectInfo.setProperty("newUserId", null);
 				projectInfo.setProperty("newWorkspaceId", null);
+				userId = newUserId;
 			}
 			try {
 				jsonObject.put(SimpleMetaStore.ORION_VERSION, VERSION);

diff --git a/...orion.server.tests/src/org/eclipse/orion/server/tests/metastore/SimpleMetaStoreTests.java b/...orion.server.tests/src/org/eclipse/orion/server/tests/metastore/SimpleMetaStoreTests.java
@@ -703,9 +703,9 @@ public void testCreateSecondWorkspace() throws CoreException {
 		// read the workspace
 		WorkspaceInfo readWorkspaceInfo = metaStore.readWorkspace(workspaceInfo2.getUniqueId());
 		assertNotNull(readWorkspaceInfo);
-		assertEquals(readWorkspaceInfo.getFullName(), workspaceInfo1.getFullName());
-		assertEquals(readWorkspaceInfo.getUniqueId(), workspaceInfo1.getUniqueId());
-		assertEquals(readWorkspaceInfo.getUserId(), workspaceInfo1.getUserId());
+		assertEquals(readWorkspaceInfo.getFullName(), workspaceInfo2.getFullName());
+		assertEquals(readWorkspaceInfo.getUniqueId(), workspaceInfo2.getUniqueId());
+		assertEquals(readWorkspaceInfo.getUserId(), workspaceInfo2.getUserId());
 	}
 
 	@Test
@@ -822,7 +822,7 @@ public void testCreateTwoWorkspacesWithSameName() throws CoreException {
 		UserInfo readUserInfo = metaStore.readUser(userInfo.getUniqueId());
 		assertNotNull(readUserInfo);
 		assertEquals(readUserInfo.getUserName(), userInfo.getUserName());
-		assertEquals(1, readUserInfo.getWorkspaceIds().size());
+		assertEquals(2, readUserInfo.getWorkspaceIds().size());
 		assertTrue(readUserInfo.getWorkspaceIds().contains(workspaceInfo1.getUniqueId()));
 		assertTrue(readUserInfo.getWorkspaceIds().contains(workspaceInfo2.getUniqueId()));
 
@@ -2248,7 +2248,7 @@ public void testReadWorkspace() throws CoreException {
 		UserInfo readUserInfo = metaStore.readUser(userInfo.getUniqueId());
 		assertNotNull(readUserInfo);
 		assertEquals(readUserInfo.getUserName(), userInfo.getUserName());
-		assertEquals(1, readUserInfo.getWorkspaceIds().size());
+		assertEquals(2, readUserInfo.getWorkspaceIds().size());
 		assertTrue(readUserInfo.getWorkspaceIds().contains(workspaceInfo1.getUniqueId()));
 		assertTrue(readUserInfo.getWorkspaceIds().contains(workspaceInfo2.getUniqueId()));