Repository: flex-tlf Updated Branches: refs/heads/develop 7b546ef77 -> 92989fb0c
Add property minimalTests to make MinimalTestsSuite runnable Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/db7894f9 Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/db7894f9 Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/db7894f9 Branch: refs/heads/develop Commit: db7894f979d22438d19127c4fdcf2d7f24e2ff61 Parents: 7b546ef Author: piotrz <piotrzarzyck...@gmail.com> Authored: Sun Oct 26 21:49:29 2014 +0100 Committer: piotrz <piotrzarzyck...@gmail.com> Committed: Sun Oct 26 21:49:29 2014 +0100 ---------------------------------------------------------------------- automation_apps/src/UnitTest/TestDescriptorRunner.mxml | 10 ++++------ automation_apps/src/VellumUnit.mxml | 7 ++----- build.properties | 1 + build.xml | 1 + 4 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/db7894f9/automation_apps/src/UnitTest/TestDescriptorRunner.mxml ---------------------------------------------------------------------- diff --git a/automation_apps/src/UnitTest/TestDescriptorRunner.mxml b/automation_apps/src/UnitTest/TestDescriptorRunner.mxml index 7d7253c..c9edada 100644 --- a/automation_apps/src/UnitTest/TestDescriptorRunner.mxml +++ b/automation_apps/src/UnitTest/TestDescriptorRunner.mxml @@ -35,14 +35,12 @@ core.addListener(new CIListener()); core.addListener(testRunner); - if (isMinimalTests) - { + CONFIG::minimaltests { core.run(new MinimalTestsSuite()); + return; } - else - { - core.run(new AllTestsSuite()); - } + + core.run(new AllTestsSuite()); } ]]> </fx:Script> http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/db7894f9/automation_apps/src/VellumUnit.mxml ---------------------------------------------------------------------- diff --git a/automation_apps/src/VellumUnit.mxml b/automation_apps/src/VellumUnit.mxml index 7478275..9f41b3b 100644 --- a/automation_apps/src/VellumUnit.mxml +++ b/automation_apps/src/VellumUnit.mxml @@ -161,7 +161,7 @@ Font.registerFont(arialFontRoundedMTBold); */ } - private function loadAndRunTests(isMinimialTests:Boolean = false):void + private function loadAndRunTests():void { var config:TestConfig = TestConfig.getInstance(); config.baseURL = normalizedURL; @@ -188,7 +188,7 @@ testRunDate = MakeMySQLDate(new Date()); - testRunner.startTest(isMinimialTests); + testRunner.startTest(); } private var xmlRoot:XML = null; @@ -353,9 +353,6 @@ private function startRangeTests():void { useTestSelectDialog = true; // we select the range in the XML for this dialog - /* if (testXMLStore == null) - FileRepository.readFile(normalizedURL, "../../test/testSuites.xml", onSuiteFileRead, onSuiteFileReadError, onSuiteFileSecurityError, true); - else */ loadAndRunTests(); } http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/db7894f9/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index a698964..925d779 100644 --- a/build.properties +++ b/build.properties @@ -27,6 +27,7 @@ src.depend = true src.debug = on forkValue = true +minimalTests = false # JVM options for <compc> and <mxmlc> tasks jvm.args = ${local.d32} -Xms64m -Xmx1024m -XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -ea -Dapple.awt.UIElement=true http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/db7894f9/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index e6c7eaf..6feb0e3 100644 --- a/build.xml +++ b/build.xml @@ -349,6 +349,7 @@ <define name="CONFIG::debug" value="${dbg}"/> <define name="CONFIG::release" value="${rel}"/> + <define name="CONFIG::minimaltests" value="${minimalTests}"/> </mxmlc> <html-wrapper title="VellumUnit" file="VellumUnit.html" application="VellumUnit"
