Permalink
Browse files

Refactoring testbench

  • Loading branch information...
fisakov committed Sep 2, 2010
1 parent 3e91971 commit 3f7c5effb705c39d6e30d12fc24912f8dc2623fe
Showing with 1,179 additions and 1,193 deletions.
  1. +1 −1 .idea/ant.xml
  2. +3 −7 .idea/inspectionProfiles/profiles_settings.xml
  3. +1 −1 .idea/modules.xml
  4. +0 −11 .idea/projectCodeStyle.xml
  5. +28 −0 .idea/runConfigurations/BrokenReferencesTest.xml
  6. +2 −2 .idea/runConfigurations/GlobalTestSuite.xml
  7. +28 −0 .idea/runConfigurations/ProjectTest.xml
  8. +0 −393 AllTests/source/jetbrains/mps/test/BrokenReferencesTestHelper.java
  9. +0 −657 AllTests/source/jetbrains/mps/test/ProjectTestHelper.java
  10. +17 −8 core/generator/test/jetbrains/mps/generator/test/ParallelPoolTest.java
  11. +1 −0 core/runtime/runtime.iml
  12. 0 {AllTests → testbench}/README.txt
  13. 0 {AllTests → testbench}/global_tests_patterns.txt
  14. 0 {AllTests → testbench}/make_all_modules.xml
  15. 0 {AllTests → testbench}/run_all_tests.xml
  16. +192 −0 testbench/source/jetbrains/mps/testbench/BrokenReferencesTestHelper.java
  17. +182 −0 testbench/source/jetbrains/mps/testbench/GenerationCycle.java
  18. +170 −0 testbench/source/jetbrains/mps/testbench/ModelsExtractor.java
  19. +1 −1 {AllTests/source/jetbrains/mps/test → testbench/source/jetbrains/mps/testbench}/MpsMakeHelper.java
  20. +301 −0 testbench/source/jetbrains/mps/testbench/ProjectTestHelper.java
  21. +98 −0 testbench/source/jetbrains/mps/testbench/Testbench.java
  22. +1 −4 ...source/jetbrains/mps → testbench/source/jetbrains/mps/testbench}/junit/DelegatingRunNotifier.java
  23. +3 −1 ...etbrains/mps → testbench/source/jetbrains/mps/testbench}/junit/UncleanTestExecutionException.java
  24. +53 −25 ...s/source/jetbrains/mps → testbench/source/jetbrains/mps/testbench}/junit/WatchingRunNotifier.java
  25. +1 −5 ...ns/mps/junit → testbench/source/jetbrains/mps/testbench/junit/runners}/FilepathParameterized.java
  26. +9 −2 ...ns/mps/junit → testbench/source/jetbrains/mps/testbench/junit/runners}/WatchingParameterized.java
  27. +9 −2 .../jetbrains/mps/junit → testbench/source/jetbrains/mps/testbench/junit/runners}/WatchingSuite.java
  28. +2 −2 .../junit/CountingAppender.java → testbench/source/jetbrains/mps/testbench/util/CachingAppender.java
  29. +52 −29 ...eCountingPrintStream.java → testbench/source/jetbrains/mps/testbench/util/CachingPrintStream.java
  30. +1 −1 ...ts/source/jetbrains/mps/test → testbench/source/jetbrains/mps/testbench/util}/FilesCollector.java
  31. +1 −1 {AllTests/source/jetbrains/mps/junit → testbench/source/jetbrains/mps/testbench/util}/Output.java
  32. +0 −17 AllTests/AllTests.iml → testbench/testbench.iml
  33. +12 −9 {AllTests → testbench}/tests/BrokenReferencesTest.java
  34. +3 −6 {AllTests → testbench}/tests/GlobalTestSuite.java
  35. +7 −8 {AllTests → testbench}/tests/ProjectTest.java
View
@@ -18,7 +18,7 @@
<maximumStackSize value="32" />
<properties />
</buildFile>
- <buildFile url="file://$PROJECT_DIR$/AllTests/make_all_modules.xml">
+ <buildFile url="file://$PROJECT_DIR$/testbench/make_all_modules.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
@@ -1,11 +1,7 @@
<component name="InspectionProjectProfileManager">
<settings>
- <list size="5">
- <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" />
- <item index="1" class="java.lang.String" itemvalue="INFO" />
- <item index="2" class="java.lang.String" itemvalue="TYPO" />
- <item index="3" class="java.lang.String" itemvalue="WARNING" />
- <item index="4" class="java.lang.String" itemvalue="ERROR" />
- </list>
+ <option name="PROJECT_PROFILE" value="Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
</settings>
</component>
View
@@ -2,7 +2,6 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/AllTests/AllTests.iml" filepath="$PROJECT_DIR$/AllTests/AllTests.iml" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/closures/Closures.iml" filepath="$PROJECT_DIR$/core/baseLanguage/closures/Closures.iml" group="core/baseLanguage/closures" />
<module fileurl="file://$PROJECT_DIR$/core/baseLanguage/closures/runtime/Closures-runtime.iml" filepath="$PROJECT_DIR$/core/baseLanguage/closures/runtime/Closures-runtime.iml" group="core/baseLanguage/closures" />
<module fileurl="file://$PROJECT_DIR$/MPS.iml" filepath="$PROJECT_DIR$/MPS.iml" />
@@ -74,6 +73,7 @@
<module fileurl="file://$PROJECT_DIR$/core/languageDesign/stubs/stubs.iml" filepath="$PROJECT_DIR$/core/languageDesign/stubs/stubs.iml" group="core/languageDesign" />
<module fileurl="file://$PROJECT_DIR$/core/languageDesign/test/test.iml" filepath="$PROJECT_DIR$/core/languageDesign/test/test.iml" group="core/languageDesign" />
<module fileurl="file://$PROJECT_DIR$/testMaterial/testRefactoring/testRefactoring.iml" filepath="$PROJECT_DIR$/testMaterial/testRefactoring/testRefactoring.iml" group="core/languageDesign/refactoring" />
+ <module fileurl="file://$PROJECT_DIR$/testbench/testbench.iml" filepath="$PROJECT_DIR$/testbench/testbench.iml" />
<module fileurl="file://$PROJECT_DIR$/core/languageDesign/textGen/textgen.iml" filepath="$PROJECT_DIR$/core/languageDesign/textGen/textgen.iml" group="core/languageDesign" />
<module fileurl="file://$PROJECT_DIR$/core/languageDesign/typesystem/typesystem.iml" filepath="$PROJECT_DIR$/core/languageDesign/typesystem/typesystem.iml" group="core/languageDesign" />
<module fileurl="file://$PROJECT_DIR$/platform/uiLanguage/uiLanguage.iml" filepath="$PROJECT_DIR$/platform/uiLanguage/uiLanguage.iml" group="platform/uiLanguage" />
View
@@ -12,7 +12,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<option name="FIELD_NAME_PREFIX" value="my" />
@@ -28,7 +27,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
@@ -38,7 +36,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="2" />
@@ -48,7 +45,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
@@ -58,7 +54,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
@@ -68,7 +63,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="php">
<option name="INDENT_SIZE" value="4" />
@@ -78,7 +72,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="sql">
<option name="INDENT_SIZE" value="2" />
@@ -88,7 +81,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="txt">
<option name="INDENT_SIZE" value="4" />
@@ -98,7 +90,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
<option name="INDENT_SIZE" value="2" />
@@ -108,7 +99,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="yml">
<option name="INDENT_SIZE" value="2" />
@@ -118,7 +108,6 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="BrokenReferencesTest" type="JUnit" factoryName="JUnit">
+ <module name="testbench" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="PACKAGE_NAME" value="" />
+ <option name="MAIN_CLASS_NAME" value="BrokenReferencesTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea -Xss1024k -Xmx1536m -XX:MaxPermSize=128m -XX:+HeapDumpOnOutOfMemoryError -client " />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myExternalizedOptions" value="&#10;additional-options2=onexit\=snapshot&#10;" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method>
+ <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/AllTests/make_all_modules.xml" target="make" />
+ </method>
+ </configuration>
+</component>
@@ -1,13 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="GlobalTestSuite" type="JUnit" factoryName="JUnit">
- <module name="AllTests" />
+ <module name="testbench" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="GlobalTestSuite" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea -Xss1024k -Xmx1024m -XX:MaxPermSize=128m -XX:+HeapDumpOnOutOfMemoryError -client " />
+ <option name="VM_PARAMETERS" value="-ea -Xss1024k -Xmx1536m -XX:MaxPermSize=128m -XX:+HeapDumpOnOutOfMemoryError -client " />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ProjectTest" type="JUnit" factoryName="JUnit">
+ <module name="testbench" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="PACKAGE_NAME" value="" />
+ <option name="MAIN_CLASS_NAME" value="ProjectTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea -Xss1024k -Xmx1536m -XX:MaxPermSize=128m -XX:+HeapDumpOnOutOfMemoryError -client " />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myExternalizedOptions" value="&#10;additional-options2=onexit\=snapshot&#10;" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method>
+ <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/AllTests/make_all_modules.xml" target="make" />
+ </method>
+ </configuration>
+</component>
Oops, something went wrong.

0 comments on commit 3f7c5ef

Please sign in to comment.