From 88805f406de4b50e2ea223d74b713d0214bf88ec Mon Sep 17 00:00:00 2001
From: Jagan Gottimukkula <jgottimukkula@slb.com>
Date: Fri, 4 Oct 2019 14:40:06 -0700
Subject: [PATCH] fixed few test cases
---
.../osdu/indexer/persistence/ElasticRepositoryDatastore.java | 3 ---
.../org/opengroup/osdu/indexer/logging/AuditLoggerTest.java | 2 --
.../org/opengroup/osdu/indexer/model/ElasticTypeTest.java | 2 --
.../indexer/service/AttributeParsingServiceImplTest.java | 5 +++--
.../osdu/indexer/service/IndexerSchemaServiceTest.java | 2 --
.../java/org/opengroup/osdu/indexer/util/JobStatusTest.java | 5 ++---
6 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java b/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
index 6552a5d56..679026677 100644
--- a/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
+++ b/indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
@@ -72,9 +72,6 @@ public class ElasticRepositoryDatastore implements ElasticRepository {
String host = this.kmsClient.decryptString(encryptedHost);
String portString = this.kmsClient.decryptString(encryptedPort);
String usernameAndPassword = this.kmsClient.decryptString(encryptedConfiguration);
- log.info("HOST:" + host );
- log.info("PORT:" + portString );
- log.info("UP:" + usernameAndPassword );
Preconditions.checkNotNullOrEmpty(host, "host cannot be null");
Preconditions.checkNotNullOrEmpty(portString, "port cannot be null");
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
index 06f2757f1..a33eb04f2 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
@@ -16,7 +16,6 @@ package org.opengroup.osdu.indexer.logging;
import com.google.common.collect.Lists;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -32,7 +31,6 @@ import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@Ignore
@RunWith(SpringRunner.class)
public class AuditLoggerTest {
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
index 6256e1eca..53773ae8e 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/model/ElasticTypeTest.java
@@ -15,12 +15,10 @@
package org.opengroup.osdu.indexer.model;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringRunner;
-@Ignore
@RunWith(SpringRunner.class)
public class ElasticTypeTest {
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
index 8b40af803..86d2bb96b 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
@@ -15,11 +15,11 @@
package org.opengroup.osdu.indexer.service;
import com.google.gson.internal.LinkedTreeMap;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.opengroup.osdu.indexer.util.JobStatus;
import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
import org.opengroup.osdu.indexer.util.parser.NumberParser;
import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
@@ -32,7 +32,6 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
-@Ignore
@RunWith(SpringRunner.class)
public class AttributeParsingServiceImplTest {
@@ -44,6 +43,8 @@ public class AttributeParsingServiceImplTest {
private DateTimeParser dateTimeParser;
@Mock
private JaxRsDpsLog log;
+ @Mock
+ private JobStatus jobStatus;
@InjectMocks
private AttributeParsingServiceImpl sut;
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
index 8f6458f78..b5b190e34 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
@@ -18,7 +18,6 @@ import org.apache.http.HttpStatus;
import org.elasticsearch.client.RestHighLevelClient;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
@@ -46,7 +45,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.when;
-@Ignore
@RunWith(SpringRunner.class)
@PrepareForTest({RestHighLevelClient.class})
public class IndexerSchemaServiceTest {
diff --git a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
index 8fe5868f4..bb572412d 100644
--- a/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
+++ b/indexer-service-root/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
@@ -16,9 +16,9 @@ package org.opengroup.osdu.indexer.util;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.opengroup.osdu.indexer.model.IndexingStatus;
import org.opengroup.osdu.indexer.model.OperationType;
@@ -35,7 +35,6 @@ import java.util.stream.Collectors;
import static org.junit.Assert.*;
-@Ignore
@RunWith(SpringRunner.class)
public class JobStatusTest {
@@ -44,7 +43,7 @@ public class JobStatusTest {
@Mock
private JaxRsDpsLog log;
- @Mock
+ @InjectMocks
private JobStatus sut;
@Test
--
GitLab