felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r722135 [4/4] - in /felix/trunk/ipojo/examples/junit4osgi: ./ felix-command/ felix-command/src/main/java/org/apache/felix/ipojo/junit4osgi/command/ immediate-launcher/ immediate-launcher/src/main/java/org/apache/felix/ipojo/junit4osgi/comma...
Date Mon, 01 Dec 2008 17:06:13 GMT
Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/ResultTableModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/ResultTableModel.java?rev=722135&r1=722134&r2=722135&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/ResultTableModel.java
(original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/ResultTableModel.java
Mon Dec  1 09:06:11 2008
@@ -35,51 +35,84 @@
  */
 public class ResultTableModel extends AbstractTableModel {
 
-    public static final String SUCESS = "success";
-
+    /**
+     * Success String.
+     */
+    public static final String SUCCESS = "success";
+
+    /**
+     * Failure String.
+     */
     public static final String FAILURE = "failure";
 
+    /**
+     * Error String.
+     */
     public static final String ERROR = "error";
 
+    /**
+     * UUDI.
+     */
     private static final long serialVersionUID = 1L;
 
-    private List<TestRecord> results = new ArrayList<TestRecord>();
+    /**
+     * List of results.
+     */
+    private List<TestRecord> m_results = new ArrayList<TestRecord>();
 
     public int getRowCount() {
-        return results.size();
+        return m_results.size();
     }
 
     public int getColumnCount() {
         return 2;
     }
 
+    /**
+     * Adds a failing test.
+     * @param t the test
+     * @param e the assertion error
+     */
     public void addTest(Test t, AssertionFailedError e) {
         TestRecord rec = new TestRecord(t, e);
-        results.add(rec);
+        m_results.add(rec);
         fireTableDataChanged();
     }
 
+    /**
+     * Adds a test in error.
+     * @param t the test
+     * @param e the thrown error
+     */
     public void addTest(Test t, Throwable e) {
         TestRecord rec = new TestRecord(t, e);
-        results.add(rec);
+        m_results.add(rec);
         fireTableDataChanged();
     }
 
+    /**
+     * Adds a sucessfull test.
+     * @param t the test
+     */
     public void addTest(Test t) {
         if (!contains(t)) {
             TestRecord rec = new TestRecord(t);
-            results.add(rec);
+            m_results.add(rec);
             fireTableDataChanged();
         }
     }
 
     public int getTestCount() {
-        return results.size();
+        return m_results.size();
     }
 
+    /**
+     * Gets the number of success.
+     * @return the number of success
+     */
     public int getSucess() {
         int count = 0;
-        for (TestRecord test : results) {
+        for (TestRecord test : m_results) {
             if (test.m_wasSucessFull) {
                 count++;
             }
@@ -87,19 +120,27 @@
         return count;
     }
 
+    /**
+     * Gets the number of errors.
+     * @return the number of errors
+     */
     public int getErrors() {
         int count = 0;
-        for (TestRecord test : results) {
+        for (TestRecord test : m_results) {
             if (test.m_error != null) {
                 count++;
             }
         }
         return count;
     }
-
+    
+    /**
+     * Gets the number of failures.
+     * @return the number of failures
+     */
     public int getFailures() {
         int count = 0;
-        for (TestRecord test : results) {
+        for (TestRecord test : m_results) {
             if (test.m_failure != null) {
                 count++;
             }
@@ -107,29 +148,51 @@
         return count;
     }
 
+    
+    /**
+     * Does the result list contains the given test.
+     * @param t the test 
+     * @return <code>true</code> if the list contains the test.
+     */
     private boolean contains(Test t) {
-        for (TestRecord test : results) {
+        for (TestRecord test : m_results) {
             if (test.m_test.equals(t)) { return true; }
         }
         return false;
     }
 
+    /**
+     * Clear the list.
+     */
     public void clear() {
-        results.clear();
+        m_results.clear();
         fireTableDataChanged();
     }
 
+    /**
+     * Get the Object placed in the JTable.
+     * @param rowIndex the row
+     * @param columnIndex the column
+     * @return the object
+     * @see javax.swing.table.TableModel#getValueAt(int, int)
+     */
     public Object getValueAt(int rowIndex, int columnIndex) {
-        if (columnIndex == 0) { return results.get(rowIndex).m_test; }
+        if (columnIndex == 0) { return m_results.get(rowIndex).m_test; }
         if (columnIndex == 1) {
-            TestRecord tr = results.get(rowIndex);
-            if (tr.m_wasSucessFull) { return SUCESS; }
+            TestRecord tr = m_results.get(rowIndex);
+            if (tr.m_wasSucessFull) { return SUCCESS; }
             if (tr.m_failure != null) { return FAILURE; }
             if (tr.m_error != null) { return ERROR; }
         }
         return null;
     }
 
+    /**
+     * Gets column names.
+     * @param column the column
+     * @return the column name
+     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
+     */
     public String getColumnName(int column) {
         if (column == 0) { return "Test"; }
 
@@ -138,9 +201,15 @@
         return null;
     }
 
+    /**
+     * Gets the message.
+     * @param row the row
+     * @param column the column
+     * @return the message for this cell
+     */
     public String getMessage(int row, int column) {
         if (row == -1) { return null; }
-        TestRecord rec = results.get(row);
+        TestRecord rec = m_results.get(row);
         if (rec.m_wasSucessFull) { return "The test " + rec.m_test + " was executed sucessfully.";
}
         if (rec.m_failure != null) { return "The test " + rec.m_test + " has failed : \n"
+ rec.m_failure.getMessage(); }
         if (rec.m_error != null) {
@@ -154,26 +223,52 @@
     }
 
     private class TestRecord {
+        /**
+         * Was the test successful?
+         */
         private boolean m_wasSucessFull;
 
+        /**
+         * The test.
+         */
         private Test m_test;
 
+        /**
+         * The failure.
+         */
         private AssertionFailedError m_failure;
 
+        /**
+         * The error.
+         */
         private Throwable m_error;
 
+        /**
+         * Creates a TestRecord.
+         * @param t the test
+         * @param e the failure
+         */
         public TestRecord(Test t, AssertionFailedError e) {
             m_test = t;
             m_wasSucessFull = false;
             m_failure = e;
         }
 
+        /**
+         * Creates a TestRecord.
+         * @param t the test
+         * @param e the error
+         */
         public TestRecord(Test t, Throwable e) {
             m_test = t;
             m_wasSucessFull = false;
             m_error = e;
         }
 
+        /**
+         * Creates a TestRecord.
+         * @param t the test
+         */
         public TestRecord(Test t) {
             m_test = t;
             m_wasSucessFull = true;

Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.form
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.form?rev=722135&r1=722134&r2=722135&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.form
(original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.form
Mon Dec  1 09:06:11 2008
@@ -1,3 +1,21 @@
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">

Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.java?rev=722135&r1=722134&r2=722135&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.java
(original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/SwingRunner.java
Mon Dec  1 09:06:11 2008
@@ -41,6 +41,9 @@
  */
 public class SwingRunner extends javax.swing.JFrame implements BundleListener {
 
+    /**
+     * UUID.
+     */
     private static final long serialVersionUID = 1L;
 
     /**
@@ -96,17 +99,17 @@
         m_progress.setIndeterminate(false);
         m_progress.setMaximum(100);
         m_progress.setValue(100);
-        
+
         TableColumn column = null;
         for (int i = 0; i < m_resultTable.getColumnCount(); i++) {
             column = m_resultTable.getColumnModel().getColumn(i);
             if (i == 0) {
-                column.setPreferredWidth(350); //first column is bigger
+                column.setPreferredWidth(350); // first column is bigger
             } else {
                 column.setPreferredWidth(50);
                 column.setCellRenderer(new ResultCellRenderer());
+            }
         }
-}
     }
 
     /**
@@ -120,6 +123,7 @@
     /**
      * Refresh the list of available test suites.
      */
+    @SuppressWarnings("unchecked")
     private void refreshSuites() {
         List<Test> list = m_runner.getTests();
         TestListModel lm = (TestListModel) m_suiteList.getModel();
@@ -296,13 +300,13 @@
         getContentPane().add(m_statusBar, gridBagConstraints);
 
         pack();
-    }// </editor-fold>//GEN-END:initComponents
+    } // </editor-fold>//GEN-END:initComponents
 
     /**
      * Execute button action.
      * @param evt : event.
      */
-    private void executeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_executeButtonActionPerformed
+    private void executeButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_m_executeButtonActionPerformed
         if (m_running) { return; }
         // Collect selected test.
         int[] indices = m_suiteList.getSelectedIndices();
@@ -313,26 +317,26 @@
         }
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         executeTest(list);
-    }//GEN-LAST:event_m_executeButtonActionPerformed
+    } //GEN-LAST:event_m_executeButtonActionPerformed
 
     /**
      * All button action.
      * @param evt : event.
      */
-    private void allButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_allButtonActionPerformed
+    private void allButtonActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_m_allButtonActionPerformed
         int max = m_suiteList.getModel().getSize();
         int[] indices = new int[max];
         for (int i = 0; i < max; i++) {
             indices[i] = i;
         }
         m_suiteList.setSelectedIndices(indices);
-    }//GEN-LAST:event_m_allButtonActionPerformed
+    } //GEN-LAST:event_m_allButtonActionPerformed
 
     /**
      * Listener on table click.
      * @param evt : event.
      */
-    private void resultTableMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_m_resultTableMouseClicked
+    private void resultTableMouseClicked(java.awt.event.MouseEvent evt) { //GEN-FIRST:event_m_resultTableMouseClicked
         Point p = evt.getPoint();
         int row = m_resultTable.rowAtPoint(p);
         int col = m_resultTable.columnAtPoint(p);
@@ -344,25 +348,25 @@
             m_messageArea.setText(message);
             m_resultDialog.setVisible(true);
         }
-    }//GEN-LAST:event_m_resultTableMouseClicked
+    } //GEN-LAST:event_m_resultTableMouseClicked
 
     /**
      * Ok button action.
      * @param evt : event.
      */
-    private void okActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_okActionPerformed
+    private void okActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_m_okActionPerformed
         m_resultDialog.setVisible(false);
         setEnabled(true);
-    }//GEN-LAST:event_m_okActionPerformed
+    } //GEN-LAST:event_m_okActionPerformed
 
     /**
      * Listener when the test report is closed.
      * @param evt : event.
      */
-    private void onDialogClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_onDialogClosed
+    private void onDialogClosed(java.awt.event.WindowEvent evt) { //GEN-FIRST:event_onDialogClosed
         m_resultDialog.setVisible(false);
         setEnabled(true);
-    }//GEN-LAST:event_onDialogClosed
+    } //GEN-LAST:event_onDialogClosed
 
     /**
      * Execute method.
@@ -394,15 +398,19 @@
         new Thread(thread).start();
     }
     
-     private void computeExecutedTest() {
+    /**
+     * Compute executed tests.
+     * (Status bar message)
+     */
+    private void computeExecutedTest() {
         ResultTableModel results = (ResultTableModel) m_resultTable.getModel();
         String m = " \t ";
-        m+= results.getTestCount() + " tests executed / ";
-        m+= results.getSucess() + " sucess / ";
-        m+= results.getFailures() + " failures / ";
-        m+= results.getErrors() + " errors ";
+        m += results.getTestCount() + " tests executed / ";
+        m += results.getSucess() + " sucess / ";
+        m += results.getFailures() + " failures / ";
+        m += results.getErrors() + " errors ";
         m_executedResults.setText(m);
-     }
+    }
 
     private class MyTestListener implements junit.framework.TestListener {
         /**

Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/TestListModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/TestListModel.java?rev=722135&r1=722134&r2=722135&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/TestListModel.java
(original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/src/main/java/org/apache/felix/ipojo/junit4osgi/command/TestListModel.java
Mon Dec  1 09:06:11 2008
@@ -29,39 +29,65 @@
  */
 public class TestListModel extends AbstractListModel {
 
+    /**
+     * Id.
+     */
     private static final long serialVersionUID = 1L;
 
-    private List<TestRecord> list = new ArrayList<TestRecord>();
-
+    /**
+     * List of {@link TestRecord}. 
+     */
+    private List<TestRecord> m_list = new ArrayList<TestRecord>();
+
+    /**
+     * Gets the element placed at the given index.
+     * @param index the index
+     * @return the element placed at the given index 
+     * or <code>null</code> if no element at this index
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
     public Object getElementAt(int index) {
-        if (index >= list.size()) {
+        if (index >= m_list.size()) {
             return null;
         } else {
-            return list.get(index).name;
+            return m_list.get(index).m_name;
         }
     }
 
+    /**
+     * Gets the test object placed at the given index.
+     * @param index the index
+     * @return the test object placed at the given index
+     */
     public Test getTestElementAt(int index) {
-        return list.get(index).test;
+        return m_list.get(index).m_test;
     }
 
+    /**
+     * Adds a test.
+     * @param test the test to add
+     */
     public void addTest(Test test) {
-        synchronized(this) {
+        synchronized (this) {
             TestRecord tr = new TestRecord();
-            tr.test = test;
-            tr.name = test.toString();
-            list.add(tr);
+            tr.m_test = test;
+            tr.m_name = test.toString();
+            m_list.add(tr);
         }
-        fireContentsChanged(this, list.size() - 1, list.size() - 1);
+        fireContentsChanged(this, m_list.size() - 1, m_list.size() - 1);
     }
 
+    /**
+     * Removes a test.
+     * @param test the test to remove
+     */
     public void removeTest(Test test) {
         int index = 1;
-        synchronized(this) {
-            for (TestRecord t : list) {
-                if (t.test.equals(test)) {
-                    index = list.indexOf(t);
-                    list.remove(t);
+        synchronized (this) {
+            for (TestRecord t : m_list) {
+                if (t.m_test.equals(test)) {
+                    index = m_list.indexOf(t);
+                    m_list.remove(t);
                     return;
                 }
             }
@@ -72,18 +98,32 @@
         }
     }
 
+    /**
+     * Clears the list.
+     */
     public void clear() {
-        list.clear();
+        m_list.clear();
     }
 
     private class TestRecord {
-        public Test test;
-
-        public String name;
-    }
-
+        /**
+         * The test.
+         */
+        public Test m_test;
+
+        /**
+         * The test name.
+         */
+        public String m_name;
+    }
+
+    /**
+     * Gets the list size.
+     * @return the list size.
+     * @see javax.swing.ListModel#getSize()
+     */
     public int getSize() {
-        return list.size();
+        return m_list.size();
     }
 
 }



Mime
View raw message