Repository: flex-flexunit Updated Branches: refs/heads/feature/maven-migration [created] e29a1a393
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4Turnkey/src/flexUnitTests/flexUnit1/framework/TestTestListener.as ---------------------------------------------------------------------- diff --git a/FlexUnit4Turnkey/src/flexUnitTests/flexUnit1/framework/TestTestListener.as b/FlexUnit4Turnkey/src/flexUnitTests/flexUnit1/framework/TestTestListener.as index 6519751..2ce7f32 100644 --- a/FlexUnit4Turnkey/src/flexUnitTests/flexUnit1/framework/TestTestListener.as +++ b/FlexUnit4Turnkey/src/flexUnitTests/flexUnit1/framework/TestTestListener.as @@ -1,29 +1 @@ -/* - Copyright (c) 2008. Adobe Systems Incorporated. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of Adobe Systems Incorporated nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ -package flexUnitTests.flexUnit1.framework { import flexunit.framework.*; public class TestTestListener extends TestCase implements TestListener { public function TestTestListener(name : String = null) { super(name); } public function addError( test : Test, e : Error ) : void { errorCount++; } //------------------------------------------------------------------------------ public function addFailure( test : Test , e : AssertionFailedError ) : void { failureCount++; } //------------------------------------------------------------------------------ public function startTest( test : Test ) : void { startCount++; } //------------------------------------------------------------------------------ public function endTest( test : Test ) : void { endCount++; } //---------------------------------------------------------------------- -------- override public function setUp() : void { result = new TestResult(); result.addListener( TestListener(this) ); startCount = 0; endCount = 0; failureCount = 0; errorCount = 0; } //------------------------------------------------------------------------------ public function testError():void { var test : TestCase = new ErrorTestCase( "throwError" ) test.runWithResult( result ); Assert.assertEquals("error", 1, errorCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("failure", 0, failureCount); } //------------------------------------------------------------------------------ public function testFailure():void { var test : TestCase = new FailureTestCase( "testFailure" ) test.runWithResult( result ); Assert.assertEquals("failure", 1, failureCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("er ror", 0, errorCount); } //------------------------------------------------------------------------------ public function testStartStop():void { var test : TestCase = new SuccessTestCase( "testSuccess" ) test.runWithResult( result ); Assert.assertEquals("start", 1, startCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("error", 0, errorCount); Assert.assertEquals("failure", 0, failureCount); } //------------------------------------------------------------------------------ private var result : TestResult; private var startCount : Number; private var endCount : Number; private var failureCount : Number; private var errorCount : Number; } } \ No newline at end of file +/* Copyright (c) 2008. Adobe Systems Incorporated. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Adobe Systems Incorporated nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANT ABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package flexUnitTests.flexUnit1.framework { import flexunit.framework.*; public class TestTestListener extends TestCase implements TestListener { public function TestTestListener(name : String = null) { super(name); } public function addError( test : Test, e : Error ) : void { errorCount++; } //-------------------------- ---------------------------------------------------- public function addFailure( test : Test , e : AssertionFailedError ) : void { failureCount++; } //------------------------------------------------------------------------------ public function startTest( test : Test ) : void { startCount++; } //------------------------------------------------------------------------------ public function endTest( test : Test ) : void { endCount++; } //------------------------------------------------------------------------------ override public function setUp() : void { result = new TestResult(); result.addListener( TestListener(this) ); startCount = 0; endCount = 0; failureCount = 0; errorCount = 0; } //------------------------------------------------------------------------------ public function testError():void { var test : TestCas e = new ErrorTestCase( "throwError" ) test.runWithResult( result ); Assert.assertEquals("error", 1, errorCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("failure", 0, failureCount); } //------------------------------------------------------------------------------ public function testFailure():void { var test : TestCase = new FailureTestCase( "testFailure" ) test.runWithResult( result ); Assert.assertEquals("failure", 1, failureCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("error", 0, errorCount); } //------------------------------------------------------------------------------ public function testStartStop():void { var test : TestCase = new SuccessTestCase( "testSuccess" ) test.runWithResult( result ); Assert.assertEquals("start", 1, startCount ); Assert.assertEquals("end", 1, endCount ); Assert.assertEquals("error" , 0, errorCount); Assert.assertEquals("failure", 0, failureCount); } //------------------------------------------------------------------------------ private var result : TestResult; private var startCount : Number; private var endCount : Number; private var failureCount : Number; private var errorCount : Number; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4Turnkey/src/flexUnitTests/flexUnit4/suites/frameworkSuite/cases/mxml/SimpleMXMLLoginComponent.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4Turnkey/src/flexUnitTests/flexUnit4/suites/frameworkSuite/cases/mxml/SimpleMXMLLoginComponent.mxml b/FlexUnit4Turnkey/src/flexUnitTests/flexUnit4/suites/frameworkSuite/cases/mxml/SimpleMXMLLoginComponent.mxml index e6e9df0..e4b46d7 100644 --- a/FlexUnit4Turnkey/src/flexUnitTests/flexUnit4/suites/frameworkSuite/cases/mxml/SimpleMXMLLoginComponent.mxml +++ b/FlexUnit4Turnkey/src/flexUnitTests/flexUnit4/suites/frameworkSuite/cases/mxml/SimpleMXMLLoginComponent.mxml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml"; layout="vertical" title="Please Login" height="168"> - <mx:Metadata> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<mx:Panel xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; + layout="vertical" title="Please Login" height="168"> + <fx:Metadata> [Event('loginRequested')] - </mx:Metadata> + </fx:Metadata> - <mx:Script> + <fx:Script> <![CDATA[ import mx.validators.Validator; protected function handleCancelClick( event:Event ):void { @@ -47,12 +49,14 @@ public function setSomeValue( value:String ):void { } ]]> - </mx:Script> - - <mx:Array id="validators"> - <mx:StringValidator id="sv1" required="true" minLength="1" maxLength="8" source="{usernameTI}" property="text"/> - <mx:StringValidator id="sv2" required="true" minLength="6" maxLength="10" source="{passwordTI}" property="text"/> - </mx:Array> + </fx:Script> + + <fx:Declarations> + <fx:Array id="validators"> + <mx:StringValidator id="sv1" required="true" minLength="1" maxLength="8" source="{usernameTI}" property="text"/> + <mx:StringValidator id="sv2" required="true" minLength="6" maxLength="10" source="{passwordTI}" property="text"/> + </fx:Array> + </fx:Declarations> <mx:Form width="100%"> <mx:FormItem label="Username" required="true"> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4Turnkey/src/org/hamcrest/mxml/core/HamcrestMxmlExample.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4Turnkey/src/org/hamcrest/mxml/core/HamcrestMxmlExample.mxml b/FlexUnit4Turnkey/src/org/hamcrest/mxml/core/HamcrestMxmlExample.mxml index 19c72c6..da7c28e 100644 --- a/FlexUnit4Turnkey/src/org/hamcrest/mxml/core/HamcrestMxmlExample.mxml +++ b/FlexUnit4Turnkey/src/org/hamcrest/mxml/core/HamcrestMxmlExample.mxml @@ -18,7 +18,7 @@ <mx:Canvas height="300" width="400" - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" > <security> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml index 138158b..6a457b1 100644 --- a/FlexUnit4UIListener/build.xml +++ b/FlexUnit4UIListener/build.xml @@ -116,8 +116,8 @@ <java jar="${FLEX_HOME}/lib/compc.jar" fork="true" failonerror="true"> <jvmarg value="-Xmx256M" /> <arg line="+flexlib '${FLEX_HOME}/frameworks'" /> - <arg line="-compatibility-version=3.0.0" /> - <arg line="-namespace http://www.adobe.com/2006/mxml '${FLEX_HOME}/frameworks/mxml-manifest.xml'" /> + <arg line="-namespace http://ns.adobe.com/mxml/2009 '${FLEX_HOME}/frameworks/mxml-2009-manifest.xml'" /> + <arg line="-namespace library://ns.adobe.com/flex/mx '${FLEX_HOME}/frameworks/mx-manifest.xml'" /> <arg line="-namespace ${build.namespace} ${src.loc}/FlexUnit4UIRunner-manifest.xml" /> <arg line="-include-namespaces ${build.namespace}" /> <arg line="-include-classes ${src.class-list}" /> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/pom.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/pom.xml b/FlexUnit4UIListener/pom.xml new file mode 100644 index 0000000..5e01dff --- /dev/null +++ b/FlexUnit4UIListener/pom.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexunit</groupId> + <artifactId>flexunit-parent</artifactId> + <version>4.3.0-SNAPSHOT</version> + </parent> + + <artifactId>FlexUnit4UIListener</artifactId> + <version>4.3.0-SNAPSHOT</version> + <packaging>swc</packaging> + + <name>Apache Flex - FlexUnit: FlexUnit4UIListener</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>flexjs-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <namespaces> + <namespace> + <uri>http://www.adobe.com/2009/flexUnitUIRunner</uri> + <manifest>${project.basedir}/src/FlexUnit4UIRunner-manifest.xml</manifest> + </namespace> + </namespaces> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexunit</groupId> + <artifactId>FlexUnit4</artifactId> + <version>4.3.0-SNAPSHOT</version> + <type>swc</type> + </dependency> + <dependency> + <groupId>org.apache.flex.framework.themes</groupId> + <artifactId>halo</artifactId> + <version>${flex.version}</version> + <type>swc</type> + <scope>theme</scope> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/TestRunnerBase.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/TestRunnerBase.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/TestRunnerBase.mxml index 06c1b16..063ff85 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/TestRunnerBase.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/TestRunnerBase.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:Panel - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns="*" xmlns:data="org.flexunit.flexui.data.*" xmlns:controls="org.flexunit.flexui.controls.*" @@ -44,10 +45,11 @@ implements="org.flexunit.runner.notification.ITemporalRunListener" creationComplete="handleCreationComplete()" > - <mx:Metadata> + <fx:Metadata> [Event( name="testsComplete", type="org.flexunit.flexui.event.TestsCompleteEvent")] - </mx:Metadata> - <mx:Style> + </fx:Metadata> + + <fx:Style> /* Class-selectors are the only way to apply styles to components */ .flexUnitApplication { backgroundColor: #3872b2; @@ -322,9 +324,9 @@ scaleGridLeft="8", scaleGridTop="1", scaleGridRight="270", scaleGridBottom="17" ); } - </mx:Style> + </fx:Style> - <mx:Script> + <fx:Script> <![CDATA[ import flash.net.navigateToURL; @@ -505,20 +507,22 @@ } ]]> - </mx:Script> + </fx:Script> + + <fx:Declarations> + <data:TestRunnerBasePresentationModel + id="model" + rowSelectedChanged="updateRowSummaryToDisplay()" + testSuiteRunDurationChanged="rightHandSide.updateRunDuration()" + totalErrorsChanged="rightHandSide.updateTotalErrorUI()" + totalFailuresChanged="rightHandSide.updateTotalFailureUI()" + totalIgnoredChanged="rightHandSide.updateTotalIgnoredUI()" + progressChanged="rightHandSide.onTestEnd()" + filterEnableChanged="leftHandSide.updateFilterSectionEnable()" + filterChanged="leftHandSide.refreshTree()" + /> + </fx:Declarations> - <data:TestRunnerBasePresentationModel - id="model" - rowSelectedChanged="updateRowSummaryToDisplay()" - testSuiteRunDurationChanged="rightHandSide.updateRunDuration()" - totalErrorsChanged="rightHandSide.updateTotalErrorUI()" - totalFailuresChanged="rightHandSide.updateTotalFailureUI()" - totalIgnoredChanged="rightHandSide.updateTotalIgnoredUI()" - progressChanged="rightHandSide.onTestEnd()" - filterEnableChanged="leftHandSide.updateFilterSectionEnable()" - filterChanged="leftHandSide.refreshTree()" - /> - <mx:HBox verticalAlign="bottom" horizontalGap="0"> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/LeftHandSide.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/LeftHandSide.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/LeftHandSide.mxml index 42c7cf9..bde4193 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/LeftHandSide.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/LeftHandSide.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:controls="org.flexunit.flexui.controls.*" xmlns:left="org.flexunit.flexui.controls.left.*" width="100%" height="100%" @@ -38,7 +39,7 @@ verticalGap="2" > - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.data.AbstractRowData; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -88,7 +89,7 @@ } ]]> - </mx:Script> + </fx:Script> <controls:Title text="{ FlexUnitLabels.TEST_CASES }" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/RightHandSide.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/RightHandSide.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/RightHandSide.mxml index 4256388..53b6a88 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/RightHandSide.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/RightHandSide.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:right="org.flexunit.flexui.controls.right.*" xmlns:controls="org.flexunit.flexui.controls.*" minWidth="400" @@ -38,7 +39,7 @@ verticalGap="2" > - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.data.TestFunctionRowData; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -127,7 +128,7 @@ } ]]> - </mx:Script> + </fx:Script> <!-- TEST SUITE SECTION --> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/Title.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/Title.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/Title.mxml index 241436a..408bf9e 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/Title.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/Title.mxml @@ -28,13 +28,14 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:Label - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:filters="flash.filters.*" styleName="h1"> <mx:filters> - <flash.filters:DropShadowFilter - xmlns:flash.filters="flash.filters.*" + <filters:DropShadowFilter distance="1" angle="90" color="0xffffff" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/FilterArea.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/FilterArea.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/FilterArea.mxml index ce882d7..ab10d62 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/FilterArea.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/FilterArea.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:controls="org.flexunit.flexui.controls.*" width="100%" verticalScrollPolicy="off" @@ -36,14 +37,14 @@ horizontalAlign="right" creationComplete="handleCreateComplete()" verticalGap="0"> - <mx:Metadata> + <fx:Metadata> [Event( name="filterChanged", type="flash.events.Event")] [Event( name="filterTextChanged", type="flash.events.Event")] [Event( name="filterResultChanged", type="flash.events.Event")] [Event( name="filterAssertionChanged", type="flash.events.Event")] - </mx:Metadata> + </fx:Metadata> - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.controls.left.events.SearchBarEvent; @@ -132,7 +133,7 @@ } ]]> - </mx:Script> + </fx:Script> <mx:HBox width="100%" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/TestCasesTree.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/TestCasesTree.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/TestCasesTree.mxml index f5da3ca..4971682 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/TestCasesTree.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/left/TestCasesTree.mxml @@ -28,14 +28,15 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; width="100%" height="100%" verticalGap="0" verticalScrollPolicy="off" horizontalScrollPolicy="off"> - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.data.AbstractRowData; @@ -125,18 +126,20 @@ } ]]> - </mx:Script> - - <mx:Glow - id="filterChangedEffect" - duration="500" - color="#DDDDDD" - alphaFrom="1.0" alphaTo="0" - blurXFrom="0.0" blurXTo="30.0" - blurYFrom="0.0" blurYTo="10.0" - strength="5" + </fx:Script> + + <fx:Declarations> + <mx:Glow + id="filterChangedEffect" + duration="500" + color="#DDDDDD" + alphaFrom="1.0" alphaTo="0" + blurXFrom="0.0" blurXTo="30.0" + blurYFrom="0.0" blurYTo="10.0" + strength="5" /> - + </fx:Declarations> + <mx:HBox id="treeHeader" width="100%" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/RunningTests.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/RunningTests.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/RunningTests.mxml index ec3d3b5..f143c7e 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/RunningTests.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/RunningTests.mxml @@ -28,11 +28,12 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; - width="100%" + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; + width="100%" height="110"> - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -68,7 +69,7 @@ } ]]> - </mx:Script> + </fx:Script> <mx:Label text="{ FlexUnitLabels.RUNNING_TESTS }" color="#8f8f8f" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/SelectedTestCaseForm.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/SelectedTestCaseForm.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/SelectedTestCaseForm.mxml index c71647f..71d8092 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/SelectedTestCaseForm.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/SelectedTestCaseForm.mxml @@ -28,13 +28,14 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:Form - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; width="100%" styleName="flexUnitForm" minWidth="190" > - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -109,7 +110,7 @@ } ]]> - </mx:Script> + </fx:Script> <mx:FormItem styleName="flexUnitFormItemLabel" label="{ FlexUnitLabels.CASE }" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/StackTraceContainer.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/StackTraceContainer.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/StackTraceContainer.mxml index 82dd1af..79ea3bb 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/StackTraceContainer.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/StackTraceContainer.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:VBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; width="100%" height="100%" verticalGap="-2" @@ -36,7 +37,7 @@ horizontalScrollPolicy="off" > - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -60,7 +61,7 @@ } ]]> - </mx:Script> + </fx:Script> <mx:HRule styleName="flexUnitHRule" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/TestsComplete.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/TestsComplete.mxml b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/TestsComplete.mxml index b0ff2d2..0e081cf 100644 --- a/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/TestsComplete.mxml +++ b/FlexUnit4UIListener/src/org/flexunit/flexui/controls/right/TestsComplete.mxml @@ -28,7 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. --> <mx:HBox - xmlns:mx="http://www.adobe.com/2006/mxml"; + xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; width="100%" verticalAlign="middle" horizontalAlign="left" @@ -36,7 +37,7 @@ horizontalScrollPolicy="off" verticalScrollPolicy="off"> - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.flexui.controls.FlexUnitLabels; import org.flexunit.flexui.data.TestRunnerBasePresentationModel; @@ -109,7 +110,7 @@ } } ]]> - </mx:Script> + </fx:Script> <mx:Image id="result" http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/FlexUnit4UIListener/test/flexunit/flexui/FlexUnitTestRunnerUI.mxml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/test/flexunit/flexui/FlexUnitTestRunnerUI.mxml b/FlexUnit4UIListener/test/flexunit/flexui/FlexUnitTestRunnerUI.mxml index 3c31006..76d231c 100644 --- a/FlexUnit4UIListener/test/flexunit/flexui/FlexUnitTestRunnerUI.mxml +++ b/FlexUnit4UIListener/test/flexunit/flexui/FlexUnitTestRunnerUI.mxml @@ -15,13 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml"; width="500" height="400" headerHeight="30" headerColors="0x0000FF" title="FlexUnit Test Run" verticalAlign="middle" horizontalAlign="center" initialize="{initializeLocalizeString()}" > +<mx:Panel xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:fx="http://ns.adobe.com/mxml/2009"; + width="500" height="400" headerHeight="30" headerColors="0x0000FF" + title="FlexUnit Test Run" verticalAlign="middle" horizontalAlign="center" + initialize="{initializeLocalizeString()}" > - <mx:Metadata> + <fx:Metadata> [ResourceBundle("FlexUnitTestRunner")] - </mx:Metadata> + </fx:Metadata> - <mx:Script> + <fx:Script> <![CDATA[ import org.flexunit.internals.listeners.XMLListener; import suite.cases.MySuite; @@ -135,7 +139,7 @@ } } ]]> - </mx:Script> + </fx:Script> <mx:VBox horizontalAlign="centre"> <mx:Label id="l1" height="50" text='{testRunningLabel}' fontSize="20" horizontalCenter="true"/> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..820ff5e --- /dev/null +++ b/pom.xml @@ -0,0 +1,307 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>17</version> + </parent> + + <groupId>org.apache.flex.flexunit</groupId> + <artifactId>flexunit-parent</artifactId> + <version>4.3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Apache Flex - FlexUnit</name> + <description>The Apache Flex FlexUnit Project</description> + + <scm> + <connection>scm:git://git-wip-us.apache.org/repos/asf/flex-flexunit.git</connection> + <developerConnection>scm:git://git-wip-us.apache.org/repos/asf/flex-flexunit.git</developerConnection> + <url>https://github.com/apache/flex-flexunit</url> + </scm> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> + <maven.version>3.3.1</maven.version> + + <flex.version>4.15.0</flex.version> + <flash.version>20.0</flash.version> + <air.version>20.0</air.version> + <flexjs.version>0.7.0-SNAPSHOT</flexjs.version> + + <!-- URL of the ASF SonarQube server --> + <sonar.host.url>https://analysis.apache.org/</sonar.host.url> + <!-- Tell sonar where the coverage reports are located --> + <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath> + <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath> + <!-- Exclude all generated code --> + <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions> + </properties> + + <!-- Only configure the site distribution as the rest is handled by the apache parent --> + <distributionManagement> + <site> + <id>website</id> + <!-- TODO: Set this to the correct url --> + <url>scp://www.mycompany.com/www/docs/project/</url> + </site> + </distributionManagement> + + <issueManagement> + <system>Jira</system> + <url>https://issues.apache.org/jira/browse/FLEX</url> + </issueManagement> + + <mailingLists> + <mailingList> + <name>Apache Flex User List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/flex-users/</archive> + </mailingList> + <mailingList> + <name>Apache Flex Developer List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/flex-dev/</archive> + </mailingList> + </mailingLists> + + <modules> + <module>FlexUnit4</module> + <module>FlexUnit4AirCIListener</module> + <!--module>FlexUnit4AntTasks</module--> + <module>FlexUnit4CIListener</module> + <module>FlexUnit4FlexCoverListener</module> + <module>FlexUnit4FluintExtensions</module> + <module>FlexUnit4SampleCIProject</module> + <!--module>FlexUnit4Test</module--> + <!--module>FlexUnit4Turnkey</module--> + <module>FlexUnit4UIListener</module> + </modules> + + <build> + <sourceDirectory>src</sourceDirectory> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>flexjs-maven-plugin</artifactId> + <version>${flexjs.version}</version> + <extensions>true</extensions> + <configuration> + <skipJS>true</skipJS> + <skipExtern>true</skipExtern> + <includeSources>true</includeSources> + <defines> + <define> + <name>CONFIG::useFlexClasses</name> + <value>true</value> + </define> + </defines> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.7.0-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <!-- Configure the Site generation --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <configuration> + <generateReports>true</generateReports> + <generateSitemap>true</generateSitemap> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + <locales>en</locales> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.reporting.outputencoding}</outputEncoding> + </configuration> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>1.5.3</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>1.5.3</version> + <configuration> + <requires> + <require>asciidoctor-diagram</require> + </requires> + </configuration> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj-diagram</artifactId> + <version>1.3.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <!-- Process the asciidoctor resources in the src/site/asciidoc directory --> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>1.5.3</version> + <configuration> + <attributes> + <icons>font</icons> + <source-highlighter>coderay</source-highlighter> + <coderay-css>style</coderay-css> + <toclevels>2</toclevels> + </attributes> + </configuration> + </plugin> + + <!-- Generates a changelog report from GIT commits --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.3</version> + <configuration> + <!-- Automatically link Jire issues --> + <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl> + </configuration> + </plugin> + + <!-- Generates a report with the details of the unit- and integrationtests --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.19.1</version> + </plugin> + + <!-- Generates a report with the test coverages --> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.6.201602180812</version> + </plugin> + + <!-- Generates a report with the SonarQube analysis reports --> + <plugin> + <groupId>org.codehaus.sonar-plugins</groupId> + <artifactId>maven-report</artifactId> + <version>0.1</version> + </plugin> + + <!-- Generate the JavaDoc API documentation --> + <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + </plugin--> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>com.adobe.flash.framework</groupId> + <artifactId>playerglobal</artifactId> + <version>${flash.version}</version> + <type>swc</type> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.flex</groupId> + <artifactId>framework</artifactId> + <version>${flex.version}</version> + <type>pom</type> + </dependency> + </dependencies> + + <repositories> + <repository> + <id>apache-release</id> + <url>https://repository.apache.org/content/repositories/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>apache-snapshots</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>flex-mojos-repository</id> + <name>flex-mojos-repository</name> + <url>http://repository.sonatype.org/content/groups/flexgroup</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>apache-plugins-release</id> + <url>https://repository.apache.org/content/repositories/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>apache-plugins-snapshots</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/utils.xml ---------------------------------------------------------------------- diff --git a/utils.xml b/utils.xml index 1efb345..f4c3238 100644 --- a/utils.xml +++ b/utils.xml @@ -26,11 +26,12 @@ classpath="lib/ant-contrib-0.6.jar"/> <!-- defined maven snapshots and staging repository id and url --> - <property name="maven-staging-repository-id" value="apache.releases.https" /> + <property name="maven-staging-repository-id" value="apache.snapshots.https" /> <property name="maven-staging-repository-url" - value="https://repository.apache.org/service/local/staging/deploy/maven2"; /> - <property name="maven-pgp-passphrase" value=""/> - <property name="maven-pgp-keyname" value=""/> + value="https://repository.apache.org/content/repositories/snapshots"; /> + <!--property name="maven-staging-repository-id" value="apache.releases.https" /> + <property name="maven-staging-repository-url" + value="https://repository.apache.org/service/local/staging/deploy/maven2"; /--> <macrodef name="apache-deploy"> <attribute name="binaryFile"/> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e29a1a39/version.properties ---------------------------------------------------------------------- diff --git a/version.properties b/version.properties index 6612534..736db6a 100644 --- a/version.properties +++ b/version.properties @@ -14,6 +14,6 @@ # limitations under the License. build.groupId=org.flexunit -build.version=4.3.0 +build.version=4.3.0-SNAPSHOT build.number=20140410 -build.sdk=4.12.0 +build.sdk=4.14.1
