pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed build. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3765 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
02d3d085d2
commit
a8dd913eb1
3 changed files with 22 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs
  2. 50
      src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryRefactoringProviderTests.cs
  3. 5
      src/Main/StartUp/Project/app.template.config

2
src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs
Unescape View File

@ -59,7 +59,7 @@ namespace Grunwald.BooBinding.Tests
pc.ReferencedContents.Add(booLangPC); pc.ReferencedContents.Add(booLangPC);
ICompilationUnit cu = new BooParser().Parse(pc, fileName, prog); ICompilationUnit cu = new BooParser().Parse(pc, fileName, prog);
ParserService.RegisterParseInformation(fileName, cu); ParserService.RegisterParseInformation(fileName, cu);
cu.Classes.Foreach(pc.AddClassToNamespaceList); cu.Classes.ForEach(pc.AddClassToNamespaceList);
} }
void GetPos(string prog, string marker, out int line, out int column) void GetPos(string prog, string marker, out int line, out int column)

50
src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryRefactoringProviderTests.cs
Unescape View File

@ -52,7 +52,7 @@ namespace ExtractInterface.Tests {
string Configure {set;} string Configure {set;}
IList<int> GetRange(string subject); IList<int> GetRange(string subject);
int MultiplyBy5(int x, int MultiplyBy5(int x,
out bool success); out bool success);
event EventHandler<UnhandledExceptionEventArgs> ConfigurationChanged; event EventHandler<UnhandledExceptionEventArgs> ConfigurationChanged;
@ -60,17 +60,17 @@ namespace ExtractInterface.Tests {
} }
"; ";
} }
private class TestClass { private class TestClass {
public const string FileName = "TestCase.cs"; public const string FileName = "TestCase.cs";
// TODO: write TestClass.FileContent to refactor the string literal code blocks // TODO: write TestClass.FileContent to refactor the string literal code blocks
// from the following tests. // from the following tests.
public const string FileContent = @""; public const string FileContent = @"";
} }
#region Sanity Test #region Sanity Test
[Test] [Test]
/// <summary> /// <summary>
/// ensures that the custom assertions in this test fixture are working properly /// ensures that the custom assertions in this test fixture are working properly
@ -151,12 +151,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name; string sourceClassName = c.Name;
string sourceNamespace = c.Namespace; string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName, string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
membersToExtract, interfaceName, fileContent, membersToExtract, c, false);
false,
sourceNamespace,
sourceClassName,
fileContent);
ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode); ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode);
IClass i = icu.Classes[0]; IClass i = icu.Classes[0];
@ -206,12 +202,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name; string sourceClassName = c.Name;
string sourceNamespace = c.Namespace; string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName, string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
membersToExtract, interfaceName, fileContent, membersToExtract, c, false);
false,
sourceNamespace,
sourceClassName,
fileContent);
ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode); ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode);
IClass i = icu.Classes[0]; IClass i = icu.Classes[0];
@ -265,12 +257,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name; string sourceClassName = c.Name;
string sourceNamespace = c.Namespace; string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName, string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
membersToExtract, interfaceName, fileContent, membersToExtract, c, false);
false,
sourceNamespace,
sourceClassName,
fileContent);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode); ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0]; IClass i = icu.Classes[0];
@ -331,12 +319,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name; string sourceClassName = c.Name;
string sourceNamespace = c.Namespace; string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName, string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
membersToExtract, interfaceName, fileContent, membersToExtract, c, false);
false,
sourceNamespace,
sourceClassName,
fileContent);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode); ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0]; IClass i = icu.Classes[0];
@ -354,6 +338,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
} }
[Test] [Test]
[Ignore("This test is not necessary: we shouldn't require that GenerateInterfaceForClass ignores static methods, " +
"they cannot be selected as memberToExtract in the UI anyways.")]
public void GenerateInterfaceWithStaticMethodsTest() { public void GenerateInterfaceWithStaticMethodsTest() {
string fileContent = @" string fileContent = @"
using System; using System;
@ -390,12 +376,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name; string sourceClassName = c.Name;
string sourceNamespace = c.Namespace; string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName, string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
membersToExtract, interfaceName, fileContent, membersToExtract, c, false);
false,
sourceNamespace,
sourceClassName,
fileContent);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode); ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0]; IClass i = icu.Classes[0];

5
src/Main/StartUp/Project/app.template.config
Unescape View File

@ -70,6 +70,7 @@
<!-- <add key="domPersistencePath" value="none" /> --> <!-- <add key="domPersistencePath" value="none" /> -->
</appSettings> </appSettings>
<log4net> <log4net>
<!-- Writes to the console. The console is only visible in debug builds of SharpDevelop. -->
<appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender"> <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
<mapping> <mapping>
<level value="FATAL" /> <level value="FATAL" />
@ -96,12 +97,14 @@
</layout> </layout>
</appender> </appender>
<!-- Writes to OutputDebugString - use a tool like Sysinternals DebugView to view the log -->
<appender name="DebugAppender" type="log4net.Appender.OutputDebugStringAppender"> <appender name="DebugAppender" type="log4net.Appender.OutputDebugStringAppender">
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%thread] %-5level- %message%newline" /> <conversionPattern value="[%thread] %-5level- %message%newline" />
</layout> </layout>
</appender> </appender>
<!-- Allows writing to a log file -->
<appender name="FileAppender" type="log4net.Appender.FileAppender"> <appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value="SharpDevelopLog.txt" /> <file value="SharpDevelopLog.txt" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
@ -109,12 +112,14 @@
</layout> </layout>
</appender> </appender>
<!--- Keeps the last few log entries and appends them to bug reports when an exception occurs -->
<appender name="Recorder" type="ICSharpCode.SharpDevelop.Sda.LogMessageRecorder, ICSharpCode.SharpDevelop.Sda"> <appender name="Recorder" type="ICSharpCode.SharpDevelop.Sda.LogMessageRecorder, ICSharpCode.SharpDevelop.Sda">
<bufferSize value="25" /> <bufferSize value="25" />
</appender> </appender>
<root> <root>
<level value="DEBUG" /> <level value="DEBUG" />
<!-- Here you can configure which log appenders should be used -->
<appender-ref ref="ColoredConsoleAppender" /> <appender-ref ref="ColoredConsoleAppender" />
<appender-ref ref="Recorder" /> <appender-ref ref="Recorder" />
</root> </root>

Write Preview
Loading…
Cancel
Save