[Title]

* InstallManager display test packages on tree optionally.
* tizen-install-manager-test package's attribute changed to test.
* version up to 2.2.46
[Desc.]
[Issue] redmine #10142

Change-Id: I526e0d2d39958aaadde38d0de5597ce4cb4733cb

diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java
index 91f5980..069b390 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java
+++ b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java
@@ -92,10 +92,11 @@ public class Package {
        private static final String ATTRIBUTE_ROOT_META = "root";
        private static final String ATTRIBUTE_EXTRA_META = "extra";
        private static final String ATTRIBUTE_INSTALL_META = "install";
+       private static final String ATTRIBUTE_TEST_META = "test";
        private static final String ATTRIBUTE_MANDATORY = "mandatory";
        private static final String ATTRIBUTE_PARTNER = "partner";
        private static final String ATTRIBUTE_PUBLIC = "public";
-       
+
        //dependency information
        private static final String START_OF_OS_DEPENDENCY = "[";
        
@@ -345,14 +346,14 @@ public class Package {
                        }
                }
                
-               if (!Options.partnerSdk) { // public download case
-                       if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta()) {
+               if (Options.doTest) { // include test packages for SDK testing
+                       if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta() || isTestMeta()) {
                                return true;
                        } else {
                                return false;
                        }
-               } else { // partner download case
-                       if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPartnerMeta()) {
+               } else { // except test packages for normal SDK.
+                       if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta()) {
                                return true;
                        } else {
                                return false;
@@ -428,6 +429,19 @@ public class Package {
        }
        
        /**
+        * @return <code>true</code> if this meta package is a install meta package.
+        */
+       public boolean isTestMeta() {
+               String attributeValue = getAttribute().trim();
+               
+               if (attributeValue.equalsIgnoreCase(ATTRIBUTE_TEST_META)) {
+                       return true;
+               } else {
+                       return false;
+               }
+       }
+       
+       /**
         * @return <code>true</code>, if this package is a mandatory package. This package must install.
         */
        public boolean isMandatory() {

diff --git a/package/changelog b/package/changelog
index 09b278a..0a37ec8 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+*2.2.46
+- InstallManager display test packages on tree optionally.
+- tizen-install-manager-test package's attribute changed to test.
+== Yongsung Kim <yongsung1.kim@samsung.com> 2013-08-05
 *2.2.45
 - Fix bug that '-test' option for installmanager performance test does not work with '-ni' option.
 == Yongsung Kim <yongsung1.kim@samsung.com> 2013-08-05

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 5704e29..57c3c1c 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: install-manager
-Version: 2.2.45
+Version: 2.2.46
 Maintainer: Shihyun Kim<shihyun.kim@samsung.com>, Yongsung Kim<yongsung1.kim@samsung.com>
 
 Package: install-manager
@@ -79,7 +79,7 @@ Description: Test for install-manager
 
 Package: tizen-install-manager-test
 Label: Installmanager Test
-Attribute: root
+Attribute: test
 OS: ubuntu-32
 Build-host-os: ubuntu-32
 Install-dependency: install-manager-test
@@ -87,7 +87,7 @@ Description: Test for install-manager
 
 Package: tizen-install-manager-test
 Label: Installmanager Test
-Attribute: root
+Attribute: test
 OS: ubuntu-64
 Build-host-os: ubuntu-64
 Install-dependency: install-manager-test
@@ -95,7 +95,7 @@ Description: Test for install-manager
 
 Package: tizen-install-manager-test
 Label: Installmanager Test
-Attribute: root
+Attribute: test
 OS: windows-32
 Build-host-os: windows-32
 Install-dependency: install-manager-test
@@ -103,7 +103,7 @@ Description: Test for install-manager
 
 Package: tizen-install-manager-test
 Label: Installmanager Test
-Attribute: root
+Attribute: test
 OS: windows-64
 Build-host-os: windows-32
 Install-dependency: install-manager-test
@@ -111,7 +111,7 @@ Description: Test for install-manager
 
 Package: tizen-install-manager-test
 Label: Installmanager Test
-Attribute: root
+Attribute: test
 OS: macos-64
 Build-host-os: macos-64
 Install-dependency: install-manager-test