javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/applicationregistrator/ApplicationRegistratorTest.java
--- a/javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/applicationregistrator/ApplicationRegistratorTest.java Thu Jul 15 18:31:06 2010 +0300
+++ b/javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/applicationregistrator/ApplicationRegistratorTest.java Thu Aug 19 09:48:13 2010 +0300
@@ -374,12 +374,32 @@
appReg.startSession();
groupName = appReg.getGroupName(uid);
- assertTrue(
- "The group name was not VeryVeryLongGrou, it was " + groupName,
- "VeryVeryLongGrou".equals(groupName));
+ 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));
+ }
uidInUse = appReg.uidInUse(uid);
- assertTrue("uidInUse returned false value", true == uidInUse);
+ 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);
+ }
appReg.closeSession();
}
@@ -582,7 +602,16 @@
"".equals(groupName));
uidInUse = appReg.uidInUse(uid);
- assertTrue("uidInUse returned false value", true == uidInUse);
+ 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);
+ }
appReg.closeSession();
}
@@ -703,12 +732,32 @@
appReg.startSession();
groupName = appReg.getGroupName(uid);
- assertTrue(
- "The group name was not Suite, it was " + groupName,
- "Suite".equals(groupName));
+ 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));
+ }
uidInUse = appReg.uidInUse(uid);
- assertTrue("uidInUse returned false value", true == uidInUse);
+ 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);
+ }
appReg.closeSession();
}