diff -r 7cee158cb8cd -r 26b2b12093af javacommons/utils/tsrc/javasrc/com/nokia/mj/impl/rt/SystemPropertyTests.java --- a/javacommons/utils/tsrc/javasrc/com/nokia/mj/impl/rt/SystemPropertyTests.java Wed Sep 15 12:05:25 2010 +0300 +++ b/javacommons/utils/tsrc/javasrc/com/nokia/mj/impl/rt/SystemPropertyTests.java Wed Oct 13 14:23:59 2010 +0300 @@ -19,7 +19,7 @@ package com.nokia.mj.impl.rt; -import com.nokia.mj.impl.rt.test.UnitTestSuiteCreator; +import com.nokia.mj.impl.installer.utils.InstallerMain; import com.nokia.mj.impl.rt.support.JvmInternal; import j2meunit.framework.Test; @@ -30,11 +30,11 @@ /** * SystemProperty unit tests. */ -public class SystemPropertyTests extends TestCase implements UnitTestSuiteCreator +public class SystemPropertyTests extends TestCase implements InstallerMain { // Begin j2meunit test framework setup - public TestSuite createTestSuite(String[] args) + public void installerMain(String[] args) { TestSuite suite = new TestSuite(this.getClass().getName()); @@ -62,7 +62,8 @@ } })); - return suite; + + com.nokia.mj.impl.utils.OmjTestRunner.run(suite); } @@ -117,7 +118,7 @@ res = System.getProperty(testPropertyKey1); assertTrue("Fail3, got: "+ res, testPropertyVal2.equals(res)); - // Set a null value to same system property and check that an + // Set a null value to same system property and check that an // exception is thrown and the value is not changed. try { @@ -145,7 +146,7 @@ res = System.getProperty(testPropertyKey2); assertTrue("Fail7, got: "+ res, testPropertyVal4.equals(res)); - // Set a null value to same user property and check that an + // Set a null value to same user property and check that an // exception is thrown and the value is not changed. try { @@ -158,7 +159,7 @@ res = System.getProperty(testPropertyKey2); assertTrue("Fail8, got: "+ res, testPropertyVal4.equals(res)); - // Set the same system and user property and check that the user property + // Set the same system and user property and check that the user property // doesn't override the system property. JvmInternal.setSystemProperty(testPropertyKey3, testPropertyVal5); JvmInternal.setUserProperty(testPropertyKey3, testPropertyVal6);