You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/05/23 18:27:24 UTC
svn commit: r1126569 - in
/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml:
./ env/ env/faces/ env/javascript/ env/jexl/ env/jsp/ env/rhino/
env/servlet/ env/xpath/ invoke/ io/ issues/ model/ semantics/
Author: sebb
Date: Mon May 23 16:27:22 2011
New Revision: 1126569
URL: http://svn.apache.org/viewvc?rev=1126569&view=rev
Log:
Remove suite() and main() methods from test classes
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/BuiltinTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractStateMachineTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/LogUtilsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/SessionContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSBindingsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlEvaluatorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/ELEvaluatorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/RootContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoContextTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoEvaluatorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoExampleTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/ServletContextResolverTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLReaderTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue112Test.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ParallelTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/BuiltinTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/BuiltinTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/BuiltinTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/BuiltinTest.java Mon May 23 16:27:22 2011
@@ -22,9 +22,7 @@ import java.util.Set;
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.TransitionTarget;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class BuiltinTest extends TestCase {
@@ -32,15 +30,6 @@ public class BuiltinTest extends TestCas
super(testName);
}
- public static Test suite() {
- return new TestSuite(BuiltinTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { BuiltinTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testIsMemberEmptySet() {
Set<TransitionTarget> set = new HashSet<TransitionTarget>();
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java Mon May 23 16:27:22 2011
@@ -19,11 +19,7 @@ package org.apache.commons.scxml;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.env.SimpleScheduler;
import org.apache.commons.scxml.env.Tracer;
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
@@ -42,12 +38,6 @@ public class EventDataTest extends TestC
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(EventDataTest.class);
- suite.setName("SCXML Executor Tests, _eventdata special variable");
- return suite;
- }
-
// Test data
private URL eventdata01, eventdata02, eventdata03, eventdata04;
private SCXMLExecutor exec;
@@ -158,8 +148,4 @@ public class EventDataTest extends TestC
return line;
}
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java Mon May 23 16:27:22 2011
@@ -19,11 +19,7 @@ package org.apache.commons.scxml;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.env.jsp.ELContext;
import org.apache.commons.scxml.env.jsp.ELEvaluator;
import org.apache.commons.scxml.model.State;
@@ -42,12 +38,6 @@ public class NamespacePrefixedXPathsTest
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(NamespacePrefixedXPathsTest.class);
- suite.setName("Namespace Prefixed XPaths Tests");
- return suite;
- }
-
// Test data
private URL datamodel03jexl, datamodel03jsp;
private SCXMLExecutor exec01, exec02;
@@ -134,10 +124,5 @@ public class NamespacePrefixedXPathsTest
// done
assertTrue(exec.getCurrentStatus().isFinal());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
-
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java Mon May 23 16:27:22 2011
@@ -26,9 +26,7 @@ import org.apache.commons.scxml.model.Hi
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.TransitionTarget;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class SCInstanceTest extends TestCase {
@@ -36,15 +34,6 @@ public class SCInstanceTest extends Test
super(testName);
}
- public static Test suite() {
- return new TestSuite(SCInstanceTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { SCInstanceTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private SCInstance instance;
@Override
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java Mon May 23 16:27:22 2011
@@ -20,11 +20,7 @@ import java.net.URL;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.env.SimpleContext;
import org.apache.commons.scxml.env.jsp.ELEvaluator;
import org.apache.commons.scxml.model.SCXML;
@@ -42,12 +38,6 @@ public class SCXMLExecutorTest extends T
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(SCXMLExecutorTest.class);
- suite.setName("SCXML Executor Tests");
- return suite;
- }
-
// Test data
private URL microwave01jsp, microwave02jsp, microwave01jexl,
microwave02jexl, microwave03jexl, microwave04jexl, microwave05jexl, transitions01,
@@ -277,9 +267,5 @@ public class SCXMLExecutorTest extends T
String id = ((State)currentStates.iterator().next()).getId();
assertTrue(id.equals("closed") || id.equals("cooking"));
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.env.MockErrorReporter;
import org.apache.commons.scxml.env.SimpleErrorReporter;
import org.apache.commons.scxml.model.Parallel;
@@ -36,15 +33,6 @@ public class SCXMLHelperTest extends Tes
super(testName);
}
- public static Test suite() {
- return new TestSuite(SCXMLHelperTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { SCXMLHelperTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testIsStringEmptyNull() {
assertTrue(SCXMLHelper.isStringEmpty(null));
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/StatusTest.java Mon May 23 16:27:22 2011
@@ -16,10 +16,7 @@
*/
package org.apache.commons.scxml;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.model.State;
public class StatusTest extends TestCase {
@@ -28,17 +25,6 @@ public class StatusTest extends TestCase
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(StatusTest.class);
- suite.setName("TestStatus");
- return suite;
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { StatusTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private Status status;
@Override
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java Mon May 23 16:27:22 2011
@@ -19,11 +19,7 @@ package org.apache.commons.scxml;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.model.TransitionTarget;
/**
* Unit tests for testing conflict resolution amongst multiple transitions
@@ -46,12 +42,6 @@ public class TieBreakerTest extends Test
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(TieBreakerTest.class);
- suite.setName("SCXML Executor Tie-Breaker Tests");
- return suite;
- }
-
// Test data
private URL tiebreaker01, tiebreaker02, tiebreaker03, tiebreaker04,
tiebreaker05, tiebreaker06;
@@ -155,9 +145,5 @@ public class TieBreakerTest extends Test
Set<TransitionTarget> currentStates = exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TriggerEventTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml;
import java.util.Map;
import java.util.HashMap;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
/**
* Unit tests {@link org.apache.commons.scxml.TriggerEvent}.
@@ -35,12 +32,6 @@ public class TriggerEventTest extends Te
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(TriggerEventTest.class);
- suite.setName("TriggerEvent Tests");
- return suite;
- }
-
// Test data
private Map<String, String> payloadData;
private Object payload1, payload2;
@@ -104,9 +95,5 @@ public class TriggerEventTest extends Te
assertEquals("TriggerEvent{name=name3,type=3}".hashCode(),
te5.hashCode());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java Mon May 23 16:27:22 2011
@@ -19,11 +19,7 @@ package org.apache.commons.scxml;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.model.TransitionTarget;
/**
* Unit tests {@link org.apache.commons.scxml.SCXMLExecutor}.
@@ -38,12 +34,6 @@ public class WildcardTest extends TestCa
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(WildcardTest.class);
- suite.setName("SCXML Executor Tests, wildcard event match");
- return suite;
- }
-
// Test data
private URL wildcard01, wildcard02;
private SCXMLExecutor exec;
@@ -89,8 +79,4 @@ public class WildcardTest extends TestCa
assertEquals(1, currentStates.size());
assertEquals("state2", currentStates.iterator().next().getId());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java Mon May 23 16:27:22 2011
@@ -22,11 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.env.Tracer;
import org.apache.commons.scxml.env.jexl.JexlContext;
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
@@ -45,12 +41,6 @@ public class WizardsTest extends TestCas
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(WizardsTest.class);
- suite.setName("SCXML Executor Tests, Wizard Style documents");
- return suite;
- }
-
// Test data
private URL wizard01, wizard02;
private SCXMLExecutor exec;
@@ -142,8 +132,4 @@ public class WizardsTest extends TestCas
fail("<cancel> TestEventDispatcher callback unexpected");
}
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractSCXMLListenerTest.java Mon May 23 16:27:22 2011
@@ -16,10 +16,7 @@
*/
package org.apache.commons.scxml.env;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLListener;
import org.apache.commons.scxml.model.State;
@@ -174,14 +171,4 @@ public class AbstractSCXMLListenerTest e
assertFalse("heardOnExit == false", heardOnExit);
assertFalse("heardOnTransition == false", heardOnTransition);
}
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AbstractSCXMLListenerTest.class);
- suite.setName("AbstractSCXMLListener Tests");
- return suite;
- }
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractStateMachineTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractStateMachineTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractStateMachineTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/AbstractStateMachineTest.java Mon May 23 16:27:22 2011
@@ -18,10 +18,7 @@ package org.apache.commons.scxml.env;
import java.net.URL;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
/**
* Unit tests {@link org.apache.commons.scxml.env.AbstractStateMachine}.
@@ -79,14 +76,4 @@ public class AbstractStateMachineTest ex
return barCalled;
}
}
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AbstractStateMachineTest.class);
- suite.setName("AbstractStateMachine Tests");
- return suite;
- }
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/LogUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/LogUtilsTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/LogUtilsTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/LogUtilsTest.java Mon May 23 16:27:22 2011
@@ -16,29 +16,18 @@
*/
package org.apache.commons.scxml.env;
+import junit.framework.TestCase;
+
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.Transition;
import org.apache.commons.scxml.model.TransitionTarget;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
public class LogUtilsTest extends TestCase {
public LogUtilsTest(String testName) {
super(testName);
}
- public static Test suite() {
- return new TestSuite(LogUtilsTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {LogUtilsTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testGetTTPathParentNull() {
TransitionTarget target = new State();
target.setId("ID");
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/SimpleContextTest.java Mon May 23 16:27:22 2011
@@ -19,9 +19,7 @@ package org.apache.commons.scxml.env;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class SimpleContextTest extends TestCase {
@@ -29,15 +27,6 @@ public class SimpleContextTest extends T
super(testName);
}
- public static Test suite() {
- return new TestSuite(SimpleContextTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { SimpleContextTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private SimpleContext context;
@Override
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatchTest.java Mon May 23 16:27:22 2011
@@ -17,9 +17,7 @@
package org.apache.commons.scxml.env;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class StopWatchTest extends TestCase {
@@ -27,15 +25,6 @@ public class StopWatchTest extends TestC
super(testName);
}
- public static Test suite() {
- return new TestSuite(StopWatchTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { StopWatchTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private StopWatch stopWatch;
/**
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/SessionContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/SessionContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/SessionContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/SessionContextTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.env.faces;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class SessionContextTest extends TestCase {
@@ -26,15 +24,6 @@ public class SessionContextTest extends
super(testName);
}
- public static Test suite() {
- return new TestSuite(SessionContextTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {SessionContextTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testIllegalInstance() {
try {
new SessionContext(null);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSBindingsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSBindingsTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSBindingsTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSBindingsTest.java Mon May 23 16:27:22 2011
@@ -24,11 +24,9 @@ import java.util.Map;
import javax.script.Bindings;
import javax.script.SimpleBindings;
-import org.apache.commons.scxml.Context;
-
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+
+import org.apache.commons.scxml.Context;
/**
* JUnit 3 test case for the JSBinding implementation that imports
@@ -67,13 +65,6 @@ public class JSBindingsTest extends Test
junit.textui.TestRunner.main(testCaseName);
}
- /**
- * Returns a JUnit test suite containing the JSBindingsTest class only.
- */
- public static Test suite() {
- return new TestSuite(JSBindingsTest.class);
- }
-
// CONSTRUCTORS
/**
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSContextTest.java Mon May 23 16:27:22 2011
@@ -17,11 +17,9 @@
package org.apache.commons.scxml.env.javascript;
-import org.apache.commons.scxml.env.SimpleContext;
-
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+
+import org.apache.commons.scxml.env.SimpleContext;
/**
* JUnit 3 test case for the JSContext SCXML Context implementation for
@@ -47,14 +45,6 @@ public class JSContextTest extends TestC
junit.textui.TestRunner.main(testCaseName);
}
- /**
- * Returns a JUnit test suite containing the JSContextTest class only.
- *
- */
- public static Test suite() {
- return new TestSuite(JSContextTest.class);
- }
-
// CONSTRUCTORS
/**
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java Mon May 23 16:27:22 2011
@@ -23,9 +23,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
@@ -139,14 +137,6 @@ public class JSEvaluatorTest extends Tes
junit.textui.TestRunner.main(testCaseName);
}
- /**
- * Returns a JUnit test suite containing the JSEvaluatorTest class only.
- *
- */
- public static Test suite() {
- return new TestSuite(JSEvaluatorTest.class);
- }
-
// CONSTRUCTORS
/**
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java Mon May 23 16:27:22 2011
@@ -23,9 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.scxml.Context;
@@ -54,12 +52,6 @@ public class JSExampleTest extends TestC
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(JSExampleTest.class);
- suite.setName("SCXML JavaScript Environment Example Tests");
- return suite;
- }
-
// Test data
private URL example01;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlContextTest.java Mon May 23 16:27:22 2011
@@ -19,9 +19,7 @@ package org.apache.commons.scxml.env.jex
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Builtin;
@@ -31,15 +29,6 @@ public class JexlContextTest extends Tes
super(testName);
}
- public static Test suite() {
- return new TestSuite(JexlContextTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {JexlContextTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testNew() {
JexlContext ctx = new JexlContext();
assertNotNull(ctx);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlEvaluatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlEvaluatorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlEvaluatorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/JexlEvaluatorTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.env.jexl;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
@@ -33,15 +31,6 @@ public class JexlEvaluatorTest extends T
super(testName);
}
- public static Test suite() {
- return new TestSuite(JexlEvaluatorTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {JexlEvaluatorTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testPristine() throws SCXMLExpressionException {
Evaluator eval = new JexlEvaluator();
assertNotNull(eval);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java Mon May 23 16:27:22 2011
@@ -19,9 +19,7 @@ package org.apache.commons.scxml.env.jex
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.SCXMLExecutor;
@@ -36,15 +34,6 @@ public class StaticMethodTest extends Te
super(testName);
}
- public static Test suite() {
- return new TestSuite(StaticMethodTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {StaticMethodTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
/**
* Set up instance variables required by this test case.
*/
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/ELEvaluatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/ELEvaluatorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/ELEvaluatorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/ELEvaluatorTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.env.jsp;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
@@ -33,15 +31,6 @@ public class ELEvaluatorTest extends Tes
super(testName);
}
- public static Test suite() {
- return new TestSuite(ELEvaluatorTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {ELEvaluatorTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testPristine() throws SCXMLExpressionException {
Evaluator eval = new ELEvaluator();
assertNotNull(eval);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/RootContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/RootContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/RootContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/RootContextTest.java Mon May 23 16:27:22 2011
@@ -20,10 +20,7 @@ import java.net.URL;
import javax.servlet.jsp.JspContext;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -40,12 +37,6 @@ public class RootContextTest extends Tes
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(RootContextTest.class);
- suite.setName("SCXML Env RootContext (wraps JSP Context) Tests");
- return suite;
- }
-
// Test data
private URL rootCtxSample;
private ELEvaluator evaluator;
@@ -96,10 +87,5 @@ public class RootContextTest extends Tes
assertEquals(ctx.resolveVariable("bar"), "a brand new value");
assertNotNull(ctx.getVars());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
-
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoContextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoContextTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoContextTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoContextTest.java Mon May 23 16:27:22 2011
@@ -23,14 +23,10 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import junit.framework.Assert;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.env.rhino.RhinoContext;
-import org.apache.commons.scxml.env.rhino.RhinoEvaluator;
import org.mozilla.javascript.Script;
import org.mozilla.javascript.Scriptable;
import org.w3c.dom.Document;
@@ -51,10 +47,6 @@ public class RhinoContextTest extends Te
super(name);
}
- public static Test suite() {
- return new TestSuite(RhinoContextTest.class);
- }
-
protected void setUp() throws Exception {
super.setUp();
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoEvaluatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoEvaluatorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoEvaluatorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoEvaluatorTest.java Mon May 23 16:27:22 2011
@@ -16,15 +16,11 @@
*/
package org.apache.commons.scxml.env.rhino;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
import org.apache.commons.scxml.SCXMLExpressionException;
-import org.apache.commons.scxml.env.rhino.RhinoContext;
-import org.apache.commons.scxml.env.rhino.RhinoEvaluator;
public class RhinoEvaluatorTest extends TestCase {
@@ -35,15 +31,6 @@ public class RhinoEvaluatorTest extends
super(testName);
}
- public static Test suite() {
- return new TestSuite(RhinoEvaluatorTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {RhinoEvaluatorTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testPristine() throws SCXMLExpressionException {
Evaluator eval = new RhinoEvaluator();
assertNotNull(eval);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoExampleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoExampleTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoExampleTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/RhinoExampleTest.java Mon May 23 16:27:22 2011
@@ -19,9 +19,7 @@ package org.apache.commons.scxml.env.rhi
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -34,12 +32,6 @@ public class RhinoExampleTest extends Te
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(RhinoExampleTest.class);
- suite.setName("SCXML Rhino Environment Example Tests");
- return suite;
- }
-
// Test data
private URL example01;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/ServletContextResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/ServletContextResolverTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/ServletContextResolverTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/ServletContextResolverTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.env.servlet;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class ServletContextResolverTest extends TestCase {
@@ -26,15 +24,6 @@ public class ServletContextResolverTest
super(testName);
}
- public static Test suite() {
- return new TestSuite(ServletContextResolverTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {ServletContextResolverTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testIllegalInstance() {
try {
new ServletContextResolver(null);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java Mon May 23 16:27:22 2011
@@ -20,9 +20,7 @@ package org.apache.commons.scxml.env.xpa
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
@@ -43,12 +41,6 @@ public class XPathExampleTest extends Te
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(XPathExampleTest.class);
- suite.setName("SCXML XPath Environment Example Tests");
- return suite;
- }
-
// Test data
private URL example01, example02;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java Mon May 23 16:27:22 2011
@@ -19,9 +19,7 @@ package org.apache.commons.scxml.invoke;
import java.net.URL;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.SCInstance;
import org.apache.commons.scxml.SCXMLExecutor;
@@ -29,8 +27,6 @@ import org.apache.commons.scxml.SCXMLTes
import org.apache.commons.scxml.TriggerEvent;
import org.apache.commons.scxml.env.jexl.JexlContext;
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
-import org.apache.commons.scxml.invoke.Invoker;
-import org.apache.commons.scxml.invoke.InvokerException;
import org.apache.commons.scxml.model.ModelException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -42,15 +38,6 @@ public class InvokeParamNameTest extends
super(testName);
}
- public static Test suite() {
- return new TestSuite(InvokeParamNameTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { InvokeParamNameTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private URL invoker04;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml.invoke;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -47,12 +44,6 @@ public class InvokeTest extends TestCase
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(InvokeTest.class);
- suite.setName("SCXML Executor Tests, wildcard event match");
- return suite;
- }
-
// Test data
private URL invoke01, invoke02, invoke03;
private SCXMLExecutor exec;
@@ -122,9 +113,5 @@ public class InvokeTest extends TestCase
SCXMLTestHelper.fireEvent(exec, "s1.next");
SCXMLTestHelper.fireEvent(exec, "state1.next");
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLReaderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLReaderTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLReaderTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLReaderTest.java Mon May 23 16:27:22 2011
@@ -24,11 +24,7 @@ import java.util.List;
import javax.xml.stream.XMLStreamException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.logging.Log;
import org.apache.commons.scxml.ErrorReporter;
import org.apache.commons.scxml.EventDispatcher;
@@ -58,12 +54,6 @@ public class SCXMLReaderTest extends Tes
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(SCXMLReaderTest.class);
- suite.setName("SCXML Parser Tests");
- return suite;
- }
-
// Test data
private URL microwave01, microwave02, transitions01, prefix01, send01,
microwave03, microwave04, scxmlinitialattr, action01;
@@ -203,11 +193,6 @@ public class SCXMLReaderTest extends Tes
return scxmlAsString;
}
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
-
-
public static class MyAction extends Action implements ExternalContent {
private static final long serialVersionUID = 1L;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLSerializerTest.java Mon May 23 16:27:22 2011
@@ -21,9 +21,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.model.Action;
import org.apache.commons.scxml.model.Assign;
@@ -49,15 +47,6 @@ public class SCXMLSerializerTest extends
super(testName);
}
- public static Test suite() {
- return new TestSuite(SCXMLSerializerTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { SCXMLSerializerTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testSerializeSCXMLNoStates() {
SCXML scxml = new SCXML();
Map<String, String> namespaces = new LinkedHashMap<String, String>();
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLWriterTest.java Mon May 23 16:27:22 2011
@@ -22,9 +22,7 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.model.Parallel;
@@ -37,15 +35,6 @@ public class SCXMLWriterTest extends Tes
super(testName);
}
- public static Test suite() {
- return new TestSuite(SCXMLWriterTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { SCXMLWriterTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testSerializeSCXMLNoStates() throws IOException, XMLStreamException {
SCXML scxml = new SCXML();
Map<String, String> namespaces = new LinkedHashMap<String, String>();
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml.io;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -42,12 +39,6 @@ public class StateSrcTest extends TestCa
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(StateSrcTest.class);
- suite.setName("SCXML Digester Tests");
- return suite;
- }
-
// Test data
private URL src01, src04, src05;
private SCXML scxml;
@@ -112,9 +103,5 @@ public class StateSrcTest extends TestCa
me.getMessage() != null && me.getMessage().contains("URI Fragment in <state src="));
}
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue112Test.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue112Test.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue112Test.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue112Test.java Mon May 23 16:27:22 2011
@@ -23,9 +23,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.scxml.ErrorReporter;
@@ -51,15 +49,6 @@ public class Issue112Test extends TestCa
super(testName);
}
- public static Test suite() {
- return new TestSuite(Issue112Test.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { Issue112Test.class.getName() };
- junit.textui.TestRunner.main(testCaseName);
- }
-
private URL queue01;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml.issues;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -38,12 +35,6 @@ public class Issue62Test extends TestCas
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(Issue62Test.class);
- suite.setName("SCXML Issue 62 Test");
- return suite;
- }
-
private URL test01, test02, test03;
private SCXMLExecutor exec;
@@ -96,9 +87,5 @@ public class Issue62Test extends TestCas
SCXMLTestHelper.assertPostTriggerState(exec, "baz", "s3");
assertTrue(exec.getCurrentStatus().isFinal());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java Mon May 23 16:27:22 2011
@@ -18,10 +18,7 @@ package org.apache.commons.scxml.issues;
import java.net.URL;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -36,12 +33,6 @@ public class Issue64Test extends TestCas
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(Issue64Test.class);
- suite.setName("SCXML Issue 64 Test");
- return suite;
- }
-
private URL works, fails;
private SCXMLExecutor exec;
@@ -74,9 +65,5 @@ public class Issue64Test extends TestCas
exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(fails));
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.model;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class ActionTest extends TestCase {
@@ -26,15 +24,6 @@ public class ActionTest extends TestCase
super(testName);
}
- public static Test suite() {
- return new TestSuite(ActionTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { ActionTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private Action action;
@Override
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java Mon May 23 16:27:22 2011
@@ -18,10 +18,7 @@ package org.apache.commons.scxml.model;
import java.net.URL;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -47,12 +44,6 @@ public class ActionsTest extends TestCas
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(ActionsTest.class);
- suite.setName("SCXML Model Actions Tests");
- return suite;
- }
-
// Test data
private URL actionsSample01, actionsSample02, actionsSample03;
private ELEvaluator evaluator;
@@ -111,9 +102,5 @@ public class ActionsTest extends TestCas
assertEquals("Missed event transition",
"true", (String) ctx.get("eventsent"));
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java Mon May 23 16:27:22 2011
@@ -19,11 +19,7 @@ package org.apache.commons.scxml.model;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
/**
@@ -38,12 +34,6 @@ public class AssignTest extends TestCase
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(AssignTest.class);
- suite.setName("SCXML Model Assign Tests");
- return suite;
- }
-
// Test data
private URL assign01, assign02;
private SCXMLExecutor exec;
@@ -86,9 +76,5 @@ public class AssignTest extends TestCase
assertEquals("assign3", currentStates.iterator().next().getId());
assertTrue(exec.getCurrentStatus().isFinal());
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java Mon May 23 16:27:22 2011
@@ -20,10 +20,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.env.jsp.ELEvaluator;
@@ -34,15 +31,6 @@ public class CustomActionTest extends Te
super(testName);
}
- public static Test suite() {
- return new TestSuite(CustomActionTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { CustomActionTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private URL hello01, custom01, external01, override01, payload01, payload02;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java Mon May 23 16:27:22 2011
@@ -21,11 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.TriggerEvent;
@@ -45,12 +41,6 @@ public class DatamodelTest extends TestC
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(DatamodelTest.class);
- suite.setName("SCXML Executor Tests");
- return suite;
- }
-
// Test data
private URL datamodel01jexl, datamodel02jexl, datamodel04jexl, datamodel05jexl, datamodel01jsp, datamodel02jsp;
private SCXMLExecutor exec01, exec02;
@@ -187,9 +177,5 @@ public class DatamodelTest extends TestC
exec.triggerEvents(evts);
return exec.getCurrentStatus().getStates();
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml.model;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -35,15 +32,6 @@ public class HistoryTest extends TestCas
super(testName);
}
- public static Test suite() {
- return new TestSuite(HistoryTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { HistoryTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
// Test data
private History history;
private URL shallow01, deep01, defaults01, parallel01;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ParallelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ParallelTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ParallelTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ParallelTest.java Mon May 23 16:27:22 2011
@@ -20,10 +20,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.Builtin;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
@@ -35,15 +32,6 @@ public class ParallelTest extends TestCa
super(testName);
}
- public static Test suite() {
- return new TestSuite(ParallelTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { ParallelTest.class.getName() };
- junit.textui.TestRunner.main(testCaseName);
- }
-
// Test data
private URL parallel01, parallel02, parallel03;
private SCXMLExecutor exec;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/PathTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.model;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class PathTest extends TestCase {
@@ -26,15 +24,6 @@ public class PathTest extends TestCase {
super(testName);
}
- public static Test suite() {
- return new TestSuite(PathTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { PathTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
public void testConstructorNull() {
Path path = new Path(null, null);
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java Mon May 23 16:27:22 2011
@@ -19,10 +19,7 @@ package org.apache.commons.scxml.model;
import java.net.URL;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.env.javascript.JSEvaluator;
@@ -36,15 +33,6 @@ public class ScriptTest extends TestCase
super(testName);
}
- public static Test suite() {
- return new TestSuite(ScriptTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = {ScriptTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
/**
* Set up instance variables required by this test case.
*/
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java Mon May 23 16:27:22 2011
@@ -22,9 +22,7 @@ import java.util.List;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class StateTest extends TestCase {
@@ -32,15 +30,6 @@ public class StateTest extends TestCase
super(testName);
}
- public static Test suite() {
- return new TestSuite(StateTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { StateTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
// Test data
private State state;
private URL state01;
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java Mon May 23 16:27:22 2011
@@ -20,11 +20,7 @@ import java.net.URL;
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.TriggerEvent;
@@ -43,12 +39,6 @@ public class StatelessModelTest extends
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite(StatelessModelTest.class);
- suite.setName("SCXML Executor Tests");
- return suite;
- }
-
// Test data
private URL stateless01jexl, stateless01jsp, stateless01par;
private SCXML scxml01jexl, scxml01jsp, scxml01par, scxml02par;
@@ -257,9 +247,5 @@ public class StatelessModelTest extends
exec.triggerEvents(evts);
return exec.getCurrentStatus().getStates();
}
-
- public static void main(String args[]) {
- TestRunner.run(suite());
- }
}
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/TransitionTest.java Mon May 23 16:27:22 2011
@@ -16,9 +16,7 @@
*/
package org.apache.commons.scxml.model;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class TransitionTest extends TestCase {
@@ -26,15 +24,6 @@ public class TransitionTest extends Test
super(testName);
}
- public static Test suite() {
- return new TestSuite(TransitionTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { TransitionTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private Transition transition;
@Override
Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java?rev=1126569&r1=1126568&r2=1126569&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/TransitionTargetComparatorTest.java Mon May 23 16:27:22 2011
@@ -18,10 +18,7 @@ package org.apache.commons.scxml.semanti
import java.util.Comparator;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.scxml.model.Parallel;
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.TransitionTarget;
@@ -32,15 +29,6 @@ public class TransitionTargetComparatorT
super(testName);
}
- public static Test suite() {
- return new TestSuite(TransitionTargetComparatorTest.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { TransitionTargetComparatorTest.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
private Comparator<TransitionTarget> comparator;
@Override