Commit 3c5ba3fd authored by Abhishek Kumar (SLB)'s avatar Abhishek Kumar (SLB) Committed by David Diederich
Browse files

Merge branch 'fix-junit' into 'master'

Enabling Junit execution for core module

See merge request !322

(cherry picked from commit fd165fde)

62907898 Enabling Junit execution for core module
cd0c262b Fixing JUnit
parent 368bff9e
Pipeline #117600 failed with stages
in 8 seconds
......@@ -160,7 +160,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.2.2</version>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.3</version>
</dependency>
</dependencies>
......@@ -207,7 +217,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0-M7</version>
<configuration>
<includes>
<include>*Test.java</include>
......@@ -217,6 +227,13 @@
<reuseForks>true</reuseForks>
<argLine>@{argLine} -Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>3.0.0-M7</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
......
......@@ -273,7 +273,6 @@ public class SchemaServiceTest {
public void testCreateSchema_SharedSchema()
throws JsonProcessingException, ApplicationException, BadRequestException, NotFoundException {
String dataPartitionId = "common";
String schemaId = "os:wks:well:1.1.1";
SchemaRequest schReqInt = getMockSchemaObject_published_InternalScope();
SchemaRequest schReqPub = getMockSchemaObject_published();
......@@ -297,7 +296,7 @@ public class SchemaServiceTest {
Mockito.when(schemaInfoStore.createSchemaInfo(schReqPub)).thenReturn(schInfoPub);
Mockito.when(schemaStore.getSchema(anyString(), anyString())).thenReturn(schReqPub.getSchema().toString());
Mockito.when(schemaUtil.findSchemaToCompare(schReqPub.getSchemaInfo(), true)).thenReturn(schemaInfoArr);
Mockito.when(schemaUtil.findSchemaToCompare(schReqPub.getSchemaInfo(), false)).thenReturn(schemaInfoArr);
Mockito.when(schemaVersionValidatorFactory.getVersionValidator(Matchers.any(SchemaValidationType.class)))
.thenReturn(mock(VersionValidator.class));
assertEquals(SchemaStatus.PUBLISHED, schemaService.createSchema(schReqPub).getStatus());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment