Changeset 1162

Timestamp:

05/11/08 14:52:12 (2 months ago)

Author:

fraserofthenight

Message:

It's back to doing exactly what it did before (plus allowing a user-selectable port number)

Files:

• trunk/descent.unittest/flute/src/org/dsource/descent/flute/flute.d (modified) (2 diffs)
• trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d (modified) (3 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/flute/FluteApplicationInstance.java (modified) (2 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfiguration.java (modified) (6 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfigurationTab.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/model/DescentUnittestModel.java (modified) (4 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/model/RemoteTestRunnerClient.java (modified) (3 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/model/TestRunSession.java (modified) (4 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.properties (modified) (2 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/ui/OpenModuleAction.java (modified) (1 diff)
• trunk/descent.unittest/testdata/src/compile.bat (modified) (1 diff)
• trunk/descent.unittest/testdata/src/sample/module1.d (modified) (1 diff)

trunk/descent.unittest/flute/src/org/dsource/descent/flute/flute.d

@@ -410 +410 @@
-                version(inTango)
-                {
-// TODO
+TODO();
-                    AssertException ae = cast(AssertException) e;
-                    assert(ae !is null);
@@ -483 +483 @@
-                        return format("%#0.*x", percision, val);
-                    else
-} // TANGO
+TODO(); }
-                }
-                

trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d

@@ -5 +5 @@
- * provide socket I/O.
- * 
-
-io
+e
+port
- * working directory. This file's sole contents should be an ASCII-encoded
- * decimal integer between 1024 and 65535m representing the port flute should
@@ -111 +111 @@
-            
-            public this()
-
-
-
-
+
-                try
-                {
@@ -125 +122 @@
-                catch(SocketException se)
-                {
-
+ 
-                        se.errorCode);
-                    exit(se.errorCode);

trunk/descent.unittest/src/descent/internal/unittest/flute/FluteApplicationInstance.java

@@ -71 +71 @@
-     * Initializes the flute application. Should be called only once
-     * and before any calls to other methods.
-
-
+
+
+
+
+
-    {
-        assert(fState instanceof StartingUp);
@@ -81 +84 @@
-        // Make the connection (interpretation will begin automatically)
-        fConn = new SocketConnection(fPort);
-        
-        waitStateReturn();
-assert(((StartingUp) fState).hasCorrectVersion)
+boolean retVal = ((StartingUp) fState).hasCorrectVersion
-        setState(fWaitingState);
+        return retVal;
-    }
-    

trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfiguration.java

@@ -12 +12 @@
-package descent.internal.unittest.launcher;
-
+import java.io.File;
+import java.io.FileWriter;
-import java.io.IOException;
-import java.net.ServerSocket;
@@ -27 +29 @@
-
-import descent.core.IJavaElement;
+import descent.core.IJavaProject;
-import descent.core.JavaCore;
-import descent.debug.core.AbstractDescentLaunchConfigurationDelegate;
-import descent.debug.core.IDescentLaunchConfigurationConstants;
-import descent.internal.unittest.DescentUnittestPlugin;
+import descent.internal.unittest.flute.FluteApplicationInstance;
-import descent.internal.unittest.ui.JUnitMessages;
-import descent.unittest.ITestSpecification;
@@ -47 +51 @@
-    public static final String FAILURES_FILENAME_ATTR= DescentUnittestPlugin.PLUGIN_ID+".FAILURENAMES"; //$NON-NLS-1$
-    
+    /**
+     * The file to create next to the fluted executable to use to find the port.
+     * This is a hack because it's impossible to pass command-line arguments to
+     * the program (well, it's not, but this might be easier than finding the
+     * stack frame and trying to read the arguments like that).
+     */
+    public static final String PORT_FILENAME = ".fluteport"; //$NON-NLS-1$
+    
-    @Override
-    public void launch(ILaunchConfiguration config, String mode,
-            ILaunch launch, IProgressMonitor monitor) throws CoreException
-
+
+
+
-        if (monitor == null)
-            monitor = new NullProgressMonitor();
+        boolean shouldKill = false; // Should the process be killed?
-        
-        try
@@ -62 +77 @@
-            //Find the tests
-            List<ITestSpecification> tests = findTests(config, 
-60));
+40)); // 40
-            if(tests.isEmpty())
-                throw error(JUnitMessages.UnittestLaunchConfiguration_no_tests_found);
@@ -75 +90 @@
-            if(monitor.isCanceled())
-                return;
-
+
+
+
+
+
+
-            
-            // Launch the applicataion
-
+
+
-            if(monitor.isCanceled())
-                return;
-            
+            // Connect to the application
+            FluteApplicationInstance app;
+            try
+            {
+                synchronized(this)
+                {
+                    app = new FluteApplicationInstance(port);
+                }
+                app.init();
+            }
+            catch(IOException e)
+            {
+                throw error(String.format(JUnitMessages.UnittestLaunchConfiguration_could_not_connect, e.getMessage()));
+            }
+            monitor.worked(20); // 95
+            if(monitor.isCanceled())
+                return;
+
-            // Transfer the launch config attributes to the launch
-            launch.setAttribute(IDescentLaunchConfigurationConstants.ATTR_PROJECT_NAME, getProjectName(config));
-            launch.setAttribute(IUnittestLaunchConfigurationAttributes.PORT_ATTR, String.valueOf(port));
-            
-            // Start the Descent side of things
-
-
+
+
+
+
-        }
-        finally
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -154 +203 @@
-                DescentUnittestPlugin.PLUGIN_ID, message));
-    }
+    
+    private static File createFile(String path) throws CoreException
+    {
+        File file = new File(path);
+        if(file.exists())
+        {
+            if(!file.delete())
+            {
+                throw error(String.format(JUnitMessages.UnittestLaunchConfiguration_could_not_delete_file, path));
+            }
+        }
+        try
+        {
+            file.createNewFile();
+        }
+        catch(IOException e)
+        {
+            throw error(String.format(JUnitMessages.UnittestLaunchConfiguration_error_crearing_file, e.getMessage()));
+        }
+        return file;
+    }
+    
+    private static void writeToFile(String str, File file) throws CoreException
+    {
+        try
+        {
+            FileWriter writer = new FileWriter(file);
+            writer.append(str);
+            writer.flush();
+            writer.close();
+        }
+        catch(IOException e)
+        {
+            throw error(String.format(JUnitMessages.UnittestLaunchConfiguration_error_writing_file, e.getMessage()));
+        }
+    }
+    
+    private String getPortFilePath(ILaunchConfiguration config) throws CoreException
+    {
+        File dirFile = verifyWorkingDirectory(config);
+        String dirPath;
+        if(null != dirFile)
+        {
+            dirPath = dirFile.getPath();
+        }
+        else
+        {
+            File exe = new File(verifyProgramPath(config).toOSString());
+            if(!exe.exists() || !exe.isFile())
+                throw error(JUnitMessages.UnittestLaunchConfiguration_program_does_not_exist);
+            dirPath = exe.getParent();
+        }
+        return dirPath + File.separator + PORT_FILENAME;
+    }
-
-    @Override

trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfigurationTab.java

@@ -478 +478 @@
-        // TODO get the fluted program executable
-        config.setAttribute(IDescentLaunchConfigurationConstants.ATTR_PROGRAM_NAME,
-Users/xycos/
+
-    }
-

trunk/descent.unittest/src/descent/internal/unittest/model/DescentUnittestModel.java

@@ -42 +42 @@
-
-import descent.internal.unittest.DescentUnittestPlugin;
+import descent.internal.unittest.flute.FluteApplicationInstance;
-import descent.internal.unittest.launcher.IUnittestLaunchConfigurationAttributes;
-import descent.internal.unittest.ui.JUnitPreferencesConstants;
@@ -193 +194 @@
-     * state).
-     */
-
+
+
+
-            final List<ITestSpecification> tests)
-    {
-        ILaunchConfiguration config = launch.getLaunchConfiguration();
-        if (config == null)
-            return;
-        
-        // test whether the launch defines the JUnit attributes
-        String portStr = launch.getAttribute(IUnittestLaunchConfigurationAttributes.PORT_ATTR);
-        String projectStr = launch.getAttribute(IDescentLaunchConfigurationConstants.ATTR_PROJECT_NAME);
-        if (portStr == null || projectStr == null)
-            return;
-        
-        final int port = Integer.parseInt(portStr);
-        final IJavaProject launchedProject = getJavaProject(projectStr);
-        
-        getDisplay().asyncExec(new Runnable()
-        {
-            public void run()
-            {
-launchedProject, /* TODO port */ 30587
+app, project
-            }
-        });
@@ -233 +223 @@
-    }
-    
-
-
+
+
+
+
-    {
-        showTestRunnerViewPartInActivePage(findTestRunnerViewPartInActivePage());
@@ -250 +242 @@
-        }
-
-port
+app
-        fTestRunSessions.addFirst(testRunSession);
-        notifyTestRunSessionAdded(testRunSession);

trunk/descent.unittest/src/descent/internal/unittest/model/RemoteTestRunnerClient.java

@@ -30 +30 @@
-    private final List<ITestSpecification> tests;
-    private final List<ITestRunListener> listeners;
-    private final int port;
-    private boolean stopped = true;
-    private long startTime;
@@ -36 +35 @@
-    private FluteApplicationInstance app;
-    
-
+
+
-            List<ITestRunListener> $listeners)
-    {
-port = $port
+app = $app
-        tests = $tests;
-        listeners = $listeners;
@@ -57 +57 @@
-    {
-        return app.isConnected();
-    }
-    
-    public void init()
-    {       
-        if(isRunning())
-            return;
-        
-        try
-        {
-            synchronized(this)
-            {
-                app = new FluteApplicationInstance(port);
-            }
-            app.init();
-        }
-        catch(IOException e)
-        {
-        }
-    }
-    

trunk/descent.unittest/src/descent/internal/unittest/model/TestRunSession.java

@@ -26 +26 @@
-import descent.core.ICompilationUnit;
-import descent.core.IJavaProject;
+import descent.internal.unittest.flute.FluteApplicationInstance;
-import descent.internal.unittest.model.TestElement.Status;
-
@@ -93 +94 @@
-    
-
-
-
-
+
+
+
+
-        assert(null != testedProject);
-        assert(null != launch);
@@ -113 +115 @@
-        fTotalCount = 0;
-        
-
+s
-        List<ITestRunListener> listeners = new ArrayList<ITestRunListener>();
-        listeners.add(new TestSessionNotifier());
-        
-port
+app
-        fSessionListeners= new ListenerList();
-        
@@ -126 +128 @@
-                {
-                    createTestTree(tests);
-                    fTestRunnerClient.init();
-                    if(fTestRunnerClient.isConnected())
-                        fTestRunnerClient.run();

trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.java

@@ -82 +82 @@
-    public static String TestRunnerViewPart_wrapperJobName;
-    public static String UnittestLaunchConfiguration_container_not_found;
+    public static String UnittestLaunchConfiguration_could_not_connect;
+    public static String UnittestLaunchConfiguration_could_not_delete_file;
+    public static String UnittestLaunchConfiguration_error_crearing_file;
+    public static String UnittestLaunchConfiguration_error_writing_file;
-    public static String UnittestLaunchConfiguration_invalid_port;
-    public static String UnittestLaunchConfiguration_no_open_port;
-    public static String UnittestLaunchConfiguration_no_tests_found;
+    public static String UnittestLaunchConfiguration_program_does_not_exist;
-    public static String UnittestLaunchConfiguration_task_name;
-    public static String UnittestLaunchConfigurationTab_default_package;

trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.properties

@@ -75 +75 @@
-UnittestLaunchConfiguration_no_tests_found=No tests were found in the given launch container
-UnittestLaunchConfiguration_container_not_found=Launch container could not be found
+UnittestLaunchConfiguration_could_not_connect=Error connecting to fluted application: %1$s
+UnittestLaunchConfiguration_could_not_delete_file=Error creating port file: Could not delete existing file %1$s
+UnittestLaunchConfiguration_error_crearing_file=Error creating port file: %1$s
+UnittestLaunchConfiguration_error_writing_file=Error writing port to file: %1$s
-UnittestLaunchConfigurationTab_group_test_selection=Test selection
-UnittestLaunchConfigurationTab_dialog_test_container_selection=Test container selection
@@ -80 +84 @@
-UnittestLaunchConfigurationTab_error_test_container_does_not_exist=Test container does not exist
-UnittestLaunchConfigurationTab_error_invalid_port=Invalid port number
+UnittestLaunchConfiguration_program_does_not_exist=Program file does not exist
-UnittestLaunchConfigurationTab_error_port_number=Port must be between 1024 and 65535
-UnittestLaunchConfigurationTab_tab_label=Test

trunk/descent.unittest/src/descent/internal/unittest/ui/OpenModuleAction.java

@@ -60 +60 @@
-        
-        int index = moduleSignature.lastIndexOf('.');
-
-
+ //$NON-NLS-1$
+ //$NON-NLS-1$
-                moduleSignature.substring(index + 1) : moduleSignature);
-        

trunk/descent.unittest/testdata/src/compile.bat

@@ -1 @@
-version=FluteCommandLine -
+

trunk/descent.unittest/testdata/src/sample/module1.d

@@ -57 +57 @@
-unittest
-{
+    throwAnException();
+}
+
+void throwAnException()
+{
+    // Another couple lines to test line info
+    
+    
+    
+    doTheThrowing();
+}
+
+void doTheThrowing()
+{
+    // More blank lines
+    
+    
+    
-    throw new ArgumentException("NO WAI!");
-}