From 4da5e1153f77659b2cfb1a032c19b6665a26432b Mon Sep 17 00:00:00 2001 From: "shihyun.kim" Date: Tue, 5 Nov 2013 17:20:48 +0900 Subject: [PATCH] PERFORMANCE : Add test data Add test data that total time of installing and downloading Change-Id: I489819eaadf8ca506a8f0945c2b19eb2983796e3 Signed-off-by: shihyun.kim --- .../org/tizen/installmanager/core/Performance.java | 64 +++++++--------------- .../installmanager/ui/InstallManagerWindow.java | 6 +- .../installmanager/ui/page/InstallingPage.java | 14 ++++- 3 files changed, 34 insertions(+), 50 deletions(-) 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 --- 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); out.newLine(); out.write("The initialization time\t: " + getInitializeTime() + "sec"); - out.write("(" + getBitPerSecond(sdkPackageSize, getInitializeTime())+ "b/s)"); + out.write("(" + getKBPerSecond(sdkPackageSize, getInitializeTime())+ "kb/s)"); out.newLine(); out.write("The download time\t: " + getDownloadTime() + "sec"); - out.write("(" + getBitPerSecond(sdkPackageSize, getDownloadTime())+ "b/s)"); + out.write("(" + getKBPerSecond(sdkPackageSize, getDownloadTime())+ "kb/s)"); out.newLine(); out.write("The installation time\t: " + getInstallationTime() + "sec"); - out.write("(" + getBitPerSecond(sdkPackageSize, getInstallationTime())+ "b/s)"); + out.write("(" + getKBPerSecond(sdkPackageSize, getInstallationTime())+ "kb/s)"); + out.newLine(); + out.write("The total installation time\t: " + getTotalInstallationTime() + "sec"); + out.write("(" + getKBPerSecond(sdkPackageSize, getTotalInstallationTime())+ "kb/s)"); out.newLine(); out.write("The removal time\t: " + getRemovalTime() + "sec"); - out.write("(" + getBitPerSecond(sdkPackageSize, getRemovalTime())+ "b/s)"); + out.write("(" + getKBPerSecond(sdkPackageSize, getRemovalTime())+ "b/s)"); out.newLine(); out.write("The install-manager start time\t: " + imStartTime); out.newLine(); @@ -166,45 +169,6 @@ public class Performance { } public static void printTestResultXmlFormat() { - //get file name of test result - SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss"); - String testFileName = formatter.format(imStartTime) + ".xml"; - - String testResultFilePath = PathUtil.get(InstallManagerConstants.getInstallManagerTestResultPath(), testFileName); - File testResultFile = new File(testResultFilePath); - - if (!testResultFile.getParentFile().exists()) { - testResultFile.getParentFile().mkdirs(); - } - - BufferedWriter out = null; - try { - out = new BufferedWriter(new FileWriter(testResultFile)); - out.write(getTestSuiteXml("InstallManager performance test", 4, getTotalTime())); - out.newLine(); - out.write(getTestCaseXml("InitTest", "The initialization time", getInitializeTime())); - out.newLine(); - out.write(getTestCaseXml("DownloadTest", "The download time", getDownloadTime())); - out.newLine(); - out.write(getTestCaseXml("InstallTest", "The installation time", getInstallationTime())); - out.newLine(); - out.write(getTestCaseXml("RemoveTest", "The removal time", getRemovalTime())); - out.newLine(); - out.write(""); - } catch (IOException e) { - Log.ExceptionLog(e); - } finally { - if (out != null) { - try { - out.close(); - } catch (IOException e) { - Log.ExceptionLog(e); - } - } - } - } - - public static void printTestResultXmlFormat2() { if (installationStartTime != null) { printInstallTestResultXmlFormat(); } else { @@ -235,6 +199,7 @@ public class Performance { out.newLine(); out.write(getTestCaseXml("InstallTest", "The installation time", getInstallationTime())); out.newLine(); + out.write(getTestCaseXml("TotalInstallationTest", "Total installation time", getTotalInstallationTime())); out.write(""); } catch (IOException e) { Log.ExceptionLog(e); @@ -326,6 +291,15 @@ public class Performance { return interval; } + private static long getTotalInstallationTime() { + if (downloadStartTime == null || installationEndTime == null) { + return 0; + } + + long interval = (installationEndTime.getTime() - downloadStartTime.getTime())/1000; + return interval; + } + private static long getRemovalTime() { if (removalStartTime == null || removalEndTime == null) { return 0; @@ -335,11 +309,11 @@ public class Performance { return interval; } - private static long getBitPerSecond(long size, long seconds) { + private static long getKBPerSecond(long size, long seconds) { if (seconds == 0) { return 0; } else { - return size/seconds; + return (size/1024/seconds); } } } 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 --- 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(); if (Options.doTest) { Performance.printTestResultXmlFormat(); - Performance.printTestResultXmlFormat2(); + Performance.printTestResult(); } System.exit(0); @@ -871,7 +871,7 @@ public class InstallManagerWindow extends ApplicationWindow { Performance.setIMEndTime(); if (Options.doTest) { Performance.printTestResultXmlFormat(); - Performance.printTestResultXmlFormat2(); + Performance.printTestResult(); } System.exit(0); @@ -961,7 +961,7 @@ public class InstallManagerWindow extends ApplicationWindow { if (Options.doTest) { Performance.printTestResultXmlFormat(); - Performance.printTestResultXmlFormat2(); + Performance.printTestResult(); } Log.LogTitle("Installmanager finish"); 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 --- 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() { downloadProgressLabel.setText(downloadProgressWork + "/" + (totalWork)); - downloadFileNameLabel.setText(fileName); + downloadFileNameLabel.setText(getEtcString(fileName)); } }); } @@ -591,7 +591,7 @@ public class InstallingPage extends PageTemplate { public void run() { installProgressLabel.setText(installProgressWork + "/" + (totalWork)); - installFileNameLabel.setText(fileName); + installFileNameLabel.setText(getEtcString(fileName)); } }); } @@ -715,5 +715,15 @@ public class InstallingPage extends PageTemplate { // TODO Auto-generated method stub } + + private String getEtcString(String line) { + String etcString = null; + if (line.length() > MAX_LENGTH) { + etcString = line.substring(0, MAX_LENGTH) + STRING_ETC; + } else { + etcString = line; + } + return etcString; + } } } -- 2.7.4