You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/03/11 11:23:55 UTC
svn commit: r1455082 -
/karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
Author: jbonofre
Date: Mon Mar 11 10:23:54 2013
New Revision: 1455082
URL: http://svn.apache.org/r1455082
Log:
Remove executeTest test as it doesn't make sense anymore thanks to the new admin service refactoring
Modified:
karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
Modified: karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java?rev=1455082&r1=1455081&r2=1455082&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java (original)
+++ karaf/branches/karaf-2.3.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java Mon Mar 11 10:23:54 2013
@@ -116,56 +116,6 @@ public class ExecuteTest extends TestCas
delete(tempFile);
}
}
-
- public void testExecute() throws Exception {
- final File tempFile = createTempDir(getName());
- Properties p = new Properties();
- p.setProperty("ssh.port", "1302");
- p.setProperty("rmi.registry.port", "1122");
- p.setProperty("rmi.server.port", "44444");
- FileOutputStream fos = new FileOutputStream(new File(tempFile, AdminServiceImpl.STORAGE_FILE));
- p.store(fos, "");
- fos.close();
-
- final List<AdminServiceImpl> admins = new ArrayList<AdminServiceImpl>();
- try {
- AdminCommandSupport mockCommand = EasyMock.createStrictMock(AdminCommandSupport.class);
- mockCommand.setAdminService((AdminService) EasyMock.anyObject());
- EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
- public Object answer() throws Throwable {
- AdminServiceImpl svc = (AdminServiceImpl) EasyMock.getCurrentArguments()[0];
- assertEquals(tempFile, svc.getStorageLocation());
- admins.add(svc);
- return null;
- }
- });
-
- EasyMock.expect(mockCommand.execute(null)).andAnswer(new IAnswer<Object>() {
- public Object answer() throws Throwable {
- // The Admin Service should be initialized at this point.
- // One way to find this out is by reading out the port number
- AdminServiceImpl admin = admins.get(0);
- Field sshField = AdminServiceImpl.class.getDeclaredField("defaultSshPortStart");
- sshField.setAccessible(true);
- assertEquals(1302, sshField.get(admin));
- Field rmiRegistryField = AdminServiceImpl.class.getDeclaredField("defaultRmiRegistryPortStart");
- rmiRegistryField.setAccessible(true);
- assertEquals(1122, rmiRegistryField.get(admin));
- Field rmiServerField = AdminServiceImpl.class.getDeclaredField("defaultRmiServerPortStart");
- rmiServerField.setAccessible(true);
- assertEquals(44444, rmiServerField.get(admin));
- return null;
- }
- });
- EasyMock.replay(mockCommand);
-
- Execute.execute(mockCommand, tempFile, new String [] {"test"});
-
- EasyMock.verify(mockCommand);
- } finally {
- delete(tempFile);
- }
- }
private static File createTempDir(String name) throws IOException {
final File tempFile = File.createTempFile(name, null);
@@ -182,4 +132,5 @@ public class ExecuteTest extends TestCas
}
tmp.delete();
}
+
}