--- a/javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/applicationregistrator/ApplicationRegistratorTest.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/applicationregistrator/ApplicationRegistratorTest.java	Wed Oct 13 14:23:59 2010 +0300
@@ -374,32 +374,12 @@
 
             appReg.startSession();
             groupName = appReg.getGroupName(uid);
-            if (SifRegistrator.getSifMode() > 0)
-            {
-                // When USIF is in use ApplicationRegistrator should not
-                // have registered anything.
-                assertTrue(
-                    "The group name was not empty, it was " + groupName,
-                    "".equals(groupName));
-            }
-            else
-            {
-                assertTrue(
-                    "The group name was not VeryVeryLongGrou, it was " + groupName,
-                    "VeryVeryLongGrou".equals(groupName));
-            }
+            assertTrue(
+                "The group name was not VeryVeryLongGrou, it was " + groupName,
+                "VeryVeryLongGrou".equals(groupName));
 
             uidInUse = appReg.uidInUse(uid);
-            if (SifRegistrator.getSifMode() > 0)
-            {
-                // When USIF is in use ApplicationRegistrator should not
-                // have registered anything.
-                assertTrue("uidInUse returned true value", false == uidInUse);
-            }
-            else
-            {
-                assertTrue("uidInUse returned false value", true == uidInUse);
-            }
+            assertTrue("uidInUse returned false value", true == uidInUse);
 
             appReg.closeSession();
         }
@@ -602,16 +582,7 @@
                 "".equals(groupName));
 
             uidInUse = appReg.uidInUse(uid);
-            if (SifRegistrator.getSifMode() > 0)
-            {
-                // When USIF is in use ApplicationRegistrator should not
-                // have registered anything.
-                assertTrue("uidInUse returned true value", false == uidInUse);
-            }
-            else
-            {
-                assertTrue("uidInUse returned false value", true == uidInUse);
-            }
+            assertTrue("uidInUse returned false value", true == uidInUse);
 
             appReg.closeSession();
         }
@@ -732,32 +703,12 @@
 
             appReg.startSession();
             groupName = appReg.getGroupName(uid);
-            if (SifRegistrator.getSifMode() > 0)
-            {
-                // When USIF is in use ApplicationRegistrator should not
-                // have registered anything.
-                assertTrue(
-                    "The group name was not empty, it was " + groupName,
-                    "".equals(groupName));
-            }
-            else
-            {
-                assertTrue(
-                    "The group name was not Suite, it was " + groupName,
-                    "Suite".equals(groupName));
-            }
+            assertTrue(
+                "The group name was not Suite, it was " + groupName,
+                "Suite".equals(groupName));
 
             uidInUse = appReg.uidInUse(uid);
-            if (SifRegistrator.getSifMode() > 0)
-            {
-                // When USIF is in use ApplicationRegistrator should not
-                // have registered anything.
-                assertTrue("uidInUse returned true value", false == uidInUse);
-            }
-            else
-            {
-                assertTrue("uidInUse returned false value", true == uidInUse);
-            }
+            assertTrue("uidInUse returned false value", true == uidInUse);
 
             appReg.closeSession();
         }