Skip to content

Commit

Permalink
Merge pull request #7 from T145/master
Browse files Browse the repository at this point in the history
Consecutive Cleanup
  • Loading branch information
irperez committed Jul 25, 2013
2 parents c86e0d3 + 3791277 commit 950ec45
Show file tree
Hide file tree
Showing 27 changed files with 4,149 additions and 4,766 deletions.
22 changes: 0 additions & 22 deletions .gitattributes

This file was deleted.

125 changes: 26 additions & 99 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,51 +1,20 @@
## Ignore Visual Studio temporary files, build results, and files generated by popular Visual Studio add-ons.

#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# OS generated files
.DS_Store

# User-specific files
*.sln.docstates
*.suo
*.user
*.sln.docstates
*.userprefs

# Build results
**/[Dd]ebug/
**/[Rr]elease/
[Bb]in
[Oo]bj
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*.ilk
Expand All @@ -57,16 +26,15 @@ local.properties
*.pgd
*.rsp
*.sbr
[Tt]est-[Rr]esults/*
*.tlb
*.tli
*.tlh
*.tmp
*.log
*.vspscc
*.vssscc
.builds
**/*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
#**/packages/

# Visual C++ cache files
ipch/
Expand All @@ -78,10 +46,18 @@ ipch/
# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress

Expand All @@ -98,68 +74,19 @@ DocProject/Help/html
# Click-Once directory
publish

# Publish Web Output
*.Publish.xml

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
# Backup & report files from converting an old project file to a newer Visual Studio version.
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store
18 changes: 0 additions & 18 deletions Cubico.Tests/ConversionResultTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ namespace Cubico.Tests
public class ConversionResultTest
{
TestContext testContextInstance;

// Gets or sets the test context which provides information about and functionality for the current test run.
public TestContext TestContext {
get { return testContextInstance; }
set { testContextInstance = value; }
}

#region "ConversionResult.ConversionResult()"

[Test]
public void ConversionResultConstructorTest ()
{
Expand All @@ -27,10 +24,8 @@ public void ConversionResultConstructorTest ()
Assert.AreEqual (Result.NoError, res.Result);
Assert.AreEqual (null, res.Symbol);
}

#endregion
#region "ConversionResult.ConversionResult(Double)"

[Test]
public void ConversionResultConstructorDoubleTest ()
{
Expand All @@ -52,10 +47,8 @@ public void ConversionResultConstructorDoubleZeroTest ()
Assert.AreEqual (Result.NoError, res.Result);
Assert.AreEqual (null, res.Symbol);
}

#endregion
#region "ConversionResult.ConversionResult(Double, String)"

[Test]
public void ConversionResultConstructorDoubleStringTest ()
{
Expand Down Expand Up @@ -99,10 +92,8 @@ public void ConversionResultConstructorDoubleStringZeroTest3 ()
Assert.AreEqual (Result.NoError, res.Result);
Assert.AreEqual ("lb", res.Symbol);
}

#endregion
#region "ConversionResult.ConversionResult(Double, Result)"

[Test]
public void ConversionResultConstructorDoubleResultTest ()
{
Expand Down Expand Up @@ -146,10 +137,8 @@ public void ConversionResultConstructorDoubleResultNullTest3 ()
Assert.AreEqual (Result.GenericError, res.Result);
Assert.AreEqual (null, res.Symbol);
}

#endregion
#region "ConversionResult.ConversionResult(Result)"

[Test]
public void ConversionResultConstructorResultTest ()
{
Expand All @@ -171,10 +160,8 @@ public void ConversionResultConstructorResultNullTest ()
Assert.AreEqual (Result.NoError, res.Result);
Assert.AreEqual (null, res.Symbol);
}

#endregion
#region "ConversionResult.Result"

[Test]
public void ConversionResultResultTest ()
{
Expand All @@ -200,10 +187,8 @@ public void ConversionResultResultNullTest ()

Assert.AreEqual (Result.NoError, res.Result);
}

#endregion
#region "ConversionResult.Value"

[Test]
public void ConversionResultValueTest ()
{
Expand All @@ -229,10 +214,8 @@ public void ConversionResultValueNullTest ()

Assert.AreEqual (0, res.Value);
}

#endregion
#region "ConversionResult.Symbol"

[Test]
public void ConversionResultSymbolTest ()
{
Expand All @@ -258,7 +241,6 @@ public void ConversionResultSymbolNullTest ()

Assert.AreEqual (null, res.Symbol);
}

#endregion
}
}
Loading

0 comments on commit 950ec45

Please sign in to comment.