[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1824] trunk/org.rubypeople.rdt.launching.tests/ src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java

[<caw...@us...>]

Revision: 1824
          http://svn.sourceforge.net/rubyeclipse/?rev=1824&view=rev
Author:   cawilliams
Date:     2007-01-19 13:12:12 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
fix it up some (and remove tests that don't make sense anymore)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java

Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java	2007-01-19 21:11:46 UTC (rev 1823)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java	2007-01-19 21:12:12 UTC (rev 1824)
@@ -1,109 +1,33 @@
 package org.rubypeople.rdt.internal.launching;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 
 import junit.framework.TestCase;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
 import org.rubypeople.rdt.launching.IVMInstall;
+import org.rubypeople.rdt.launching.IVMInstallType;
+import org.rubypeople.rdt.launching.RubyRuntime;
 
 public class TC_RubyInterpreter extends TestCase {
 
-    private static final String TEST_RUBY_CMD = "/foo bar ruby";
-    private static final File WORKING_DIR = new File("/testDir");
+    private static final String VM_TYPE_ID = "org.rubypeople.rdt.launching.StandardVMType";
+	private IVMInstallType vmType;
 
+    @Override
+    protected void setUp() throws Exception {
+    	super.setUp();
+    	vmType = RubyRuntime.getVMInstallType(VM_TYPE_ID);
+    }
+    
     public void testEquals() {
-		IVMInstall interpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
-		IVMInstall similarInterpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
+		IVMInstall interpreterOne = new StandardVM(vmType, "InterpreterOne");
+		interpreterOne.setInstallLocation(new File("/InterpreterOnePath"));
+		IVMInstall similarInterpreterOne = new StandardVM(vmType, "InterpreterOne");
+		similarInterpreterOne.setInstallLocation(new File("/InterpreterOnePath"));
 		assertTrue("Interpreters should be equal.", interpreterOne.equals(similarInterpreterOne));
 		
-		IVMInstall interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("/InterpreterTwoPath"));
+		IVMInstall interpreterTwo = new StandardVM(vmType, "InterpreterTwo");
+		interpreterTwo.setInstallLocation(new File("/InterpreterTwoPath"));
 		assertTrue("Interpreters should not be equal.", !interpreterOne.equals(interpreterTwo));
 	}
-    
-    public void testExecList() throws Exception {
-        ShamCommandExecutor executor = new ShamCommandExecutor();
-        RubyInterpreter interpreter = new NonValidatingInterpreter("Test", new File("/path to ruby"), executor);
-        ShamProcess process = new ShamProcess();
-        executor.setProcessToReturn(process);
-        
-        Process result = interpreter.exec(Arrays.asList(new String[] {"a","b b", "c"}), WORKING_DIR);
-
-        executor.assertExecute(new String[] {TEST_RUBY_CMD, "a", "b b", "c"}, WORKING_DIR);
-        assertEquals(process, result);
-    }
-
-    public void testExecutorThrows() throws Exception {
-        ShamCommandExecutor executor = new ShamCommandExecutor();
-        RubyInterpreter interpreter = new NonValidatingInterpreter("Test", new File("/path to ruby"), executor);
-        IOException testException = new IOException("test");
-        executor.setExceptionToThrow(testException);
-        
-        try {
-            interpreter.exec(new ArrayList(), WORKING_DIR);
-            fail("Expected CoreException");
-        } catch (CoreException expected) {
-            assertEquals(IStatus.ERROR, expected.getStatus().getSeverity());
-            assertEquals(testException, expected.getStatus().getException());
-        }
-    }
-    
-    public void testUnknownInterperterThrows() throws Exception {
-        RubyInterpreter interpreter = new RubyInterpreter("Test", new File("unknown ruby interpreter"), null);
-        
-        try {
-            interpreter.exec(new ArrayList(), WORKING_DIR);
-            fail("Expected CoreException");
-        } catch (CoreException expected) {
-            assertEquals(IStatus.ERROR, expected.getStatus().getSeverity());
-            assertEquals(IllegalCommandException.class, expected.getStatus().getException().getClass());
-        }
-    }
-
-    private static final class NonValidatingInterpreter extends RubyInterpreter {
-        private NonValidatingInterpreter(String name, File location, CommandExecutor executor) {
-            super(name, location, executor);
-        }
-
-
-        public String getCommand() {
-            return TEST_RUBY_CMD;
-        }
-    }
-
-    private static class ShamCommandExecutor implements CommandExecutor {
-        private String[] commandArg;
-        private File workingDirectoryArg;
-        private ShamProcess processToReturn;
-        private IOException exceptionToThrow;
-        
-        public void assertExecute(String[] expectedCommand, File expectedWorkingDir) {
-            assertEquals("Command ", Arrays.asList(expectedCommand), Arrays.asList(commandArg));
-            assertEquals("Working dir", expectedWorkingDir, workingDirectoryArg);
-        }
-
-        public void setExceptionToThrow(IOException exception) {
-            this.exceptionToThrow = exception;
-            
-        }
-
-        public void setProcessToReturn(ShamProcess process) {
-            this.processToReturn = process;
-            
-        }
-
-        public Process exec(String[] command, File workingDirectory) throws IOException {
-            commandArg = command;
-            workingDirectoryArg = workingDirectory;
-            if (exceptionToThrow != null)
-                throw exceptionToThrow;
-            return processToReturn;
-        }
-
-    }
-
 }


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