@@ -63,129 +63,141 @@ public void TestShared()
6363 ColorPair p1 = ColorSet . Shared . Colors [ "NoVariant" ] ;
6464 ColorPair p2 = ColorSet . Shared . Colors [ "Variant" ] ;
6565
66- if ( p1 . Color is SolidColorBrush c )
6766 {
68- Assert . AreEqual ( c . Color . R , 50 ) ;
69- Assert . AreEqual ( c . Color . G , 100 ) ;
70- Assert . AreEqual ( c . Color . B , 150 ) ;
71- Assert . AreEqual ( ( double ) ( c . Color . A ) / 256 , 0.5 ) ;
72- }
73- else
74- {
75- Assert . Fail ( "Color is not defined" ) ;
67+ if ( p1 . Color is SolidColorBrush c )
68+ {
69+ Assert . AreEqual ( c . Color . R , 50 ) ;
70+ Assert . AreEqual ( c . Color . G , 100 ) ;
71+ Assert . AreEqual ( c . Color . B , 150 ) ;
72+ Assert . AreEqual ( c . Color . A , 128 ) ;
73+ }
74+ else
75+ {
76+ Assert . Fail ( "Color is not defined" ) ;
77+ }
7678 }
7779
7880 if ( p1 . Variant != null )
7981 {
8082 Assert . Fail ( "No variant should be defined" ) ;
8183 }
82- }
8384
84- /*
85- func testShared()
86- {
87- if let c = p2.color
88- {
89- XCTAssertEqual( c.redComponent * 255, 250.0 )
90- XCTAssertEqual( c.greenComponent * 255, 200.0 )
91- XCTAssertEqual( c.blueComponent * 255, 150.0 )
92- XCTAssertEqual( c.alphaComponent, 0.75 )
93- }
94- else
95- {
96- XCTFail( "Color is not defined" )
97- }
98-
99- if let c = p2.variant
10085 {
101- XCTAssertEqual( c.redComponent * 255, 200.0 )
102- XCTAssertEqual( c.greenComponent * 255, 150.0 )
103- XCTAssertEqual( c.blueComponent * 255, 250.0 )
104- XCTAssertEqual( c.alphaComponent, 0.25 )
86+ if ( p2 . Color is SolidColorBrush c )
87+ {
88+ Assert . AreEqual ( c . Color . R , 250 ) ;
89+ Assert . AreEqual ( c . Color . G , 200 ) ;
90+ Assert . AreEqual ( c . Color . B , 150 ) ;
91+ Assert . AreEqual ( c . Color . A , 191 ) ;
92+ }
93+ else
94+ {
95+ Assert . Fail ( "Color is not defined" ) ;
96+ }
10597 }
106- else
98+
10799 {
108- XCTFail( "Color is not defined" )
100+ if ( p2 . Variant is SolidColorBrush c )
101+ {
102+ Assert . AreEqual ( c . Color . R , 200 ) ;
103+ Assert . AreEqual ( c . Color . G , 150 ) ;
104+ Assert . AreEqual ( c . Color . B , 250 ) ;
105+ Assert . AreEqual ( c . Color . A , 64 ) ;
106+ }
107+ else
108+ {
109+ Assert . Fail ( "Color is not defined" ) ;
110+ }
109111 }
110112 }
111-
112- func testNSColor()
113+
114+ [ TestMethod ]
115+ public void TestColor ( )
113116 {
114- if let c = NSColor.colorFrom( colorSet: "NoVariant" )
117+ if ( new ColorSetKit . Color ( "NoVariant" ) . ProvideValue ( null ) is SolidColorBrush c )
115118 {
116- XCTAssertEqual ( c.redComponent * 255, 50.0 )
117- XCTAssertEqual ( c.greenComponent * 255 , 100.0 )
118- XCTAssertEqual ( c.blueComponent * 255 , 150.0 )
119- XCTAssertEqual ( c.alphaComponent, 0.5 )
119+ Assert . AreEqual ( c . Color . R , 50 ) ;
120+ Assert . AreEqual ( c . Color . G , 100 ) ;
121+ Assert . AreEqual ( c . Color . B , 150 ) ;
122+ Assert . AreEqual ( c . Color . A , 128 ) ;
120123 }
121124 else
122125 {
123- XCTFail ( "Cannot retrieve color from NSColor" ); return
126+ Assert . Fail ( "Cannot retrieve color from NSColor" ) ;
124127 }
125128 }
126-
127- func testCreate()
129+
130+ [ TestMethod ]
131+ public void TestCreate ( )
128132 {
129- var set = ColorSet()
130-
131- set.add( color: NSColor( red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4 ), forName: "NoVariant" )
132- set.add( color: NSColor( red: 0.5, green: 0.6, blue: 0.7, alpha: 0.8 ), variant: NSColor( red: 0.8, green: 0.7, blue: 0.6, alpha: 0.5 ), forName: "Variant" )
133-
134- set = ColorSet( data: set.data ) ?? ColorSet()
135-
136- XCTAssertEqual( set.colors.count, 2 )
137-
138- guard let p1 = set.colors[ "NoVariant" ] else
139- {
140- XCTFail( "Cannot retrieve color from shared color set file" ); return
141- }
142-
143- guard let p2 = set.colors[ "Variant" ] else
144- {
145- XCTFail( "Cannot retrieve color from shared color set file" ); return
146- }
147-
148- if let c = p1.color
149- {
150- XCTAssertEqual( c.redComponent, 0.1 )
151- XCTAssertEqual( c.greenComponent, 0.2 )
152- XCTAssertEqual( c.blueComponent, 0.3 )
153- XCTAssertEqual( c.alphaComponent, 0.4 )
154- }
155- else
156- {
157- XCTFail( "Color is not defined" )
158- }
159-
160- if let _ = p1.variant
161- {
162- XCTFail( "No variant should be defined" )
163- }
164-
165- if let c = p2.color
133+ ColorSet set = new ColorSet ( ) ;
134+ System . Windows . Media . Color c1 = new System . Windows . Media . Color ( ) ;
135+ System . Windows . Media . Color c2 = new System . Windows . Media . Color ( ) ;
136+ System . Windows . Media . Color c3 = new System . Windows . Media . Color ( ) ;
137+
138+ c1 . R = 50 ; c1 . G = 100 ; c1 . B = 150 ; c1 . A = 128 ;
139+ c2 . R = 250 ; c2 . G = 200 ; c2 . B = 150 ; c2 . A = 191 ;
140+ c3 . R = 200 ; c3 . G = 150 ; c3 . B = 250 ; c3 . A = 64 ;
141+
142+ set . Add ( new SolidColorBrush ( c1 ) , "NoVariant" ) ;
143+ set . Add ( new SolidColorBrush ( c2 ) , new SolidColorBrush ( c3 ) , "Variant" ) ;
144+
145+ set = new ColorSet ( set . Data ) ;
146+
147+ Assert . AreEqual ( set . Colors . Count , 2 ) ;
148+
149+ Assert . IsTrue ( set . Colors . ContainsKey ( "NoVariant" ) ) ;
150+ Assert . IsTrue ( set . Colors . ContainsKey ( "Variant" ) ) ;
151+
152+ ColorPair p1 = set . Colors [ "NoVariant" ] ;
153+ ColorPair p2 = set . Colors [ "Variant" ] ;
154+
166155 {
167- XCTAssertEqual( c.redComponent, 0.5 )
168- XCTAssertEqual( c.greenComponent, 0.6 )
169- XCTAssertEqual( c.blueComponent, 0.7 )
170- XCTAssertEqual( c.alphaComponent, 0.8 )
156+ if ( p1 . Color is SolidColorBrush c )
157+ {
158+ Assert . AreEqual ( c . Color . R , 50 ) ;
159+ Assert . AreEqual ( c . Color . G , 100 ) ;
160+ Assert . AreEqual ( c . Color . B , 150 ) ;
161+ Assert . AreEqual ( c . Color . A , 128 ) ;
162+ }
163+ else
164+ {
165+ Assert . Fail ( "Color is not defined" ) ;
166+ }
171167 }
172- else
168+
169+ if ( p1 . Variant != null )
173170 {
174- XCTFail ( "Color is not defined" )
171+ Assert . Fail ( "No variant should be defined" ) ;
175172 }
176-
177- if let c = p2.variant
173+
178174 {
179- XCTAssertEqual( c.redComponent, 0.8 )
180- XCTAssertEqual( c.greenComponent, 0.7 )
181- XCTAssertEqual( c.blueComponent, 0.6 )
182- XCTAssertEqual( c.alphaComponent, 0.5 )
175+ if ( p2 . Color is SolidColorBrush c )
176+ {
177+ Assert . AreEqual ( c . Color . R , 250 ) ;
178+ Assert . AreEqual ( c . Color . G , 200 ) ;
179+ Assert . AreEqual ( c . Color . B , 150 ) ;
180+ Assert . AreEqual ( c . Color . A , 191 ) ;
181+ }
182+ else
183+ {
184+ Assert . Fail ( "Color is not defined" ) ;
185+ }
183186 }
184- else
187+
185188 {
186- XCTFail( "Color is not defined" )
189+ if ( p2 . Variant is SolidColorBrush c )
190+ {
191+ Assert . AreEqual ( c . Color . R , 200 ) ;
192+ Assert . AreEqual ( c . Color . G , 150 ) ;
193+ Assert . AreEqual ( c . Color . B , 250 ) ;
194+ Assert . AreEqual ( c . Color . A , 64 ) ;
195+ }
196+ else
197+ {
198+ Assert . Fail ( "Color is not defined" ) ;
199+ }
187200 }
188201 }
189- */
190202 }
191203}
0 commit comments