Skip to content

Commit 01dce8b

Browse files
author
randylevy
committed
Fix up net core and Windows Phone
1 parent a227ad1 commit 01dce8b

File tree

11 files changed

+75
-63
lines changed

11 files changed

+75
-63
lines changed

‎source/Unity/Tests/TestAssemblies/MissingAssembly.WindowsPhone/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
2+
using System.Resources;
23
using System.Runtime.CompilerServices;
34
using System.Runtime.InteropServices;
4-
using System.Resources;
55

66
// General Information about an assembly is controlled through the following
77
// set of attributes. Change these attribute values to modify the information

‎source/Unity/Tests/TestAssemblies/TestNetAssembly.WindowsPhone/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
2+
using System.Resources;
23
using System.Runtime.CompilerServices;
34
using System.Runtime.InteropServices;
4-
using System.Resources;
55

66
// General Information about an assembly is controlled through the following
77
// set of attributes. Change these attribute values to modify the information

‎source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodCallFixture.NetCore.cs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
using Microsoft.Practices.Unity;
1010
using Microsoft.Practices.Unity.TestSupport;
1111
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
12-
using DependencyAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute;
13-
using InjectionConstructorAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute;
14-
using InjectionMethodAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionMethodAttribute;
12+
using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute;
13+
using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute;
14+
using InjectionMethodAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionMethodAttribute;
1515

1616
namespace Microsoft.Practices.ObjectBuilder2.Tests
1717
{
@@ -121,8 +121,8 @@ public void ExceptionThrownWhileInvokingTheInjectionMethodIsBubbledUpAndTheCurre
121121
}
122122
catch (Exception e)
123123
{
124-
Assert.AreSame(ObjectWithSingleThrowingInjectionMethod.injectionMethodException, e);
125-
var operation = (InvokingMethodOperation) context.CurrentOperation;
124+
Assert.AreSame(ObjectWithSingleThrowingInjectionMethod.InjectionMethodException, e);
125+
var operation = (InvokingMethodOperation)context.CurrentOperation;
126126
Assert.IsNotNull(operation);
127127

128128
Assert.AreSame(typeof(ObjectWithSingleThrowingInjectionMethod), operation.TypeBeingConstructed);
@@ -147,7 +147,7 @@ public void ResolvingAParameterSetsTheCurrentOperation()
147147

148148
plan.BuildUp(context);
149149

150-
Assert.IsNotNull(resolverPolicy.currentOperation);
150+
Assert.IsNotNull(resolverPolicy.CurrentOperation);
151151
}
152152

153153
[TestMethod]
@@ -175,7 +175,7 @@ public void ExceptionThrownWhileResolvingAParameterIsBubbledUpAndTheCurrentOpera
175175
catch (Exception e)
176176
{
177177
Assert.AreSame(exception, e);
178-
var operation = (MethodArgumentResolveOperation) context.CurrentOperation;
178+
var operation = (MethodArgumentResolveOperation)context.CurrentOperation;
179179
Assert.IsNotNull(operation);
180180

181181
Assert.AreSame(typeof(ObjectWithSingleInjectionMethod), operation.TypeBeingConstructed);
@@ -257,7 +257,6 @@ public class ObjectWithGenericInjectionMethod
257257
[InjectionMethod]
258258
public void DoSomethingGeneric<T>(T input)
259259
{
260-
261260
}
262261
}
263262

@@ -289,12 +288,12 @@ public void InjectionMethod(object parameter)
289288

290289
public class ObjectWithSingleThrowingInjectionMethod
291290
{
292-
public static Exception injectionMethodException = new ArgumentException();
291+
public static Exception InjectionMethodException = new ArgumentException();
293292

294293
[InjectionMethod]
295294
public void InjectionMethod(object parameter)
296295
{
297-
throw injectionMethodException;
296+
throw InjectionMethodException;
298297
}
299298
}
300299

@@ -311,13 +310,12 @@ public IEnumerable<SelectedMethod> SelectMethods(IBuilderContext context, IPolic
311310
{
312311
var method =
313312
new SelectedMethod(
314-
// .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)[0]
313+
// .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)[0]
315314
typeof(T).GetTypeInfo().DeclaredMethods.First(m => m.IsPublic && !m.IsStatic));
316315
method.AddParameterResolver(this.resolverPolicy);
317316

318317
yield return method;
319318
}
320319
}
321-
322320
}
323321
}

‎source/Unity/Tests/Unity.NetCore.Tests/ObjectBuilder/DynamicMethodPropertySetterFixture.NetCore.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
using Microsoft.Practices.Unity;
1010
using Microsoft.Practices.Unity.TestSupport;
1111
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
12-
using DependencyAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute;
13-
using InjectionConstructorAttribute=Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute;
12+
using DependencyAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.DependencyAttribute;
13+
using InjectionConstructorAttribute = Microsoft.Practices.ObjectBuilder2.Tests.TestDoubles.InjectionConstructorAttribute;
1414

1515
namespace Microsoft.Practices.ObjectBuilder2.Tests
1616
{
@@ -69,7 +69,7 @@ public void ResolvingAPropertyValueSetsTheCurrentOperation()
6969
IBuildPlanPolicy plan = GetPlanCreator(context).CreatePlan(context, key);
7070
plan.BuildUp(context);
7171

72-
Assert.IsNotNull(resolverPolicy.currentOperation);
72+
Assert.IsNotNull(resolverPolicy.CurrentOperation);
7373
}
7474

7575
[TestMethod]
@@ -98,7 +98,7 @@ public void ExceptionThrownWhileResolvingAPropertyValueIsBubbledUpAndTheCurrentO
9898
{
9999
Assert.AreSame(exception, e);
100100

101-
var operation = (ResolvingPropertyValueOperation) context.CurrentOperation;
101+
var operation = (ResolvingPropertyValueOperation)context.CurrentOperation;
102102
Assert.IsNotNull(operation);
103103
Assert.AreSame(typeof(OnePropertyClass), operation.TypeBeingConstructed);
104104
Assert.AreEqual("Key", operation.PropertyName);
@@ -123,8 +123,8 @@ public void ExceptionThrownWhileSettingAPropertyIsBubbledUpAndTheCurrentOperatio
123123
}
124124
catch (Exception e)
125125
{
126-
Assert.AreSame(OneExceptionThrowingPropertyClass.propertySetterException, e);
127-
var operation = (SettingPropertyOperation) context.CurrentOperation;
126+
Assert.AreSame(OneExceptionThrowingPropertyClass.PropertySetterException, e);
127+
var operation = (SettingPropertyOperation)context.CurrentOperation;
128128
Assert.IsNotNull(operation);
129129

130130
Assert.AreSame(typeof(OneExceptionThrowingPropertyClass), operation.TypeBeingConstructed);
@@ -194,12 +194,12 @@ public object Key
194194

195195
public class OneExceptionThrowingPropertyClass
196196
{
197-
public static Exception propertySetterException = new ArgumentException();
197+
public static Exception PropertySetterException = new ArgumentException();
198198

199199
[Dependency]
200200
public object Key
201201
{
202-
set { throw propertySetterException; }
202+
set { throw PropertySetterException; }
203203
}
204204
}
205205

‎source/Unity/Tests/Unity.NetCore.Tests/Unity.TestSupport/TypeReflectionExtensions.NetCore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Reflection;
45
using System.Text;
56
using System.Threading.Tasks;
6-
using System.Reflection;
77

88
namespace Microsoft.Practices.Unity.TestSupport
99
{
10-
static class TypeReflectionExtensions
10+
internal static class TypeReflectionExtensions
1111
{
1212
public static ConstructorInfo GetMatchingConstructor(this Type type, Type[] constructorParamTypes)
1313
{

‎source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/AssemblyScanningFixture.NetCore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.Practices.Unity.Tests
1010
{
11-
partial class AssemblyScanningFixture
11+
public partial class AssemblyScanningFixture
1212
{
1313
[TestMethod]
1414
public void GetsTypesFromAssembliesLoadedFromApplicationFolderSkippingUnityAssembliesByDefault()

‎source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void ContainerControlledLifetimeReturnsSameInstanceFromMultipleThreads()
2929
{
3030
result1 = container.Resolve<object>();
3131
});
32-
32+
3333
Task task2 = new Task(delegate()
3434
{
3535
result2 = container.Resolve<object>();
@@ -62,7 +62,7 @@ public void ContainerControlledLifetimeDoesNotLeaveHangingLockIfBuildThrowsExcep
6262
{
6363
result1 = container.Resolve<object>();
6464
}
65-
catch(ResolutionFailedException)
65+
catch (ResolutionFailedException)
6666
{
6767
}
6868
});
@@ -74,10 +74,8 @@ public void ContainerControlledLifetimeDoesNotLeaveHangingLockIfBuildThrowsExcep
7474
thread2Finished = true;
7575
});
7676

77-
7877
task1.Start();
7978
task1.Wait();
80-
8179

8280
// Thread1 threw an exception. However, lock should be correctly freed.
8381
// Run thread2, and if it finished, we're ok.
@@ -114,7 +112,6 @@ private class ThrowingStrategy : BuilderStrategy
114112
{
115113
private bool shouldThrow = true;
116114

117-
118115
public override void PreBuildUp(IBuilderContext context)
119116
{
120117
if (shouldThrow)

‎source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public App()
5454
// and consume battery power when the user is not using the phone.
5555
PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
5656
}
57-
5857
}
5958

6059
// Code to execute when the application is launching (eg, from Start)
@@ -110,7 +109,9 @@ private void Application_UnhandledException(object sender, ApplicationUnhandledE
110109
private void InitializePhoneApplication()
111110
{
112111
if (phoneApplicationInitialized)
112+
{
113113
return;
114+
}
114115

115116
// Create the frame but don't set it as RootVisual yet; this allows the splash
116117
// screen to remain active until the application is ready to render.
@@ -132,7 +133,9 @@ private void CompleteInitializePhoneApplication(object sender, NavigationEventAr
132133
{
133134
// Set the root visual to allow the application to render
134135
if (RootVisual != RootFrame)
136+
{
135137
RootVisual = RootFrame;
138+
}
136139

137140
// Remove this handler since it is no longer needed
138141
RootFrame.Navigated -= CompleteInitializePhoneApplication;
@@ -143,7 +146,9 @@ private void CheckForResetNavigation(object sender, NavigationEventArgs e)
143146
// If the app has received a 'reset' navigation, then we need to check
144147
// on the next navigation to see if the page stack should be reset
145148
if (e.NavigationMode == NavigationMode.Reset)
149+
{
146150
RootFrame.Navigated += ClearBackStackAfterReset;
151+
}
147152
}
148153

149154
private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
@@ -153,12 +158,14 @@ private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
153158

154159
// Only clear the stack for 'new' (forward) and 'refresh' navigations
155160
if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)
161+
{
156162
return;
163+
}
157164

158165
// For UI consistency, clear the entire page stack
159166
while (RootFrame.RemoveBackEntry() != null)
160167
{
161-
; // do nothing
168+
// do nothing
162169
}
163170
}
164171

@@ -180,7 +187,6 @@ private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
180187
// ResourceFlowDirection's value should be "RightToLeft"
181188
//
182189
// For more info on localizing Windows Phone apps see http://go.microsoft.com/fwlink/?LinkId=262072.
183-
//
184190
private void InitializeLanguage()
185191
{
186192
try

‎source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
using System;
1+
using Microsoft.Phone.Controls;
2+
using Microsoft.Phone.Shell;
3+
using Microsoft.Practices.Unity.Tests.Resources;
4+
using Microsoft.VisualStudio.TestPlatform.Core;
5+
using Microsoft.VisualStudio.TestPlatform.TestExecutor;
6+
using System;
27
using System.Collections.Generic;
38
using System.Linq;
49
using System.Net;
10+
using System.Reflection;
11+
using System.Threading;
512
using System.Windows;
613
using System.Windows.Controls;
714
using System.Windows.Navigation;
8-
using Microsoft.Phone.Controls;
9-
using Microsoft.Phone.Shell;
10-
using Microsoft.Practices.Unity.Tests.Resources;
11-
using System.Threading;
12-
using Microsoft.VisualStudio.TestPlatform.Core;
1315
using vstest_executionengine_platformbridge;
14-
using Microsoft.VisualStudio.TestPlatform.TestExecutor;
15-
using System.Reflection;
1616

1717
namespace Microsoft.Practices.Unity.Tests
1818
{
@@ -25,7 +25,6 @@ public MainPage()
2525

2626
var wrapper = new TestExecutorServiceWrapper();
2727
new Thread(new ServiceMain((param0, param1) => wrapper.SendMessage((ContractName)param0, param1)).Run).Start();
28-
2928
}
3029
}
3130
}

‎source/Unity/Tests/Unity.Tests.WindowsPhone/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using System.Runtime.InteropServices;
2-
using System.Resources;
1+
using System.Resources;
2+
using System.Runtime.InteropServices;
33

44
// Setting ComVisible to false makes the types in this assembly not visible
55
// to COM components. If you need to access a type in this assembly from

0 commit comments

Comments
 (0)