Author: jbevain
Date: 2007-12-10 17:19:46 -0500 (Mon, 10 Dec 2007)
New Revision: 91068
Modified:
trunk/moon/test/js/api-ea.html
trunk/moon/test/js/api.html
trunk/moon/test/js/codemodel.js
trunk/moon/test/js/errors.html
trunk/moon/test/js/errors.js
trunk/moon/test/js/unittestsl.js
Log:
code cleanup, trying to get IE running the tests
Modified: trunk/moon/test/js/api-ea.html
===================================================================
--- trunk/moon/test/js/api-ea.html 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/api-ea.html 2007-12-10 22:19:46 UTC (rev 91068)
@@ -5,7 +5,6 @@
<title>Moonlight API test file</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<script src="Silverlight.js" type="text/javascript"></script>
- <script src="CreateSilverlight.js" type="text/javascript"></script>
<script src="prototype.js" type="text/javascript"></script>
<script src="unittest.js" type="text/javascript"></script>
<script src="codemodel.js" type="text/javascript"></script>
Modified: trunk/moon/test/js/api.html
===================================================================
--- trunk/moon/test/js/api.html 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/api.html 2007-12-10 22:19:46 UTC (rev 91068)
@@ -297,7 +297,7 @@
},
testUIElementCollection: function () {
this.assertCodeModel (UIElementCollection);
- },
+ }
};
new Test.Unit.Runner (CodeModelTestSuite.prototype, 'testlog');
Modified: trunk/moon/test/js/codemodel.js
===================================================================
--- trunk/moon/test/js/codemodel.js 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/codemodel.js 2007-12-10 22:19:46 UTC (rev 91068)
@@ -1,4 +1,4 @@
-DependencyObject = {
+var DependencyObject = {
name: "DependencyObject",
properties: ["Name"],
@@ -8,7 +8,7 @@
events: []
};
-Accessibility = {
+var Accessibility = {
name: "Accessibility",
parent: DependencyObject,
@@ -22,7 +22,7 @@
events: ["PerformAction"]
};
-Downloader = {
+var Downloader = {
name: "Downloader",
parent: DependencyObject,
@@ -52,7 +52,7 @@
]
};
-UIElement = {
+var UIElement = {
name: "UIElement",
parent: DependencyObject,
@@ -98,7 +98,7 @@
]
};
-Canvas = {
+var Canvas = {
name: "Canvas",
parent: UIElement,
@@ -113,7 +113,7 @@
]
};
-Collection = {
+var Collection = {
name: "Collection",
parent: DependencyObject,
@@ -137,7 +137,7 @@
events: []
};
-ColorKeyFrameCollection = {
+var ColorKeyFrameCollection = {
name: "ColorKeyFrameCollection",
parent: Collection,
@@ -147,7 +147,7 @@
}
};
-DoubleKeyFrameCollection = {
+var DoubleKeyFrameCollection = {
name: "DoubleKeyFrameCollection",
parent: Collection,
@@ -157,7 +157,7 @@
}
};
-GeometryCollection = {
+var GeometryCollection = {
name: "GeometryCollection",
parent: Collection,
@@ -167,7 +167,7 @@
}
};
-GradientStopCollection = {
+var GradientStopCollection = {
name: "GradientStopCollection",
parent: Collection,
@@ -177,7 +177,7 @@
}
};
-MediaAttributeCollection = {
+var MediaAttributeCollection = {
name: "MediaAttributeCollection",
parent: Collection,
@@ -192,7 +192,7 @@
]
};
-PathFigureCollection = {
+var PathFigureCollection = {
name: "PathFigureCollection",
parent: Collection,
@@ -202,7 +202,7 @@
}
};
-PathSegmentCollection = {
+var PathSegmentCollection = {
name: "PathSegmentCollection",
parent: Collection,
@@ -212,7 +212,7 @@
}
};
-PointKeyFrameCollection = {
+var PointKeyFrameCollection = {
name: "PointKeyFrameCollection",
parent: Collection,
@@ -222,7 +222,7 @@
}
};
-ResourceDictionary = {
+var ResourceDictionary = {
name: "ResourceDictionary",
parent: Collection,
@@ -232,7 +232,7 @@
}
};
-StrokeCollection = {
+var StrokeCollection = {
name: "StrokeCollection",
parent: Collection,
@@ -247,7 +247,7 @@
]
};
-StylusPointCollection = {
+var StylusPointCollection = {
name: "StylusPointCollection",
parent: Collection,
@@ -263,7 +263,7 @@
]
};
-TimelineCollection = {
+var TimelineCollection = {
name: "TimelineCollection",
parent: Collection,
@@ -273,7 +273,7 @@
}
};
-TimelineMarkerCollection = {
+var TimelineMarkerCollection = {
name: "TimelineMarkerCollection",
parent: Collection,
@@ -283,7 +283,7 @@
}
};
-TransformCollection = {
+var TransformCollection = {
name: "TransformCollection",
parent: Collection,
@@ -293,7 +293,7 @@
}
};
-TriggerActionCollection = {
+var TriggerActionCollection = {
name: "TriggerActionCollection",
parent: Collection,
@@ -303,7 +303,7 @@
}
};
-TriggerCollection = {
+var TriggerCollection = {
name: "TriggerCollection",
parent: Collection,
@@ -313,7 +313,7 @@
}
};
-UIElementCollection = {
+var UIElementCollection = {
name: "UIElementCollection",
parent: Collection,
@@ -323,7 +323,7 @@
}
};
-KeyFrame = {
+var KeyFrame = {
name: "KeyFrame",
parent: DependencyObject,
@@ -331,25 +331,25 @@
properties: ["KeyTime", "Value"]
};
-ColorKeyFrame = {
+var ColorKeyFrame = {
name: "ColorKeyFrame",
parent: KeyFrame
}
-DoubleKeyFrame = {
+var DoubleKeyFrame = {
name: "DoubleKeyFrame",
parent: KeyFrame
}
-PointKeyFrame = {
+var PointKeyFrame = {
name: "PointKeyFrame",
parent: KeyFrame
}
-DiscreteColorKeyFrame = {
+var DiscreteColorKeyFrame = {
name: "DiscreteColorKeyFrame",
parent: ColorKeyFrame,
@@ -359,7 +359,7 @@
}
}
-DiscreteDoubleKeyFrame = {
+var DiscreteDoubleKeyFrame = {
name: "DiscreteDoubleKeyFrame",
parent: DoubleKeyFrame,
@@ -369,7 +369,7 @@
}
}
-DiscretePointKeyFrame = {
+var DiscretePointKeyFrame = {
name: "DiscretePointKeyFrame",
parent: PointKeyFrame,
@@ -379,7 +379,7 @@
}
}
-LinearColorKeyFrame = {
+var LinearColorKeyFrame = {
name: "LinearColorKeyFrame",
parent: ColorKeyFrame,
@@ -389,7 +389,7 @@
}
}
-LinearDoubleKeyFrame = {
+var LinearDoubleKeyFrame = {
name: "LinearDoubleKeyFrame",
parent: DoubleKeyFrame,
@@ -399,7 +399,7 @@
}
}
-LinearPointKeyFrame = {
+var LinearPointKeyFrame = {
name: "LinearPointKeyFrame",
parent: PointKeyFrame,
@@ -409,7 +409,7 @@
}
}
-SplineColorKeyFrame = {
+var SplineColorKeyFrame = {
name: "SplineColorKeyFrame",
parent: ColorKeyFrame,
@@ -421,7 +421,7 @@
properties: ["KeySpline"]
}
-SplineDoubleKeyFrame = {
+var SplineDoubleKeyFrame = {
name: "SplineDoubleKeyFrame",
parent: DoubleKeyFrame,
@@ -433,7 +433,7 @@
properties: ["KeySpline"]
}
-SplinePointKeyFrame = {
+var SplinePointKeyFrame = {
name: "SplinePointKeyFrame",
parent: PointKeyFrame,
@@ -445,7 +445,7 @@
properties: ["KeySpline"]
}
-Timeline = {
+var Timeline = {
name: "TimeLine",
parent: DependencyObject,
@@ -462,7 +462,7 @@
]
};
-TimelineGroup = {
+var TimelineGroup = {
name: "TimeLineGroup",
parent: Timeline,
@@ -474,7 +474,7 @@
properties: ["Children"]
};
-Storyboard = {
+var Storyboard = {
name: "Storyboard",
parent: Timeline,
@@ -498,7 +498,7 @@
events: ["Completed"]
};
-Animation = {
+var Animation = {
name: "Animation",
parent: Timeline,
@@ -506,7 +506,7 @@
properties: ["By", "From", "To"]
};
-ColorAnimation = {
+var ColorAnimation = {
name: "ColorAnimation",
parent: Animation,
@@ -516,7 +516,7 @@
}
};
-ColorAnimationUsingKeyFrames = {
+var ColorAnimationUsingKeyFrames = {
name: "ColorAnimationUsingKeyFrames",
parent: ColorAnimation,
@@ -528,7 +528,7 @@
properties: ["KeyFrames"]
};
-DoubleAnimation = {
+var DoubleAnimation = {
name: "DoubleAnimation",
parent: Animation,
@@ -538,7 +538,7 @@
}
};
-DoubleAnimationUsingKeyFrames = {
+var DoubleAnimationUsingKeyFrames = {
name: "DoubleAnimationUsingKeyFrames",
parent: DoubleAnimation,
@@ -550,7 +550,7 @@
properties: ["KeyFrames"]
};
-PointAnimation = {
+var PointAnimation = {
name: "PointAnimation",
parent: Animation,
@@ -560,7 +560,7 @@
}
};
-PointAnimationUsingKeyFrames = {
+var PointAnimationUsingKeyFrames = {
name: "PointAnimationUsingKeyFrames",
parent: PointAnimation,
@@ -572,7 +572,7 @@
properties: ["KeyFrames"]
};
-Brush = {
+var Brush = {
name: "Brush",
parent: DependencyObject,
@@ -584,7 +584,7 @@
]
};
-ImageBrush = {
+var ImageBrush = {
name: "ImageBrush",
parent: Brush,
@@ -606,7 +606,7 @@
events: ["DownloadProgressChanged"]
};
-SolidColorBrush = {
+var SolidColorBrush = {
name: "SolidColorBrush",
parent: Brush,
@@ -618,7 +618,7 @@
properties: ["Color"]
};
-VideoBrush = {
+var VideoBrush = {
name: "VideoBrush",
parent: Brush,
@@ -633,7 +633,7 @@
]
};
-GradientBrush = {
+var GradientBrush = {
name: "GradientBrush",
parent: Brush,
@@ -646,7 +646,7 @@
]
};
-LinearGradientBrush = {
+var LinearGradientBrush = {
name: "LinearGradientBrush",
parent: GradientBrush,
@@ -661,7 +661,7 @@
]
};
-RadialGradientBrush = {
+var RadialGradientBrush = {
name: "RadialGradientBrush",
parent: GradientBrush,
@@ -678,13 +678,13 @@
]
};
-PathSegment = {
+var PathSegment = {
name: "PathSegment",
- parent: DependencyObject,
+ parent: DependencyObject
};
-ArcSegment = {
+var ArcSegment = {
name: "ArcSegment",
parent: PathSegment,
@@ -702,7 +702,7 @@
]
};
-BezierSegment = {
+var BezierSegment = {
name: "BezierSegment",
parent: PathSegment,
@@ -718,7 +718,7 @@
]
};
-LineSegment = {
+var LineSegment = {
name: "LineSegment",
parent: PathSegment,
@@ -730,7 +730,7 @@
properties: ["Point"]
};
-PolyBezierSegment = {
+var PolyBezierSegment = {
name: "PolyBezierSegment",
parent: PathSegment,
@@ -744,7 +744,7 @@
]
};
-PolyLineSegment = {
+var PolyLineSegment = {
name: "PolyLineSegment",
parent: PathSegment,
@@ -756,7 +756,7 @@
properties: ["Points"]
};
-PolyQuadraticBezierSegment = {
+var PolyQuadraticBezierSegment = {
name: "PolyQuadraticBezierSegment",
parent: PathSegment,
@@ -768,7 +768,7 @@
properties: ["Points"]
};
-QuadraticBezierSegment = {
+var QuadraticBezierSegment = {
name: "QuadraticBezierSegment",
parent: PathSegment,
@@ -783,7 +783,7 @@
]
};
-TriggerAction = {
+var TriggerAction = {
name: "TriggerAction",
parent: DependencyObject,
@@ -793,7 +793,7 @@
}
};
-BeginStoryboard = {
+var BeginStoryboard = {
name: "BeginStoryboard",
parent: TriggerAction,
@@ -805,7 +805,7 @@
properties: ["Storyboard"]
};
-DrawingAttributes = {
+var DrawingAttributes = {
name: "DrawingAttributes",
parent: DependencyObject,
@@ -822,7 +822,7 @@
]
};
-Shape = {
+var Shape = {
name: "Shape",
parent: UIElement,
@@ -842,7 +842,7 @@
]
};
-Ellipse = {
+var Ellipse = {
name: "Ellipse",
parent: Shape,
@@ -852,7 +852,7 @@
}
};
-Path = {
+var Path = {
name: "Path",
parent: Shape,
@@ -864,7 +864,7 @@
properties: ["Data"]
};
-Polygon = {
+var Polygon = {
name: "Polygon",
parent: Shape,
@@ -876,7 +876,7 @@
properties: ["FillRule"]
};
-Polyline = {
+var Polyline = {
name: "Polyline",
parent: Shape,
@@ -888,7 +888,7 @@
properties: ["FillRule"]
};
-Rectangle = {
+var Rectangle = {
name: "Rectangle",
parent: Shape,
@@ -898,7 +898,7 @@
}
};
-Geometry = {
+var Geometry = {
name: "Geometry",
parent: DependencyObject,
@@ -906,7 +906,7 @@
properties: ["Transform"]
};
-GeometryGroup = {
+var GeometryGroup = {
name: "GeometryGroup",
parent: Geometry,
@@ -918,7 +918,7 @@
properties: ["Children"]
};
-EllipseGeometry = {
+var EllipseGeometry = {
name: "EllipseGeometry",
parent: Geometry,
@@ -934,7 +934,7 @@
]
};
-LineGeometry = {
+var LineGeometry = {
name: "LineGeometry",
parent: Geometry,
@@ -949,7 +949,7 @@
]
};
-PathGeometry = {
+var PathGeometry = {
name: "PathGeometry",
parent: Geometry,
@@ -964,7 +964,7 @@
]
};
-RectangleGeometry = {
+var RectangleGeometry = {
name: "RectangleGeometry",
parent: Geometry,
@@ -980,7 +980,7 @@
]
};
-EventTrigger = {
+var EventTrigger = {
name: "EventTrigger",
parent: DependencyObject,
@@ -995,7 +995,7 @@
]
};
-Glyphs = {
+var Glyphs = {
name: "Glyphs",
parent: UIElement,
@@ -1014,7 +1014,7 @@
]
};
-GradientStop = {
+var GradientStop = {
name: "GradientStop",
parent: DependencyObject,
@@ -1029,7 +1029,7 @@
]
};
-Image = {
+var Image = {
name: "Image",
parent: UIElement,
@@ -1050,7 +1050,7 @@
]
};
-InkPresenter = {
+var InkPresenter = {
name: "InkPresenter",
parent: Canvas,
@@ -1066,7 +1066,7 @@
]
};
-KeySpline = {
+var KeySpline = {
name: "KeySpline",
parent: DependencyObject,
@@ -1076,7 +1076,7 @@
}
};
-Line = {
+var Line = {
name: "Line",
parent: Shape,
@@ -1093,7 +1093,7 @@
]
};
-LineBreak = {
+var LineBreak = {
name: "LineBreak",
parent: DependencyObject,
@@ -1113,7 +1113,7 @@
]
};
-Run = {
+var Run = {
name: "Run",
parent: DependencyObject,
@@ -1133,7 +1133,7 @@
]
};
-Matrix = {
+var Matrix = {
name: "Matrix",
parent: DependencyObject,
@@ -1152,13 +1152,13 @@
]
};
-Transform = {
+var Transform = {
name: "Transform",
parent: DependencyObject
};
-MatrixTransform = {
+var MatrixTransform = {
name: "MatrixTransform",
parent: Transform,
@@ -1170,7 +1170,7 @@
properties: ["Matrix"]
};
-RotateTransform = {
+var RotateTransform = {
name: "RotateTransform",
parent: Transform,
@@ -1186,7 +1186,7 @@
]
};
-ScaleTransform = {
+var ScaleTransform = {
name: "ScaleTransform",
parent: Transform,
@@ -1203,7 +1203,7 @@
]
};
-SkewTransform = {
+var SkewTransform = {
name: "SkewTransform",
parent: Transform,
@@ -1220,7 +1220,7 @@
]
};
-TransformGroup = {
+var TransformGroup = {
name: "TransformGroup",
parent: DependencyObject,
@@ -1232,7 +1232,7 @@
properties: ["Children"]
};
-TranslateTransform = {
+var TranslateTransform = {
name: "TranslateTransform",
parent: Transform,
@@ -1247,7 +1247,7 @@
]
};
-MediaAttribute = {
+var MediaAttribute = {
name: "MediaAttribute",
parent: DependencyObject,
@@ -1259,7 +1259,7 @@
properties: ["Value"]
};
-MediaElement = {
+var MediaElement = {
name: "MediaElement",
parent: UIElement,
@@ -1308,7 +1308,7 @@
]
};
-PathFigure = {
+var PathFigure = {
name: "PathFigure",
parent: DependencyObject,
@@ -1324,7 +1324,7 @@
]
};
-SilverlightPlugin = {
+var SilverlightPlugin = {
name: "SilverlightPlugin",
create: function (plugin) {
@@ -1359,7 +1359,7 @@
]
};
-SilverlightPluginContent = {
+var SilverlightPluginContent = {
name: "SilverlightPluginContent",
create: function (plugin) {
@@ -1386,7 +1386,7 @@
]
};
-Stroke = {
+var Stroke = {
name: "Stroke",
parent: DependencyObject,
@@ -1406,7 +1406,7 @@
]
};
-StylusInfo = {
+var StylusInfo = {
name: "StylusInfo",
parent: DependencyObject,
@@ -1417,7 +1417,7 @@
]
};
-StylusPoint = {
+var StylusPoint = {
name: "StylusPoint",
parent: DependencyObject,
@@ -1433,7 +1433,7 @@
]
};
-TextBlock = {
+var TextBlock = {
name: "TextBlock",
parent: UIElement,
@@ -1459,7 +1459,7 @@
methods: ["SetFontSource"]
};
-TimelineMarker = {
+var TimelineMarker = {
name: "TimelineMarker",
parent: DependencyObject,
@@ -1475,13 +1475,13 @@
]
};
-EventArgs = {
+var EventArgs = {
name: "EventArgs",
parent: DependencyObject
};
-KeyboardEventArgs = {
+var KeyboardEventArgs = {
name: "KeyboardEventArgs ",
parent: EventArgs,
@@ -1494,7 +1494,7 @@
]
};
-MouseEventArgs = {
+var MouseEventArgs = {
name: "MouseEventArgs ",
parent: EventArgs,
@@ -1511,7 +1511,7 @@
]
};
-ErrorEventArgs = {
+var ErrorEventArgs = {
name: "ErrorEventArgs ",
parent: EventArgs,
@@ -1523,7 +1523,7 @@
]
};
-ParserErrorEventArgs = {
+var ParserErrorEventArgs = {
name: "ParserErrorEventArgs ",
parent: ErrorEventArgs,
@@ -1537,7 +1537,7 @@
]
};
-RuntimeErrorEventArgs = {
+var RuntimeErrorEventArgs = {
name: "RuntimeErrorEventArgs ",
parent: ErrorEventArgs,
Modified: trunk/moon/test/js/errors.html
===================================================================
--- trunk/moon/test/js/errors.html 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/errors.html 2007-12-10 22:19:46 UTC (rev 91068)
@@ -5,7 +5,6 @@
<title>Moonlight Errors test file</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<script src="Silverlight.js" type="text/javascript"></script>
- <script src="CreateSilverlight.js" type="text/javascript"></script>
<script src="prototype.js" type="text/javascript"></script>
<script src="unittest.js" type="text/javascript"></script>
<script src="codemodel.js" type="text/javascript"></script>
@@ -59,8 +58,6 @@
return $("MoonlightControl");
}
-var errorStore = [];
-
getPlugin ().onError = pluginError;
var ErrorsTestSuite = Class.create ();
@@ -76,7 +73,7 @@
dl.open ("GET", "http://www.google.com/";);
dl.send ();
});
- },
+ }
};
new Test.Unit.Runner (ErrorsTestSuite.prototype, 'testlog');
Modified: trunk/moon/test/js/errors.js
===================================================================
--- trunk/moon/test/js/errors.js 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/errors.js 2007-12-10 22:19:46 UTC (rev 91068)
@@ -87,35 +87,35 @@
Errors.AG_E_UNABLE_TO_PLAY = {
message: "AG_E_UNABLE_TO_PLAY",
type: ["mediaError"],
- code: 3000,
+ code: 3000
};
Errors.AG_E_INVALID_FILE_FORMAT = {
message: "AG_E_INVALID_FILE_FORMAT",
type: ["mediaError", "imageError", "downloadError"],
- code: 3001,
+ code: 3001
};
Errors.AG_E_NOT_FOUND = {
message: "AG_E_INVALID_FILE_FORMAT",
type: ["mediaError", "imageError"],
- code: 3002,
+ code: 3002
};
Errors.AG_E_ABORT_FAILED = {
message: "AG_E_ABORT_FAILED",
type: ["downloadError"],
- code: 4000,
+ code: 4000
};
Errors.AG_E_CONNECTION_ERROR = {
message: "AG_E_CONNECTION_ERROR",
type: ["downloadError"],
- code: 4001,
+ code: 4001
};
Errors.AG_E_NETWORK_ERROR = {
message: "AG_E_NETWORK_ERROR",
type: ["downloadError"],
- code: 4002,
+ code: 4002
};
Modified: trunk/moon/test/js/unittestsl.js
===================================================================
--- trunk/moon/test/js/unittestsl.js 2007-12-10 21:26:16 UTC (rev 91067)
+++ trunk/moon/test/js/unittestsl.js 2007-12-10 22:19:46 UTC (rev 91068)
@@ -9,32 +9,32 @@
for (var i = 0; i < array.length; i++) {
var slot = array [i];
- assert (obj.hasOwnProperty (slot), model.name + " does
not support " + slot);
+ this.assert (obj.hasOwnProperty (slot), model.name + "
does not support " + slot);
}
}},
- _classMatch: function (model, obj) { with (this) {
- _slotsMatch (model, model.properties, obj);
- _slotsMatch (model, model.methods, obj);
- _slotsMatch (model, model.events, obj);
+ _classMatch: function (model, obj) {
+ this._slotsMatch (model, model.properties, obj);
+ this._slotsMatch (model, model.methods, obj);
+ this._slotsMatch (model, model.events, obj);
- return model.parent ? _classMatch (model.parent, obj) : true;
- }},
+ return model.parent ? this._classMatch (model.parent, obj) :
true;
+ },
- assertCodeModel: function (model) { with (this) {
+ assertCodeModel: function (model) {
var obj = null;
if (arguments [1])
obj = arguments [1];
else {
try {
- obj = _createObject (model);
+ obj = this._createObject (model);
} catch (ex) {
- fail ("Cannot create object of type " +
model.name + ", " + ex.toString ());
+ this.fail ("Cannot create object of type " +
model.name + ", " + ex);
}
}
- return _classMatch (model, obj);
- }},
+ return this._classMatch (model, obj);
+ },
assertException: function (error, code) {
try {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
