SRADA-680: Added missing 'flatfeature' configuration in DA tests

Also, fixed:
  * org.tizen.dynamicanalyzer classpath for Eclipse build
  * SettingDataManagerTest to work in CliMode

Change-Id: I623b4ba090f230304b292ee3967142f9bc4511c7

diff --git a/org.tizen.dynamicanalyzer.test/resources/flatfeature b/org.tizen.dynamicanalyzer.test/resources/flatfeature
new file mode 100644 (file)
index 0000000..48a3e5b
--- /dev/null
+++ b/org.tizen.dynamicanalyzer.test/resources/flatfeature
@@ -0,0 +1,18 @@
+101|CPU usage|0|||||||
+102|Core usage|1||Timeline|||||
+103|Core frequency|1||Timeline|||||
+201|System Memory usage|1||Timeline|||||
+202|Process Memory usage|1||Timeline|||||
+203|Memory Allocation|1||Memory|||||3
+301|Disk IO|1||Timeline|||||
+302|File Analysis|1||File|||||2
+401|OpenGL ES analysis|1||OpenGL|||||3
+501|Network IO|1||Timeline|||||
+502|Network Analysis|1||Traffic|||||2
+601|UI Event|1||Timeline|||||
+602|Screenshot|1||Timeline||10|100|10|
+603|UI Hierarchy|1||UI Hierarchy|||||
+701|Thread|1||Thread|||||2
+702|Sync analysis|1||Thread|||||2
+801|Peripheral Status|1||Timeline|||||
+802|Power Estimation|1||Timeline|||||

diff --git a/org.tizen.dynamicanalyzer.test/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/data/SettingDataManagerTest.java b/org.tizen.dynamicanalyzer.test/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/data/SettingDataManagerTest.java
index 91526e1..2c5ab6d 100644 (file)
--- a/org.tizen.dynamicanalyzer.test/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/data/SettingDataManagerTest.java
+++ b/org.tizen.dynamicanalyzer.test/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/data/SettingDataManagerTest.java
@@ -40,6 +40,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.powermock.reflect.Whitebox;
+import org.tizen.dynamicanalyzer.common.Global;
+import org.tizen.dynamicanalyzer.common.UIMode;
 import org.tizen.dynamicanalyzer.nl.ConfigureLabels;
 import org.tizen.dynamicanalyzer.setting.Feature;
 import org.tizen.dynamicanalyzer.setting.FeatureData;
@@ -60,6 +62,7 @@ public class SettingDataManagerTest {
        @BeforeClass
        public static void initSettingData() {
                Logger.init(InternalLogger.DEBUG);
+               Global.setCurrentUIMode(UIMode.CLI);
 
                // read file list
                SettingConstants.SettingFilePath = System.getProperty("user.dir") + "/resources/";

diff --git a/org.tizen.dynamicanalyzer/.classpath b/org.tizen.dynamicanalyzer/.classpath
index 7db15b3..5024f4a 100644 (file)
--- a/org.tizen.dynamicanalyzer/.classpath
+++ b/org.tizen.dynamicanalyzer/.classpath
@@ -11,8 +11,5 @@
        <classpathentry kind="lib" path="lib/protobuf.jar"/>
        <classpathentry kind="lib" path="lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar"/>
        <classpathentry kind="lib" path="lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar"/>
-       <classpathentry kind="lib" path="test/lib/hamcrest-core-1.3.jar"/>
-       <classpathentry kind="lib" path="test/lib/powermock-mockito-1.6.3-full.jar"/>
-       <classpathentry kind="lib" path="test/lib/mockito-all-1.10.19.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>