Skip to content

Commit 2b82362

Browse files
rkapkarkapka
committed
Merge remote-tracking branch 'upstream/next' into rkapka-master
2 parents da3fa6d + e85304f commit 2b82362

File tree

202 files changed

+5815
-5746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+5815
-5746
lines changed

‎Rubberduck.RegexAssistant/Atom.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface IAtom : IDescribable
1010
Quantifier Quantifier { get; }
1111
string Specifier { get; }
1212
}
13-
13+
1414
internal class CharacterClass : IAtom
1515
{
1616
public static readonly string Pattern = @"(?<!\\)\[(?<expression>.*?)(?<!\\)\]";

‎Rubberduck.RegexAssistant/Properties/AssemblyInfo.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3+
using System.Runtime.CompilerServices;
4+
35

46
// General Information about an assembly is controlled through the following
57
// set of attributes. Change these attribute values to modify the information
@@ -33,3 +35,6 @@
3335
// [assembly: AssemblyVersion("1.0.*")]
3436
[assembly: AssemblyVersion("1.0.0.0")]
3537
[assembly: AssemblyFileVersion("1.0.0.0")]
38+
39+
// Make internals visible to test project
40+
[assembly: InternalsVisibleTo("RubberduckTests")]

‎Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -33,7 +35,6 @@
3335
<LangVersion>7.1</LangVersion>
3436
</PropertyGroup>
3537
<ItemGroup>
36-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
3738
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
3839
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
3940
</Reference>
@@ -62,10 +63,6 @@
6263
<Compile Include="Properties\AssemblyInfo.cs" />
6364
<Compile Include="Quantifier.cs" />
6465
<Compile Include="QuantifierExtensions.cs" />
65-
<Compile Include="Tests\CharacterClassTests.cs" />
66-
<Compile Include="Tests\LiteralTests.cs" />
67-
<Compile Include="Tests\QuantifierTests.cs" />
68-
<Compile Include="Tests\RegularExpressionTests.cs" />
6966
</ItemGroup>
7067
<ItemGroup>
7168
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎RubberduckTests/Binding/IndexDefaultBindingTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -10,16 +10,16 @@
1010

1111
namespace RubberduckTests.Binding
1212
{
13-
[TestClass]
13+
[TestFixture]
1414
public class IndexDefaultBindingTests
1515
{
1616
private const string BINDING_TARGET_LEXPRESSION = "BindingTarget";
1717
private const string BINDING_TARGET_UNRESTRICTEDNAME = "UnrestrictedName";
1818
private const string TEST_CLASS_NAME = "TestClass";
1919
private const string REFERENCED_PROJECT_FILEPATH = @"C:\Temp\ReferencedProjectA";
2020

21-
[TestCategory("Binding")]
22-
[TestMethod]
21+
[Category("Binding")]
22+
[Test]
2323
public void RecursiveDefaultMember()
2424
{
2525
string callerModule = @"
@@ -60,8 +60,8 @@ End Property
6060
}
6161
}
6262

63-
[TestCategory("Binding")]
64-
[TestMethod]
63+
[Category("Binding")]
64+
[Test]
6565
public void NormalPropertyFunctionSubroutine()
6666
{
6767
string callerModule = @"

‎RubberduckTests/Binding/MemberAccessDefaultBindingTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -11,16 +11,16 @@
1111

1212
namespace RubberduckTests.Binding
1313
{
14-
[TestClass]
14+
[TestFixture]
1515
public class MemberAccessDefaultBindingTests
1616
{
1717
private const string BINDING_TARGET_LEXPRESSION = "BindingTarget";
1818
private const string BINDING_TARGET_UNRESTRICTEDNAME = "UnrestrictedName";
1919
private const string TEST_CLASS_NAME = "TestClass";
2020
private const string REFERENCED_PROJECT_FILEPATH = @"C:\Temp\ReferencedProjectA";
2121

22-
[TestCategory("Binding")]
23-
[TestMethod]
22+
[Category("Binding")]
23+
[Test]
2424
public void LExpressionIsVariablePropertyOrFunction()
2525
{
2626
var builder = new MockVbeBuilder();
@@ -40,8 +40,8 @@ public void LExpressionIsVariablePropertyOrFunction()
4040
}
4141
}
4242

43-
[TestCategory("Binding")]
44-
[TestMethod]
43+
[Category("Binding")]
44+
[Test]
4545
public void LExpressionIsProject()
4646
{
4747
const string PROJECT_NAME = "AnyProject";
@@ -61,8 +61,8 @@ public void LExpressionIsProject()
6161
}
6262
}
6363

64-
[TestCategory("Binding")]
65-
[TestMethod]
64+
[Category("Binding")]
65+
[Test]
6666
public void LExpressionIsProceduralModule()
6767
{
6868
const string PROJECT_NAME = "AnyProject";
@@ -82,8 +82,8 @@ public void LExpressionIsProceduralModule()
8282
}
8383
}
8484

85-
[TestCategory("Binding")]
86-
[TestMethod]
85+
[Category("Binding")]
86+
[Test]
8787
public void LExpressionIsEnum()
8888
{
8989
const string PROJECT_NAME = "AnyProject";

‎RubberduckTests/Binding/MemberAccessProcedurePointerBindingTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -11,14 +11,14 @@
1111

1212
namespace RubberduckTests.Binding
1313
{
14-
[TestClass]
14+
[TestFixture]
1515
public class MemberAccessProcedurePointerBindingTests
1616
{
1717
private const string BINDING_TARGET_NAME = "BindingTarget";
1818
private const string TEST_CLASS_NAME = "TestClass";
1919

20-
[TestCategory("Binding")]
21-
[TestMethod]
20+
[Category("Binding")]
21+
[Test]
2222
public void ProceduralModuleWithAccessibleMember()
2323
{
2424
var builder = new MockVbeBuilder();

‎RubberduckTests/Binding/MemberAccessTypeBindingTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -11,15 +11,15 @@
1111

1212
namespace RubberduckTests.Binding
1313
{
14-
[TestClass]
14+
[TestFixture]
1515
public class MemberAccessTypeBindingTests
1616
{
1717
private const string BindingTargetName = "BindingTarget";
1818
private const string TestClassName = "TestClass";
1919
private const string ReferencedProjectFilepath = @"C:\Temp\ReferencedProjectA";
2020

21-
[TestCategory("Binding")]
22-
[TestMethod]
21+
[Category("Binding")]
22+
[Test]
2323
public void LExpressionIsProjectAndUnrestrictedNameIsProject()
2424
{
2525
var enclosingModuleCode = string.Format("Public WithEvents anything As {0}.{0}", BindingTargetName);
@@ -42,8 +42,8 @@ public void LExpressionIsProjectAndUnrestrictedNameIsProject()
4242
}
4343
}
4444

45-
[TestCategory("Binding")]
46-
[TestMethod]
45+
[Category("Binding")]
46+
[Test]
4747
public void LExpressionIsProjectAndUnrestrictedNameIsProceduralModule()
4848
{
4949
const string projectName = "AnyName";
@@ -66,8 +66,8 @@ public void LExpressionIsProjectAndUnrestrictedNameIsProceduralModule()
6666
}
6767
}
6868

69-
[TestCategory("Binding")]
70-
[TestMethod]
69+
[Category("Binding")]
70+
[Test]
7171
public void LExpressionIsProjectAndUnrestrictedNameIsClassModule()
7272
{
7373
const string projectName = "AnyName";
@@ -90,8 +90,8 @@ public void LExpressionIsProjectAndUnrestrictedNameIsClassModule()
9090
}
9191
}
9292

93-
[TestCategory("Binding")]
94-
[TestMethod]
93+
[Category("Binding")]
94+
[Test]
9595
public void LExpressionIsProjectAndUnrestrictedNameIsType()
9696
{
9797
var builder = new MockVbeBuilder();
@@ -121,8 +121,8 @@ public void LExpressionIsProjectAndUnrestrictedNameIsType()
121121
}
122122
}
123123

124-
[TestCategory("Binding")]
125-
[TestMethod]
124+
[Category("Binding")]
125+
[Test]
126126
public void LExpressionIsModuleAndUnrestrictedNameIsType()
127127
{
128128
var builder = new MockVbeBuilder();
@@ -146,8 +146,8 @@ public void LExpressionIsModuleAndUnrestrictedNameIsType()
146146
}
147147
}
148148

149-
[TestCategory("Binding")]
150-
[TestMethod]
149+
[Category("Binding")]
150+
[Test]
151151
public void NestedMemberAccessExpressions()
152152
{
153153
const string projectName = "AnyProjectName";

‎RubberduckTests/Binding/SimpleNameDefaultBindingTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -11,15 +11,15 @@
1111

1212
namespace RubberduckTests.Binding
1313
{
14-
[TestClass]
14+
[TestFixture]
1515
public class SimpleNameDefaultBindingTests
1616
{
1717
private const string BindingTargetName = "BindingTarget";
1818
private const string TestClassName = "TestClass";
1919
private const string ReferencedProjectFilepath = @"C:\Temp\ReferencedProjectA";
2020

21-
[TestCategory("Binding")]
22-
[TestMethod]
21+
[Category("Binding")]
22+
[Test]
2323
public void EnclosingProcedureComesBeforeEnclosingModule()
2424
{
2525
string testCode = string.Format(@"
@@ -41,8 +41,8 @@ Dim a As String * {0}
4141
}
4242
}
4343

44-
[TestCategory("Binding")]
45-
[TestMethod]
44+
[Category("Binding")]
45+
[Test]
4646
public void EnclosingModuleComesBeforeEnclosingProject()
4747
{
4848
var builder = new MockVbeBuilder();
@@ -59,8 +59,8 @@ public void EnclosingModuleComesBeforeEnclosingProject()
5959
}
6060
}
6161

62-
[TestCategory("Binding")]
63-
[TestMethod]
62+
[Category("Binding")]
63+
[Test]
6464
public void EnclosingProjectComesBeforeOtherModuleInEnclosingProject()
6565
{
6666
var builder = new MockVbeBuilder();
@@ -79,8 +79,8 @@ public void EnclosingProjectComesBeforeOtherModuleInEnclosingProject()
7979
}
8080
}
8181

82-
[TestCategory("Binding")]
83-
[TestMethod]
82+
[Category("Binding")]
83+
[Test]
8484
public void OtherModuleInEnclosingProjectComesBeforeReferencedProjectModule()
8585
{
8686
var builder = new MockVbeBuilder();
@@ -108,8 +108,8 @@ public void OtherModuleInEnclosingProjectComesBeforeReferencedProjectModule()
108108
}
109109
}
110110

111-
[TestCategory("Binding")]
112-
[TestMethod]
111+
[Category("Binding")]
112+
[Test]
113113
public void ReferencedProjectModuleComesBeforeReferencedProjectType()
114114
{
115115
var builder = new MockVbeBuilder();
@@ -138,8 +138,8 @@ public void ReferencedProjectModuleComesBeforeReferencedProjectType()
138138
}
139139
}
140140

141-
[TestCategory("Binding")]
142-
[TestMethod]
141+
[Category("Binding")]
142+
[Test]
143143
public void ReferencedProjectClassNotMarkedAsGlobalClassModuleIsNotReferenced()
144144
{
145145
var builder = new MockVbeBuilder();

‎RubberduckTests/Binding/SimpleNameProcedurePointerBindingTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
44
using RubberduckTests.Mocks;
@@ -11,14 +11,14 @@
1111

1212
namespace RubberduckTests.Binding
1313
{
14-
[TestClass]
14+
[TestFixture]
1515
public class SimpleNameProcedurePointerBindingTests
1616
{
1717
private const string BINDING_TARGET_NAME = "BindingTarget";
1818
private const string TEST_CLASS_NAME = "TestClass";
1919

20-
[TestCategory("Binding")]
21-
[TestMethod]
20+
[Category("Binding")]
21+
[Test]
2222
public void EnclosingModuleComesBeforeEnclosingProject()
2323
{
2424
var builder = new MockVbeBuilder();
@@ -37,8 +37,8 @@ public void EnclosingModuleComesBeforeEnclosingProject()
3737
}
3838
}
3939

40-
[TestCategory("Binding")]
41-
[TestMethod]
40+
[Category("Binding")]
41+
[Test]
4242
public void EnclosingProjectComesBeforeOtherProceduralModule()
4343
{
4444
var builder = new MockVbeBuilder();
@@ -58,8 +58,8 @@ public void EnclosingProjectComesBeforeOtherProceduralModule()
5858
}
5959
}
6060

61-
[TestCategory("Binding")]
62-
[TestMethod]
61+
[Category("Binding")]
62+
[Test]
6363
public void OtherProceduralModule()
6464
{
6565
var builder = new MockVbeBuilder();

0 commit comments

Comments
 (0)