From: Bon-Yong Lee <bonyong.lee@samsung.com>
Date: Tue, 19 Nov 2013 01:47:32 +0000 (+0900)
Subject: COMMON: Fix Unit test
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51a3c3d92800c2fd4bbb9527dad0d89fe79fbe8f;p=sdk%2Fide%2Fcommon-eplugin.git

COMMON: Fix Unit test

Convert in-container testing( network ) to out-of-container testing

Change-Id: I5b1590c5db0b7a0d6c6ae4579426055e8e14fce1
Signed-off-by: Bon-Yong Lee <bonyong.lee@samsung.com>
---

diff --git a/org.tizen.common/test/src/org/tizen/common/util/log/GoogleAnalyticAppenderTest.java b/org.tizen.common/test/src/org/tizen/common/util/log/GoogleAnalyticAppenderTest.java
old mode 100644
new mode 100755
index f55adb8..9eea506
--- a/org.tizen.common/test/src/org/tizen/common/util/log/GoogleAnalyticAppenderTest.java
+++ b/org.tizen.common/test/src/org/tizen/common/util/log/GoogleAnalyticAppenderTest.java
@@ -26,14 +26,17 @@
 
 package org.tizen.common.util.log;
 
+import static junit.framework.Assert.assertTrue;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import static junit.framework.Assert.*;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Before;
@@ -47,15 +50,12 @@ import org.tizen.common.util.log.UserLogger.Event;
 import org.tizen.common.util.log.UserLogger.Page;
 import org.tizen.common.util.log.UserLogger.PerformanceInfo;
 
-import static org.powermock.api.mockito.PowerMockito.*;
-
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({GoogleAnalyticAppender.class})
 @PowerMockIgnore(value = {"org.slf4j.*", "org.apache.log4j.*"})
 public class GoogleAnalyticAppenderTest
 {
     private org.slf4j.Logger logger = LoggerFactory.getLogger(this.getClass());
-    private boolean connected = true;
     
     /**
      * Sets up the test
@@ -70,12 +70,9 @@ public class GoogleAnalyticAppenderTest
             con = (HttpURLConnection) u.openConnection();
             con.setDoOutput(true);
             con.getOutputStream();
-        } catch (IOException e) {
-            connected = false;
-        }
-        finally {
+        } finally {
             if(con != null) {
-            con.disconnect();
+                con.disconnect();
             }
         }
     }
@@ -91,22 +88,21 @@ public class GoogleAnalyticAppenderTest
     @Test
     public void test_append() throws Exception
     {
-        if(!connected) {
-            logger.error("Network to the google analytics is not connected");
-            URL mockUrl = mock(URL.class);
-            HttpURLConnection mockCon = mock(HttpURLConnection.class);
-            OutputStream mockOutputStream = mock(OutputStream.class);
-            when(mockCon.getOutputStream()).thenReturn(mockOutputStream);
-            when(mockCon.getResponseCode()).thenReturn(200);
-            when(mockUrl.openConnection()).thenReturn(mockCon);
-            whenNew(URL.class).withArguments(GoogleAnalyticAppender.URL_GOOGLE_ANALYTIC).thenReturn(mockUrl);
-            OutputStreamWriter mockWriter = mock(OutputStreamWriter.class);
-            whenNew(OutputStreamWriter.class).withAnyArguments().thenReturn(mockWriter);
-        }
+        logger.error("Network to the google analytics is not connected");
+        URL mockUrl = mock(URL.class);
+        HttpURLConnection mockCon = mock(HttpURLConnection.class);
+        OutputStream mockOutputStream = mock(OutputStream.class);
+        when(mockCon.getOutputStream()).thenReturn(mockOutputStream);
+        when(mockCon.getResponseCode()).thenReturn(200);
+        when(mockUrl.openConnection()).thenReturn(mockCon);
+        whenNew(URL.class).withArguments(GoogleAnalyticAppender.URL_GOOGLE_ANALYTIC).thenReturn(mockUrl);
+        OutputStreamWriter mockWriter = mock(OutputStreamWriter.class);
+        whenNew(OutputStreamWriter.class).withAnyArguments().thenReturn(mockWriter);
         
         final GoogleAnalyticAppender appender = new GoogleAnalyticAppender(true, true);
         Logger logger = Logger.getLogger(this.getClass());
         LoggingEvent event = new LoggingEvent( null, logger, Level.ERROR, "TI", null );
+        
         appender.append(event);
         assertTrue(appender.rc >= 200 && appender.rc < 300);