[Smartfrog-checkins] SF.net SVN: smartfrog:[7867] trunk/core/testharness/testcases/org/smartfrog /test/system

[<st...@us...>]

Revision: 7867
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7867&view=rev
Author:   steve_l
Date:     2009-09-21 13:40:40 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
SFOS-201 functional Test descriptors often have hard coded hostnames
 -now property driven

Modified Paths:
--------------
    trunk/core/testharness/testcases/org/smartfrog/test/system/compound/tcn38.sf
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/Dummy.java
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn34.sf
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn35.sf
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn36.sf
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn37.sf

Added Paths:
-----------
    trunk/core/testharness/testcases/org/smartfrog/test/system/prim/hostbindings.sf

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/compound/tcn38.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/compound/tcn38.sf	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/compound/tcn38.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -18,20 +18,21 @@
 
 */
 
-#include "org/smartfrog/components.sf"
+#include "/org/smartfrog/components.sf"
+#include "/org/smartfrog/test/system/prim/hostbindings.sf"
 
 sfConfig extends Compound {
     sfClass "org.smartfrog.test.system.prim.Dummy";
     bar1 extends Compound {
             sfProcessComponentName "Bar1";
-            sfProcessHost "ebnt171";
+            sfProcessHost remoteHost;
     }
     bar2 extends Compound {
             sfProcessComponentName "Bar2";
-            sfProcessHost "ebnt171";
+            sfProcessHost remoteHost;
     }
     foo extends Compound {
-        sfProcessHost "eb96121";
+        sfProcessHost localHost;
         sfProcessComponentName "Foo";
     }
 }

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/Dummy.java
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/Dummy.java	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/Dummy.java	2009-09-21 13:40:40 UTC (rev 7867)
@@ -26,8 +26,7 @@
 import org.smartfrog.sfcore.prim.PrimImpl;
 
 /**
- * Makes JVM exit during deployment, consequently kills smartfrog daemon 
- * as well.
+ * no-op Prim
  */
 public class Dummy extends PrimImpl implements Prim {
     

Added: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/hostbindings.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/hostbindings.sf	                        (rev 0)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/hostbindings.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -0,0 +1,23 @@
+/* (C) Copyright 2009 Hewlett-Packard Development Company, LP
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+For more information: www.smartfrog.org
+
+*/
+
+// Edit the values of hosts
+localHost PROPERTY test.localHost; 
+remoteHost PROPERTY test.remoteHost; 

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn34.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn34.sf	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn34.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -18,10 +18,11 @@
 
 */
 
-#include "org/smartfrog/components.sf"
+#include "/org/smartfrog/components.sf"
+#include "/org/smartfrog/test/system/prim/hostbindings.sf"
 
 sfConfig extends Prim {
-    sfProcessHost "eb96121";
+    sfProcessHost localHost;
     sfProcessComponentName "Foo";
 }
 

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn35.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn35.sf	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn35.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -18,11 +18,9 @@
 
 */
 
-#include "org/smartfrog/components.sf"
+#include "/org/smartfrog/components.sf"
+#include "/org/smartfrog/test/system/prim/hostbindings.sf"
 
-// Edit the values of hosts
-localHost PROPERTY test.localHost; // was "eb96121";
-remoteHost PROPERTY test.remoteHost; //was "ebnt171";
 
 sfConfig extends Prim {
     sfClass "org.smartfrog.sfcore.compound.CompoundImpl";

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn36.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn36.sf	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn36.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -18,20 +18,21 @@
 
 */
 
-#include "org/smartfrog/components.sf"
+#include "/org/smartfrog/components.sf"
+#include "/org/smartfrog/test/system/prim/hostbindings.sf"
 
 sfConfig extends Prim {
     sfClass "org.smartfrog.test.system.prim.Dummy";
     bar1 extends Compound {
             //sfProcessName "childProcess1";
             sfProcessComponentName "Bar";
-            sfProcessHost "ebnt171";
+            sfProcessHost localHost;
     }
     bar2 extends Compound {
-            sfProcessHost "ebnt171";
+            sfProcessHost localHost;
     }
     foo extends Compound {
-        sfProcessHost "eb96121";
+        sfProcessHost localHost;
         sfProcessComponentName "Foo";
     }
 }

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn37.sf
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn37.sf	2009-09-21 10:22:06 UTC (rev 7866)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/prim/tcn37.sf	2009-09-21 13:40:40 UTC (rev 7867)
@@ -18,7 +18,7 @@
 
 */
 
-#include "org/smartfrog/components.sf"
+#include "/org/smartfrog/components.sf"
 
 sfConfig extends Prim {
     sfClass "org.smartfrog.test.system.prim.Dummy1";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.