From d399e522322dcb9dd67a1670bc2d4bdcceb61f88 Mon Sep 17 00:00:00 2001
From: Jaeyun <jy1210.jung@samsung.com>
Date: Thu, 21 May 2020 14:32:20 +0900
Subject: [PATCH] [Android] fix warning

fix build warning, remove unnecessary code.

Signed-off-by: Jaeyun <jy1210.jung@samsung.com>
---
 .../java/org/nnsuite/nnstreamer/APITestPipeline.java     |  9 ++++-----
 .../java/org/nnsuite/nnstreamer/APITestSingleShot.java   | 16 +++++++---------
 .../main/java/org/nnsuite/nnstreamer/TensorsInfo.java    |  5 +----
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestPipeline.java b/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestPipeline.java
index fed9b56..b17e731 100644
--- a/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestPipeline.java
+++ b/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestPipeline.java
@@ -3,7 +3,6 @@ package org.nnsuite.nnstreamer;
 import android.os.Environment;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.os.Build;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -1427,8 +1426,8 @@ public class APITestPipeline {
         }
 
         if (!android.os.Build.HARDWARE.equals("qcom")) {
-            /** 
-             * Tensorflow model using DSP runtime can only be executed on 
+            /*
+             * Tensorflow model using DSP runtime can only be executed on
              * Snapdragon SoC. Cannot run this test on exynos.
              */
             return;
@@ -1445,8 +1444,8 @@ public class APITestPipeline {
         }
 
         if (!android.os.Build.HARDWARE.equals("qcom")) {
-            /**
-             * Tensorflow model using NPU runtime can only be executed on 
+            /*
+             * Tensorflow model using NPU runtime can only be executed on
              * Snapdragon. Cannot run this test on exynos.
              */
             return;
diff --git a/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestSingleShot.java b/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestSingleShot.java
index e08915b..1f7bbfe 100644
--- a/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestSingleShot.java
+++ b/api/android/api/src/androidTest/java/org/nnsuite/nnstreamer/APITestSingleShot.java
@@ -3,7 +3,6 @@ package org.nnsuite.nnstreamer;
 import android.os.Environment;
 import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.os.Build;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -687,7 +686,7 @@ public class APITestSingleShot {
             fail();
         }
     }
-    
+
     @Test
     public void testSNAPTensorflowCPU() {
         if (!NNStreamer.isAvailable(NNStreamer.NNFWType.SNAP)) {
@@ -706,8 +705,8 @@ public class APITestSingleShot {
         }
 
         if (!android.os.Build.HARDWARE.equals("qcom")) {
-            /** 
-             * Tensorflow model using DSP runtime can only be executed on 
+            /*
+             * Tensorflow model using DSP runtime can only be executed on
              * Snapdragon SoC. Cannot run this test on exynos.
              */
             return;
@@ -724,8 +723,8 @@ public class APITestSingleShot {
         }
 
         if (!android.os.Build.HARDWARE.equals("qcom")) {
-            /**
-             * Tensorflow model using NPU runtime can only be executed on 
+            /*
+             * Tensorflow model using NPU runtime can only be executed on
              * Snapdragon. Cannot run this test on exynos.
              */
             return;
@@ -765,7 +764,7 @@ public class APITestSingleShot {
 
                 /* check output */
                 float expected = i + 3.5f;
-                assertTrue(expected == output.getTensorData(0).getFloat(0));
+                assertEquals(expected, output.getTensorData(0).getFloat(0), 0.0f);
 
                 Thread.sleep(30);
             }
@@ -796,7 +795,7 @@ public class APITestSingleShot {
             for (int i = 0; i < 5; i++) {
                 /* input data */
                 TensorsData input = in.allocate();
-                
+
                 /* invoke */
                 TensorsData output = single.invoke(input);
 
@@ -812,5 +811,4 @@ public class APITestSingleShot {
             fail();
         }
     }
-
 }
diff --git a/api/android/api/src/main/java/org/nnsuite/nnstreamer/TensorsInfo.java b/api/android/api/src/main/java/org/nnsuite/nnstreamer/TensorsInfo.java
index beb263d..44820cb 100644
--- a/api/android/api/src/main/java/org/nnsuite/nnstreamer/TensorsInfo.java
+++ b/api/android/api/src/main/java/org/nnsuite/nnstreamer/TensorsInfo.java
@@ -19,7 +19,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 /**
  * Provides interfaces to handle tensors information.
@@ -54,10 +53,8 @@ public final class TensorsInfo implements AutoCloseable, Cloneable {
     @Override
     public TensorsInfo clone() {
         TensorsInfo cloned = new TensorsInfo();
-        Iterator<TensorInfo> iter = mInfoList.iterator();
 
-        while (iter.hasNext()) {
-            TensorInfo info = iter.next();
+        for (TensorInfo info : mInfoList) {
             cloned.addTensorInfo(info.getName(), info.getType(), info.getDimension());
         }
 
-- 
2.7.4