PERFORMANCE : Add test data

Add test data that total time of installing and downloading

Change-Id: I489819eaadf8ca506a8f0945c2b19eb2983796e3
Signed-off-by: shihyun.kim <shihyun.kim@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
index 7100c95..88606b0 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
@@ -124,16 +124,19 @@ public class Performance {
                        out.write("Sdk package size\t: " + sdkPackageSize);\r
                        out.newLine();\r
                        out.write("The initialization time\t: " + getInitializeTime() + "sec");\r
-                       out.write("(" + getBitPerSecond(sdkPackageSize, getInitializeTime())+ "b/s)");\r
+                       out.write("(" + getKBPerSecond(sdkPackageSize, getInitializeTime())+ "kb/s)");\r
                        out.newLine();\r
                        out.write("The download time\t: " + getDownloadTime() + "sec");\r
-                       out.write("(" + getBitPerSecond(sdkPackageSize, getDownloadTime())+ "b/s)");\r
+                       out.write("(" + getKBPerSecond(sdkPackageSize, getDownloadTime())+ "kb/s)");\r
                        out.newLine();\r
                        out.write("The installation time\t: " + getInstallationTime() + "sec");\r
-                       out.write("(" + getBitPerSecond(sdkPackageSize, getInstallationTime())+ "b/s)");\r
+                       out.write("(" + getKBPerSecond(sdkPackageSize, getInstallationTime())+ "kb/s)");\r
+                       out.newLine();\r
+                       out.write("The total installation time\t: " + getTotalInstallationTime() + "sec");\r
+                       out.write("(" + getKBPerSecond(sdkPackageSize, getTotalInstallationTime())+ "kb/s)");\r
                        out.newLine();\r
                        out.write("The removal time\t: " + getRemovalTime() + "sec");\r
-                       out.write("(" + getBitPerSecond(sdkPackageSize, getRemovalTime())+ "b/s)");\r
+                       out.write("(" + getKBPerSecond(sdkPackageSize, getRemovalTime())+ "b/s)");\r
                        out.newLine();\r
                        out.write("The install-manager start time\t: " + imStartTime);\r
                        out.newLine();\r
@@ -166,45 +169,6 @@ public class Performance {
        }\r
        \r
        public static void printTestResultXmlFormat() {\r
-               //get file name of test result\r
-               SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");\r
-               String testFileName = formatter.format(imStartTime) + ".xml";\r
-               \r
-               String testResultFilePath = PathUtil.get(InstallManagerConstants.getInstallManagerTestResultPath(), testFileName);\r
-               File testResultFile = new File(testResultFilePath);\r
-               \r
-               if (!testResultFile.getParentFile().exists()) {\r
-                       testResultFile.getParentFile().mkdirs();\r
-               }\r
-               \r
-               BufferedWriter out = null;\r
-               try {\r
-                       out = new BufferedWriter(new FileWriter(testResultFile));\r
-                       out.write(getTestSuiteXml("InstallManager performance test", 4, getTotalTime()));\r
-                       out.newLine();\r
-                       out.write(getTestCaseXml("InitTest", "The initialization time", getInitializeTime()));\r
-                       out.newLine();\r
-                       out.write(getTestCaseXml("DownloadTest", "The download time", getDownloadTime()));\r
-                       out.newLine();\r
-                       out.write(getTestCaseXml("InstallTest", "The installation time", getInstallationTime()));\r
-                       out.newLine();\r
-                       out.write(getTestCaseXml("RemoveTest", "The removal time", getRemovalTime()));\r
-                       out.newLine();\r
-                       out.write("</testsuite>");\r
-               } catch (IOException e) {\r
-                       Log.ExceptionLog(e);\r
-               } finally {\r
-                       if (out != null) {\r
-                               try {\r
-                                       out.close();\r
-                               } catch (IOException e) {\r
-                                       Log.ExceptionLog(e);\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       \r
-       public static void printTestResultXmlFormat2() {\r
                if (installationStartTime != null) {\r
                        printInstallTestResultXmlFormat();\r
                } else {\r
@@ -235,6 +199,7 @@ public class Performance {
                        out.newLine();\r
                        out.write(getTestCaseXml("InstallTest", "The installation time", getInstallationTime()));\r
                        out.newLine();\r
+                       out.write(getTestCaseXml("TotalInstallationTest", "Total installation time", getTotalInstallationTime()));\r
                        out.write("</testsuite>");\r
                } catch (IOException e) {\r
                        Log.ExceptionLog(e);\r
@@ -326,6 +291,15 @@ public class Performance {
                return interval;\r
        }\r
        \r
+       private static long getTotalInstallationTime() {\r
+               if (downloadStartTime == null || installationEndTime == null) {\r
+                       return 0;\r
+               }\r
+               \r
+               long interval = (installationEndTime.getTime() - downloadStartTime.getTime())/1000;\r
+               return interval;\r
+       }\r
+       \r
        private static long getRemovalTime() {\r
                if (removalStartTime == null || removalEndTime == null) {\r
                        return 0;\r
@@ -335,11 +309,11 @@ public class Performance {
                return interval;\r
        }\r
        \r
-       private static long getBitPerSecond(long size, long seconds) {\r
+       private static long getKBPerSecond(long size, long seconds) {\r
                if (seconds == 0) {\r
                        return 0;\r
                } else {\r
-                       return size/seconds;\r
+                       return (size/1024/seconds);\r
                }\r
        }\r
 }\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
index e4be9c9..8007aa0 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
@@ -855,7 +855,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                                Performance.setIMEndTime();\r
                                if (Options.doTest) {\r
                                        Performance.printTestResultXmlFormat();\r
-                                       Performance.printTestResultXmlFormat2();\r
+                                       Performance.printTestResult();\r
                                }\r
                                \r
                                System.exit(0);\r
@@ -871,7 +871,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                                Performance.setIMEndTime();\r
                                if (Options.doTest) {\r
                                        Performance.printTestResultXmlFormat();\r
-                                       Performance.printTestResultXmlFormat2();\r
+                                       Performance.printTestResult();\r
                                }\r
                                \r
                                System.exit(0);\r
@@ -961,7 +961,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                        \r
                        if (Options.doTest) {\r
                                Performance.printTestResultXmlFormat();\r
-                               Performance.printTestResultXmlFormat2();\r
+                               Performance.printTestResult();\r
                        }\r
                        \r
                        Log.LogTitle("Installmanager finish");\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
index b01b6ed..76394ca 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
@@ -495,7 +495,7 @@ public class InstallingPage extends PageTemplate {
                                public void run() {\r
                                        downloadProgressLabel.setText(downloadProgressWork + "/"\r
                                                        + (totalWork));\r
-                                       downloadFileNameLabel.setText(fileName);\r
+                                       downloadFileNameLabel.setText(getEtcString(fileName));\r
                                }\r
                        });\r
                }\r
@@ -591,7 +591,7 @@ public class InstallingPage extends PageTemplate {
                                public void run() {\r
                                        installProgressLabel.setText(installProgressWork + "/"\r
                                                        + (totalWork));\r
-                                       installFileNameLabel.setText(fileName);\r
+                                       installFileNameLabel.setText(getEtcString(fileName));\r
                                }\r
                        });\r
                }\r
@@ -715,5 +715,15 @@ public class InstallingPage extends PageTemplate {
                        // TODO Auto-generated method stub\r
 \r
                }\r
+               \r
+               private String getEtcString(String line) {\r
+                       String etcString = null;\r
+                       if (line.length() > MAX_LENGTH) {\r
+                               etcString = line.substring(0, MAX_LENGTH) + STRING_ETC;\r
+                       } else {\r
+                               etcString = line;\r
+                       }\r
+                       return etcString;\r
+               }\r
        }\r
 }\r