From: <ju...@us...> - 2007-02-01 17:24:09
|
Revision: 3857 http://svn.sourceforge.net/smartfrog/?rev=3857&view=rev Author: julgui Date: 2007-02-01 09:24:06 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Tests re-enabled. Modified Paths: -------------- trunk/core/testharness/testcases/org/smartfrog/test/system/examples/SubProcessExampleTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/examples/WorkFlowTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/examples/SubProcessExampleTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/examples/SubProcessExampleTest.java 2007-02-01 14:43:44 UTC (rev 3856) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/examples/SubProcessExampleTest.java 2007-02-01 17:24:06 UTC (rev 3857) @@ -40,102 +40,102 @@ } public void testCaseSubProcessEx01() throws Throwable { -// -// application = deployExpectingSuccess(FILES + -// "subprocessTestHarness.sf", "tcSPE01"); -// assertNotNull(application); -// -// String actualSfClass = (String) application.sfResolveHere("sfClass"); -// assertEquals("org.smartfrog.sfcore.compound.CompoundImpl", actualSfClass); -// -// Prim sys = (Prim) application.sfResolveHere("system"); -// //System.out.println(); -// assertEquals("first", sys.sfDeployedProcessName()); -// -// Prim foo = (Prim) sys.sfResolveHere("foo"); -// assertEquals("test", foo.sfDeployedProcessName()); -// -// Prim bar = (Prim) foo.sfResolveHere("bar"); -// assertEquals("test2", bar.sfDeployedProcessName()); -// Prim traceTest2 = (Prim) bar.sfResolveHere("traceTest2"); -// String actualSfClassTT2 = (String) traceTest2.sfResolveHere("sfClass"); -// assertEquals("org.smartfrog.services.trace.SFTrace", actualSfClassTT2); -// -// Prim demoE = (Prim) bar.sfResolveHere("demoE"); -// int actualdemoE = 0; -// int expecteddemoE = 9; -// actualdemoE = demoE.sfResolve("limit", actualdemoE, true); -// assertEquals(expecteddemoE, actualdemoE); -// -// Prim foobar = (Prim) sys.sfResolveHere("foobar"); -// -// Prim demoF = (Prim) foobar.sfResolveHere("demoF"); -// int actualdemoF = 0; -// int expecteddemoF = 7; -// actualdemoF = demoF.sfResolve("limit", actualdemoE, true); -// assertEquals(expecteddemoF, actualdemoF); -// -// //this does not work with the displayless version :-( -//// Prim displayLOCALHOST = (Prim)foobar.sfResolveHere("displayLOCALHOST"); -//// String actualSfClassDLH = (String)displayLOCALHOST.sfResolveHere("sfClass"); -//// assertEquals("org.smartfrog.services.display.SFDisplay", actualSfClassDLH); -// Prim displayLOCALHOST = (Prim) foobar.sfResolveHere("displayLOCALHOST"); -// String actualSfClassDLH = (String) displayLOCALHOST.sfResolveHere("sfClass"); -// String desiredClass = "org.smartfrog.sfcore.compound.CompoundImpl"; -// System.out.println(" Asserting: " + desiredClass -// + " with " + actualSfClassDLH); -// assertEquals(desiredClass, actualSfClassDLH); -// -// Prim baz = (Prim) sys.sfResolveHere("baz"); -// Prim demoC = (Prim) baz.sfResolveHere("demoC"); -// int actualdemoC = 0; -// int expecteddemoC = 9; -// actualdemoC = demoC.sfResolve("limit", actualdemoC, true); -// assertEquals(expecteddemoC, actualdemoC); -// -// Prim sys_bar = (Prim) sys.sfResolveHere("bar"); -// Prim demoD = (Prim) sys_bar.sfResolveHere("demoD"); -// int actualdemoD = 0; -// int expecteddemoD = 3; -// actualdemoD = demoD.sfResolve("limit", actualdemoD, true); -// assertEquals(expecteddemoD, actualdemoD); + application = deployExpectingSuccess(FILES + + "subprocessTestHarness.sf", "tcSPE01"); + assertNotNull(application); + + String actualSfClass = (String) application.sfResolveHere("sfClass"); + assertEquals("org.smartfrog.sfcore.compound.CompoundImpl", actualSfClass); + + Prim sys = (Prim) application.sfResolveHere("system"); + //System.out.println(); + assertEquals("first", sys.sfDeployedProcessName()); + + Prim foo = (Prim) sys.sfResolveHere("foo"); + assertEquals("test", foo.sfDeployedProcessName()); + + Prim bar = (Prim) foo.sfResolveHere("bar"); + assertEquals("test2", bar.sfDeployedProcessName()); + Prim traceTest2 = (Prim) bar.sfResolveHere("traceTest2"); + String actualSfClassTT2 = (String) traceTest2.sfResolveHere("sfClass"); + assertEquals("org.smartfrog.services.trace.SFTrace", actualSfClassTT2); + + Prim demoE = (Prim) bar.sfResolveHere("demoE"); + int actualdemoE = 0; + int expecteddemoE = 9; + actualdemoE = demoE.sfResolve("limit", actualdemoE, true); + assertEquals(expecteddemoE, actualdemoE); + + Prim foobar = (Prim) sys.sfResolveHere("foobar"); + + Prim demoF = (Prim) foobar.sfResolveHere("demoF"); + int actualdemoF = 0; + int expecteddemoF = 7; + actualdemoF = demoF.sfResolve("limit", actualdemoE, true); + assertEquals(expecteddemoF, actualdemoF); + + //this does not work with the displayless version :-( +// Prim displayLOCALHOST = (Prim)foobar.sfResolveHere("displayLOCALHOST"); +// String actualSfClassDLH = (String)displayLOCALHOST.sfResolveHere("sfClass"); +// assertEquals("org.smartfrog.services.display.SFDisplay", actualSfClassDLH); + Prim displayLOCALHOST = (Prim) foobar.sfResolveHere("displayLOCALHOST"); + String actualSfClassDLH = (String) displayLOCALHOST.sfResolveHere("sfClass"); + String desiredClass = "org.smartfrog.sfcore.compound.CompoundImpl"; + System.out.println(" Asserting: " + desiredClass + + " with " + actualSfClassDLH); + assertEquals(desiredClass, actualSfClassDLH); + + Prim baz = (Prim) sys.sfResolveHere("baz"); + Prim demoC = (Prim) baz.sfResolveHere("demoC"); + int actualdemoC = 0; + int expecteddemoC = 9; + actualdemoC = demoC.sfResolve("limit", actualdemoC, true); + assertEquals(expecteddemoC, actualdemoC); + + Prim sys_bar = (Prim) sys.sfResolveHere("bar"); + Prim demoD = (Prim) sys_bar.sfResolveHere("demoD"); + int actualdemoD = 0; + int expecteddemoD = 3; + actualdemoD = demoD.sfResolve("limit", actualdemoD, true); + assertEquals(expecteddemoD, actualdemoD); + } public void testCaseExampleProcessComponentName02() throws Throwable { -// application = deployExpectingSuccess("org/smartfrog/examples/subprocesses/" + "exampleProcessComponentName.sf", -// "tcExampleProcessComponentName02"); -// assertNotNull(application); -// -// String actualSfClass = (String) application.sfResolveHere("sfClass"); -// assertEquals("org.smartfrog.sfcore.compound.CompoundImpl", actualSfClass); -// -// Prim dos = (Prim) application.sfResolveHere("dos"); -// assertEquals("DOS-VM", dos.sfDeployedProcessName()); -// -// Prim uno = (Prim) application.sfResolveHere("uno"); -// Prim cuatro = (Prim) uno.sfResolveHere("cuatro"); -// assertEquals("CUATRO-VM", cuatro.sfDeployedProcessName()); -// -// Prim tres = (Prim) application.sfResolveHere("tres"); -// assertEquals("rootProcess", tres.sfDeployedProcessName()); -// -// Reference refCUATRO = Reference.fromString("HOST localhost:CUATRO-VM:CUATRO"); -// Prim cuatro2 = (Prim)application.sfResolve(refCUATRO,true); -// System.out.println(" Testing: "+refCUATRO); -// assertEquals(cuatro.sfCompleteName().toString(), cuatro2.sfCompleteName().toString()); -// -// Reference refTRES = Reference.fromString("HOST localhost:rootProcess:TRES"); -// Prim tres2 = (Prim)application.sfResolve(refTRES,true); -// System.out.println(" Testing: "+refTRES); -// assertEquals(tres.sfCompleteName().toString(), tres2.sfCompleteName().toString()); -// -// Reference refDOS = Reference.fromString("HOST localhost:DOS-VM:DOS"); -// Prim dos2 = (Prim)application.sfResolve(refDOS,true); -// System.out.println(" Testing: "+refDOS); -// assertEquals(dos.sfCompleteName().toString(), dos2.sfCompleteName().toString()); + application = deployExpectingSuccess("org/smartfrog/examples/subprocesses/" + "exampleProcessComponentName.sf", + "tcExampleProcessComponentName02"); + assertNotNull(application); + String actualSfClass = (String) application.sfResolveHere("sfClass"); + assertEquals("org.smartfrog.sfcore.compound.CompoundImpl", actualSfClass); + Prim dos = (Prim) application.sfResolveHere("dos"); + assertEquals("DOS-VM", dos.sfDeployedProcessName()); + + Prim uno = (Prim) application.sfResolveHere("uno"); + Prim cuatro = (Prim) uno.sfResolveHere("cuatro"); + assertEquals("CUATRO-VM", cuatro.sfDeployedProcessName()); + + Prim tres = (Prim) application.sfResolveHere("tres"); + assertEquals("rootProcess", tres.sfDeployedProcessName()); + + Reference refCUATRO = Reference.fromString("HOST localhost:CUATRO-VM:CUATRO"); + Prim cuatro2 = (Prim)application.sfResolve(refCUATRO,true); + System.out.println(" Testing: "+refCUATRO); + assertEquals(cuatro.sfCompleteName().toString(), cuatro2.sfCompleteName().toString()); + + Reference refTRES = Reference.fromString("HOST localhost:rootProcess:TRES"); + Prim tres2 = (Prim)application.sfResolve(refTRES,true); + System.out.println(" Testing: "+refTRES); + assertEquals(tres.sfCompleteName().toString(), tres2.sfCompleteName().toString()); + + Reference refDOS = Reference.fromString("HOST localhost:DOS-VM:DOS"); + Prim dos2 = (Prim)application.sfResolve(refDOS,true); + System.out.println(" Testing: "+refDOS); + assertEquals(dos.sfCompleteName().toString(), dos2.sfCompleteName().toString()); + + } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/examples/WorkFlowTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/examples/WorkFlowTest.java 2007-02-01 14:43:44 UTC (rev 3856) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/examples/WorkFlowTest.java 2007-02-01 17:24:06 UTC (rev 3857) @@ -39,7 +39,7 @@ } public void testCaseTCP27() throws Throwable { - /* + application = deployExpectingSuccess(FILES+"system.sf", "system"); String applicationName = "TCP27.system.tempname"; String diag =""; @@ -63,7 +63,7 @@ assertContains(actual,expected1); assertContains(actual,expected2); assertContains(actual,expected3); - */ + } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java 2007-02-01 14:43:44 UTC (rev 3856) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java 2007-02-01 17:24:06 UTC (rev 3857) @@ -39,7 +39,7 @@ //application = deployExpectingSuccess(FILES + "testPassingIf.sf", "testPassingIf"); //expectSuccessfulTermination((TestBlock) application); } -/* + public void testPassingWaitFor() throws Throwable { application=deployExpectingSuccess(FILES +"testPassingWaitFor.sf","testPassingWaitFor"); expectSuccessfulTermination((TestBlock) application); @@ -64,5 +64,5 @@ assertTrue("No "+WAITFOR_FAILED+" in "+tr, description.indexOf(WAITFOR_FAILED)>=0); } -*/ + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |