Commit bfcc34e0 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge remote-tracking branch 'origin/master' into 3773



Conflicts:
	org.fortiss.af3.phoenix.product.tests/tests-src/org/fortiss/af3/phoenix/product/tests/AllTests.java
Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parents a18fa7a3 9d931e53
**/target/
/*/bin/
/*/build/
/*/generated-src/
/*/target/
/target/
*.rej
.DS_Store
._.DS_Store
......@@ -25,12 +25,14 @@ import org.junit.runners.Suite.SuiteClasses;
*/
@RunWith(Suite.class)
// @CodeFormatterOff
@SuiteClasses({ test.org.fortiss.af3.expression.AllTests.class, test.org.fortiss.af3.component.AllTests.class,
test.org.fortiss.af3.exploration.AllSMTTests.class,
test.org.fortiss.af3.state.ui.AllTests.class, test.org.fortiss.af3.rcp.application.AllTests.class, // CCodeEquivalenceTest
@SuiteClasses({ test.org.fortiss.af3.expression.AllTests.class,
test.org.fortiss.af3.component.AllTests.class,
test.org.fortiss.af3.state.ui.AllTests.class,
test.org.fortiss.af3.rcp.application.AllTests.class, // CCodeEquivalenceTest
test.org.fortiss.af3.state.AllTests.class, // testInitializeSimulator and testIncorrectConnections
test.org.fortiss.af3.tools.AllTests.class, // make shell gcc don't work on my comp
test.org.fortiss.af3.testing.random.AllTests.class, test.org.fortiss.af3.testing.AllTests.class })
test.org.fortiss.af3.testing.random.AllTests.class,
test.org.fortiss.af3.testing.AllTests.class })
// @CodeFormatterOn
public class AllTests {
// empty class
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment