Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [6212] trunk/core/components/ssh/test/org/smartfrog/ test/system/components/ssh/sshexec
|
From: <st...@us...> - 2008-03-18 11:43:42
|
Revision: 6212
http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6212&view=rev
Author: steve_l
Date: 2008-03-18 04:43:38 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
SFOS-739 An ssh component test failed
Modified Paths:
--------------
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/SshExecNegativeTest.java
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/components.sf
Added Paths:
-----------
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn91_missing_host.sf
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn92_user_name_is_missing.sf
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94_missing_password_file.sf
Removed Paths:
-------------
trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94.sf
Modified: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/SshExecNegativeTest.java
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/SshExecNegativeTest.java 2008-03-18 10:55:05 UTC (rev 6211)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/SshExecNegativeTest.java 2008-03-18 11:43:38 UTC (rev 6212)
@@ -33,9 +33,9 @@
super(s);
}
-/*sshexec : improper host*/
- public void testCaseTCN91_missing_host() throws Exception {
- deployExpectingException(FILES +"tcn91.sf",
+ /*sshexec : improper host*/
+ public void testCaseTCN91_missing_host() throws Throwable {
+ deployExpectingException(FILES +"tcn91_missing_host.sf",
"tcn91",
EXCEPTION_DEPLOYMENT,
null,
@@ -43,33 +43,21 @@
"error in schema: non-optional attribute 'host' is missing");
}
- /*sshexec : userid missing*/
- public void testCaseTCN92_user_name_is_missing() throws Exception {
- deployExpectingException(FILES +"tcn92.sf",
+ /*sshexec : userid missing*/
+ public void testCaseTCN92_user_name_is_missing() throws Throwable {
+ deployExpectingException(FILES +"tcn92_user_name_is_missing.sf",
"tcn92",
EXCEPTION_DEPLOYMENT,
null,
EXCEPTION_LINKRESOLUTION,
"error in schema: non-optional attribute 'username' is missing");
}
- /*sshexec : command missing*/
- public void NotestCaseTCN93_commands_is_missing() throws Exception {
- deployExpectingException(FILES +"tcn93.sf",
- "tcn93",
- null,
- null,
- EXCEPTION_RESOLUTION,
- "commands");
+
+
+ /*sshexec : password file missing*/
+ public void testCaseTCN94_missing_password_file() throws Throwable {
+ expectSuccessfulTestRun(FILES, "tcn94_missing_password_file");
}
- /*sshexec : password file missing*/
- public void testCaseTCN94_missing_password_file() throws Exception {
- deployExpectingException(FILES +"tcn94.sf",
- "tcn94",
- EXCEPTION_LIFECYCLE,
- "sfDeploy",
- EXCEPTION_SMARTFROG,
- "java.io.FileNotFoundException");
- }
}
Modified: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/components.sf
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/components.sf 2008-03-18 10:55:05 UTC (rev 6211)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/components.sf 2008-03-18 11:43:38 UTC (rev 6212)
@@ -26,33 +26,62 @@
username "smartfrog";
}
+tcn91 extends SSHSessionInlinePassword {
+ description "no host";
+ password "secret";
+ commands ["mkdir Sep15", "mkdir sep15"];
+ username "smartfrog";
+};
-Tcn91 extends SSHSessionInlinePassword {
- description "no host";
- password "secret";
- username "smartfrog";
- commands ["mkdir Sep15", "mkdir sep15"];
- }
+tcn91_missing_host extends ExpectDeployFailure {
+ description "no host";
-Tcn92 extends SSHSessionInlinePassword {
- description "user name is missing";
- password "secret";
- host testvalues:localhost;
- commands ["mkdir Sep15", "mkdir sep15"];
- }
+ action tcn91;
-Tcn93 extends PasswordSshExec {
- description "commands is missing";
+ exceptions [
+ [SmartFrogExceptionNames:EXCEPTION_DEPLOYMENT,""],
+ [SmartFrogExceptionNames:EXCEPTION_LINKRESOLUTION,
+ "non-optional attribute 'host' is missing"]
+ ];
}
-Tcn94 extends SSHSessionPasswordFile {
- description "missing password file";
+tcn92 extends SSHSessionInlinePassword {
+ description "missing username attribute";
+ password "secret";
+ host testvalues:localhost;
+ commands ["mkdir Sep15", "mkdir sep15"];
+};
+
+tcn92_user_name_is_missing extends ExpectDeployFailure {
+ description "missing username attribute";
+
+ action tcn92;
+ exceptions [
+ [SmartFrogExceptionNames:EXCEPTION_DEPLOYMENT,""],
+ [SmartFrogExceptionNames:EXCEPTION_LINKRESOLUTION,
+ "non-optional attribute 'username' is missing"]
+ ];
+}
+
+
+tcn94_missing_password_file extends ExpectDeployFailure {
+ description "missing password file";
+
+ action extends SSHSessionPasswordFile {
passwordFile "this-file-does-not-exist-probably-0a1b2c3d.txt";
username "smartfrog";
host testvalues:localhost;
commands [];
- }
+ };
+ //NoPasswd FilePassword:ERROR_MISSING_PASSWORD_FILE;
+ NoPasswd "Missing password file: ";
+ exceptions [
+ [SmartFrogExceptionNames:EXCEPTION_LIFECYCLE,""],
+ [SmartFrogExceptionNames:EXCEPTION_DEPLOYMENT,NoPasswd]
+ ];
+}
+
/**
* bind to a test SSH server
*/
@@ -93,4 +122,5 @@
[SmartFrogExceptionNames:EXCEPTION_LIFECYCLE,"wrong password"],
["com.jcraft.jsch.JSchException","Auth cancel"]
];
-}
\ No newline at end of file
+}
+
Copied: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn91_missing_host.sf (from rev 6209, trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn91.sf)
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn91_missing_host.sf (rev 0)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn91_missing_host.sf 2008-03-18 11:43:38 UTC (rev 6212)
@@ -0,0 +1,28 @@
+/** (C) Copyright 1998-2004 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
+
+*/
+
+#include "/org/smartfrog/test/system/components/ssh/sshexec/components.sf"
+
+/**
+ * no host
+ *
+ */
+
+ sfConfig extends tcn91;
Copied: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn92_user_name_is_missing.sf (from rev 6209, trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn92.sf)
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn92_user_name_is_missing.sf (rev 0)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn92_user_name_is_missing.sf 2008-03-18 11:43:38 UTC (rev 6212)
@@ -0,0 +1,30 @@
+/** (C) Copyright 1998-2004 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
+
+*/
+
+#include "/org/smartfrog/test/system/components/ssh/sshexec/components.sf"
+/**
+ * user name is missing
+ *
+ */
+
+ //
+
+ sfConfig extends tcn92;
+
Deleted: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94.sf
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94.sf 2008-03-18 10:55:05 UTC (rev 6211)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94.sf 2008-03-18 11:43:38 UTC (rev 6212)
@@ -1,28 +0,0 @@
-/** (C) Copyright 1998-2004 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
-
-*/
-
-#include "/org/smartfrog/test/system/components/ssh/sshexec/components.sf"
-
-/**
- *
- */
-
- sfConfig extends Tcn94;
-
Copied: trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94_missing_password_file.sf (from rev 6209, trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94.sf)
===================================================================
--- trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94_missing_password_file.sf (rev 0)
+++ trunk/core/components/ssh/test/org/smartfrog/test/system/components/ssh/sshexec/tcn94_missing_password_file.sf 2008-03-18 11:43:38 UTC (rev 6212)
@@ -0,0 +1,28 @@
+/** (C) Copyright 1998-2004 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
+
+*/
+
+#include "/org/smartfrog/test/system/components/ssh/sshexec/components.sf"
+
+/**
+ *
+ */
+
+ sfConfig extends tcn94_missing_password_file;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|