From fc34efe12f42d94d2de701cd088529a79a4a0d7f Mon Sep 17 00:00:00 2001
From: Inhong Han <inhong1.han@samsung.com>
Date: Thu, 22 Nov 2018 17:54:41 +0900
Subject: [PATCH] [Nlp][Non-ACR] Fix TCT Fail issue

Change-Id: Ib1e42d01164700b770f1ce6658e38dd9a29ecc3d
(cherry picked from commit 89fdeaf51099499c717eb553ae5ee2d6da773f4b)
---
 .../testcase/TSNamedEntityRecognitionResult.cs     |  8 ++-----
 .../testcase/TSNaturalLanguageProcess.cs           | 28 +++++++---------------
 .../Tizen.Nlp.Tests/testcase/TSPosTagResult.cs     |  8 ++-----
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNamedEntityRecognitionResult.cs b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNamedEntityRecognitionResult.cs
index 1c0b453..3f3cec4 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNamedEntityRecognitionResult.cs
+++ b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNamedEntityRecognitionResult.cs
@@ -32,13 +32,11 @@ namespace Tizen.Nlp.Tests {
     [Description("Tizen.Nlp.NamedEntityRecognitionResult test")]
     public class NamedEntityRecognitionResultTests
     {
-        NaturalLanguageProcess nlp = null;
         bool isNlpSupported = false;
 
         [SetUp]
         public void Init()
         {
-            nlp = new NaturalLanguageProcess();
             LogUtils.Write(LogUtils.DEBUG , LogUtils.TAG , "Preconditions for each TEST");
             Information.TryGetValue("http://tizen.org/feature/nlp", out isNlpSupported);
         }
@@ -86,8 +84,7 @@ namespace Tizen.Nlp.Tests {
             try
             {
                 /* TEST CODE */
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -137,8 +134,7 @@ namespace Tizen.Nlp.Tests {
             try
             {
                 /* TEST CODE */
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
diff --git a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNaturalLanguageProcess.cs b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNaturalLanguageProcess.cs
index 12c9f47..b4d5d4b 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNaturalLanguageProcess.cs
+++ b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSNaturalLanguageProcess.cs
@@ -32,13 +32,11 @@ namespace Tizen.Nlp.Tests {
     [Description("Tizen.Nlp.NaturalLanguageProcess test")]
     public class NaturalLanguageProcessTests
     {
-        NaturalLanguageProcess nlp = null;
         bool isNlpSupported = false;
 
         [SetUp]
         public void Init()
         {
-            nlp = new NaturalLanguageProcess();
             LogUtils.Write(LogUtils.DEBUG , LogUtils.TAG , "Preconditions for each TEST");
             Information.TryGetValue("http://tizen.org/feature/nlp", out isNlpSupported);
         }
@@ -90,8 +88,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -126,8 +123,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -162,8 +158,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -213,9 +208,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -278,8 +271,7 @@ namespace Tizen.Nlp.Tests {
         {
             /* TEST CODE */
             try {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -343,9 +335,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -383,8 +373,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 nlp.Close();
             }
             catch (NotSupportedException)
@@ -409,8 +398,7 @@ namespace Tizen.Nlp.Tests {
             /* TEST CODE */
             try
             {
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 nlp.Dispose();
                 nlp = null;
             }
diff --git a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSPosTagResult.cs b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSPosTagResult.cs
index ecac776..b643955 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSPosTagResult.cs
+++ b/tct-suite-vs/Tizen.Nlp.Tests/testcase/TSPosTagResult.cs
@@ -32,13 +32,11 @@ namespace Tizen.Nlp.Tests {
     [Description("Tizen.Nlp.PosTagResult test")]
     public class PosTagResultTests
     {
-        NaturalLanguageProcess nlp = null;
         bool isNlpSupported = false;
 
         [SetUp]
         public void Init()
         {
-            nlp = new NaturalLanguageProcess();
             LogUtils.Write(LogUtils.DEBUG , LogUtils.TAG , "Preconditions for each TEST");
             Information.TryGetValue("http://tizen.org/feature/nlp", out isNlpSupported);
         }
@@ -86,8 +84,7 @@ namespace Tizen.Nlp.Tests {
             try
             {
                 /* TEST CODE */
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
@@ -137,8 +134,7 @@ namespace Tizen.Nlp.Tests {
             try
             {
                 /* TEST CODE */
-                if (nlp == null)
-                    nlp = new NaturalLanguageProcess();
+                NaturalLanguageProcess nlp = new NaturalLanguageProcess();
                 try
                 {
                     var task = nlp.Connect();
-- 
2.7.4