Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for null in Project.load() #520

Merged
merged 2 commits into from
Jan 4, 2016
Merged

Check for null in Project.load() #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16b451d
Check for null in Project.load
Jan 4, 2016
2e152a3
add load null test
Jan 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
/**
* Constructs a Project object that contains project information loaded from the server.
*
* @return Project object containing the project's metadata
* @return Project object containing the project's metadata or {@code null} if not found
* @throws ResourceManagerException upon failure
*/
public static Project load(ResourceManager resourceManager, String projectId) {
ProjectInfo projectInfo = resourceManager.get(projectId);
return new Project(resourceManager, projectInfo);
return projectInfo != null ? new Project(resourceManager, projectInfo) : null;
}

/**
Expand All @@ -67,7 +67,7 @@ public ResourceManager resourceManager() {
/**
* Returns a Project object with updated project information.
*
* @return Project object containing the project's updated metadata
* @return Project object containing the project's updated metadata or {@code null} if not found
* @throws ResourceManagerException upon failure
*/
public Project reload() {
Expand Down
20 changes: 20 additions & 0 deletions gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;

import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -78,6 +80,24 @@ public void testReload() {
assertEquals(newInfo, newProject.info());
}

@Test
public void testLoadNull() {
expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
replay(resourceManager);
assertNull(Project.load(resourceManager, PROJECT_INFO.projectId()));
}

@Test
public void testReloadDeletedProject() {
expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
replay(resourceManager);
Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
assertNotNull(loadedProject);
Project reloadedProject = loadedProject.reload();
assertNull(reloadedProject);
}

@Test
public void testInfo() {
replay(resourceManager);
Expand Down