fix tests

finos · Aug 28, 2023 · ec68e4f · ec68e4f
1 parent c55a339
commit ec68e4f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...ver/src/test/java/org/finos/legend/sdlc/server/gitlab/api/GitLabPatchApiTestResource.java b/...ver/src/test/java/org/finos/legend/sdlc/server/gitlab/api/GitLabPatchApiTestResource.java
@@ -72,10 +72,10 @@ public void runCreatePatchTest() throws LegendSDLCServerException
 
     public void runGetPatchTest() throws LegendSDLCServerException
     {
-        String projectName = "PatchTestProjectOne";
+        String projectName = "PatchTestProjectThree";
         String description = "A test project.";
         String groupId = "org.finos.sdlc.test";
-        String artifactId = "testpatchprojone";
+        String artifactId = "testpatchprojthree";
         List<String> tags = Lists.mutable.with("doe", "moffitt", AbstractGitLabServerApiTest.INTEGRATION_TEST_PROJECT_TAG);
 
         Project createdProject = gitLabProjectApi.createProject(projectName, description, ProjectType.MANAGED, groupId, artifactId, tags);
@@ -94,7 +94,7 @@ public void runGetPatchTest() throws LegendSDLCServerException
         Assert.assertEquals(projectId, patch.getProjectId());
         Assert.assertEquals("0.0.2", patch.getPatchReleaseVersionId().toVersionIdString());
 
-        Patch returnedPatch = gitLabPatchApi.getPatch(projectId, version.getId());
+        Patch returnedPatch = gitLabPatchApi.getPatch(projectId, patch.getPatchReleaseVersionId());
         Assert.assertNotNull(returnedPatch);
         Assert.assertEquals(projectId, returnedPatch.getProjectId());
         Assert.assertEquals("0.0.2", returnedPatch.getPatchReleaseVersionId().toVersionIdString());

diff --git a/...lc-server/src/test/java/org/finos/legend/sdlc/server/inmemory/backend/InMemoryMixins.java b/...lc-server/src/test/java/org/finos/legend/sdlc/server/inmemory/backend/InMemoryMixins.java
@@ -41,7 +41,8 @@ public abstract class Project
             include = JsonTypeInfo.As.PROPERTY,
             property = "jackson-type")
     @JsonSubTypes({
-            @JsonSubTypes.Type(value = InMemoryWorkspace.class, name = "InMemoryWorkspace")})
+            @JsonSubTypes.Type(value = InMemoryWorkspace.class, name = "InMemoryWorkspace"),
+            @JsonSubTypes.Type(value = InMemoryWorkspace.class, name = "InMemoryReview$1")})
     public abstract class Workspace
     {
 

diff --git a/...ver/src/test/java/org/finos/legend/sdlc/server/inmemory/domain/api/InMemoryWorkspace.java b/...ver/src/test/java/org/finos/legend/sdlc/server/inmemory/domain/api/InMemoryWorkspace.java
@@ -31,7 +31,6 @@ public class InMemoryWorkspace implements Workspace
     private String currentRevisionId;
     private String projectId;
     private String workspaceId;
-    private DevelopmentStreamType sourceType;
     private DevelopmentStream source;
 
     @Inject

diff --git a/...sdlc-server/src/test/java/org/finos/legend/sdlc/server/resources/TestPatchesResource.java b/...sdlc-server/src/test/java/org/finos/legend/sdlc/server/resources/TestPatchesResource.java
@@ -46,6 +46,7 @@ public void testGetPatch() throws HttpResponseException
 
         Assert.assertEquals("1.0.1", patch.getPatchReleaseVersionId().toVersionIdString());
     }
+
     @Test
     public void testGetAllPatches() throws HttpResponseException
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,7 @@ public void testGetPatch() throws HttpResponseException @@
             Assert.assertEquals("1.0.1", patch.getPatchReleaseVersionId().toVersionIdString());
         }
         @Test
         public void testGetAllPatches() throws HttpResponseException
         {
@@ Expand Down @@