Skip to content

create new namespace structure #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ArchUnit.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright 2019 Florian Gather &lt;florian.gather@tngtech.com&gt;
Copyright 2019 Paula Ruiz &lt;paularuiz22@gmail.com&gt;
Copyright 2019 Fritz Brandhuber &lt;fritz.brandhuber@tngtech.com&gt;
Copyright 2020 Pavel Fischer &lt;rubbiroid@gmail.com&gt;

SPDX-License-Identifier: Apache-2.0
</s:String>
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=archrule/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=intf/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=lambda/@EntryIndexedValue">True</s:Boolean>
Expand Down
4 changes: 2 additions & 2 deletions ArchUnitNET.NUnit/ArchRuleAssert.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public static class ArchRuleAssert
/// <param name="archRule">The rule to test the architecture with</param>
public static void FulfilsRule(Architecture architecture, IArchRule archRule)
{
if (!architecture.FulfilsRule(archRule))
if (!archRule.HasNoViolations(architecture))
{
Assert.Fail(architecture.EvaluateRule(archRule).ToErrorMessage());
Assert.Fail(archRule.Evaluate(architecture).ToErrorMessage());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET.NUnitTests/RuleEvaluationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
//
// SPDX-License-Identifier: Apache-2.0

using ArchUnitNET.Core;
using ArchUnitNET.Domain;
using ArchUnitNET.Fluent;
using ArchUnitNET.Fluent.Extensions;
using ArchUnitNET.Loader;
using ArchUnitNET.NUnit;
using NUnit.Framework;
using static ArchUnitNET.Fluent.ArchRuleDefinition;
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET.xUnit/Asserts/ArchRuleAsserts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ partial class Assert
/// <exception cref="FailedArchRuleException">Thrown if the rule is violated</exception>
public static void ArchRule(Architecture architecture, IArchRule archRule)
{
if (!architecture.FulfilsRule(archRule))
if (!archRule.HasNoViolations(architecture))
{
throw new FailedArchRuleException(architecture, archRule);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class FailedArchRuleException : XunitException
/// <param name="architecture">The architecture which was tested</param>
/// <param name="archRule">The archrule that failed</param>
public FailedArchRuleException(Architecture architecture, IArchRule archRule)
: this(architecture.EvaluateRule(archRule))
: this(archRule.Evaluate(architecture))
{
}

Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/ArchUnitNET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>ArchUnitNET</RootNamespace>
<PackageId>TngTech.ArchUnitNET</PackageId>
<Title>ArchUnit C#</Title>
<Authors>Florian Gather, Paula Ruiz, Fritz Brandhuber</Authors>
<Authors>Florian Gather, Paula Ruiz, Fritz Brandhuber, Pavel Fischer</Authors>
<Company>TNG Technology Consulting GmbH</Company>
<Description>C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseUrl>https://apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
Expand Down
17 changes: 0 additions & 17 deletions ArchUnitNET/ArchitectureExceptions/ArchitectureException.cs

This file was deleted.

13 changes: 0 additions & 13 deletions ArchUnitNET/Domain/Architecture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ public Architecture(IEnumerable<Assembly> allAssemblies, IEnumerable<Namespace>
}

public IEnumerable<Assembly> Assemblies => _allAssemblies.Where(assembly => !assembly.IsOnlyReferenced);

public IEnumerable<Namespace> Namespaces { get; }

public IEnumerable<IType> Types { get; }

public IEnumerable<Class> Classes => Types.OfType<Class>();
public IEnumerable<Interface> Interfaces => Types.OfType<Interface>();
public IEnumerable<Attribute> Attributes => Types.OfType<Attribute>();
Expand All @@ -39,22 +36,12 @@ public Architecture(IEnumerable<Assembly> allAssemblies, IEnumerable<Namespace>
public IEnumerable<MethodMember> MethodMembers => Members.OfType<MethodMember>();
public IEnumerable<IMember> Members => Types.SelectMany(type => type.Members);

public bool FulfilsRule(IArchRule archRule)
{
return archRule.HasNoViolations(this);
}

public IEnumerable<T> GetOrCreateObjects<T>(IObjectProvider<T> objectProvider,
Func<Architecture, IEnumerable<T>> providingFunction) where T : ICanBeAnalyzed
{
return _objectProviderCache.GetOrCreateObjects(objectProvider, providingFunction);
}

public IEnumerable<EvaluationResult> EvaluateRule(IArchRule archRule)
{
return archRule.Evaluate(this);
}

public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj))
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/ArchitectureCacheKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using ArchUnitNET.Fluent.Extensions;
using ArchUnitNET.Domain.Extensions;

namespace ArchUnitNET.Domain
{
Expand Down
6 changes: 3 additions & 3 deletions ArchUnitNET/Domain/Class.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

using System.Collections.Generic;
using System.Linq;
using ArchUnitNET.Domain.Dependencies.Types;
using ArchUnitNET.Fluent.Extensions;
using ArchUnitNET.Domain.Dependencies;
using ArchUnitNET.Domain.Extensions;
using JetBrains.Annotations;

namespace ArchUnitNET.Domain
Expand Down Expand Up @@ -101,7 +101,7 @@ public bool IsAssignableTo(IType assignableToType)
public bool IsAssignableTo(string pattern, bool useRegularExpressions = false)
{
return pattern != null && this.GetAssignableTypes()
.Any(type => type.FullNameMatches(pattern, useRegularExpressions));
.Any(type => type.FullNameMatches(pattern, useRegularExpressions));
}

public override string ToString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class AttributeMemberDependency : MemberwiseEquatable<AttributeMemberDependency>, IMemberTypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Types
namespace ArchUnitNET.Domain.Dependencies
{
public class AttributeTypeDependency : MemberwiseEquatable<AttributeTypeDependency>, ITypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class BodyTypeMemberDependency : MemberwiseEquatable<BodyTypeMemberDependency>,
IMemberTypeDependency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class FieldTypeDependency : MemberwiseEquatable<FieldTypeDependency>, IMemberTypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// SPDX-License-Identifier: Apache-2.0

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public interface IMemberMemberDependency : IMemberTypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
//
// SPDX-License-Identifier: Apache-2.0

using ArchUnitNET.Domain.Dependencies.Types;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public interface IMemberTypeDependency : ITypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// SPDX-License-Identifier: Apache-2.0

namespace ArchUnitNET.Domain.Dependencies.Types
namespace ArchUnitNET.Domain.Dependencies
{
public interface ITypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Types
namespace ArchUnitNET.Domain.Dependencies
{
public class ImplementsInterfaceDependency : MemberwiseEquatable<ImplementsInterfaceDependency>, ITypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Types
namespace ArchUnitNET.Domain.Dependencies
{
public class InheritsBaseClassDependency : MemberwiseEquatable<InheritsBaseClassDependency>, ITypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// SPDX-License-Identifier: Apache-2.0

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class MethodCallDependency : IMemberMemberDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class MethodSignatureDependency : MemberwiseEquatable<MethodSignatureDependency>,
IMemberTypeDependency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Members
namespace ArchUnitNET.Domain.Dependencies
{
public class PropertyTypeDependency : MemberwiseEquatable<PropertyTypeDependency>, IMemberTypeDependency
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using Equ;

namespace ArchUnitNET.Domain.Dependencies.Types
namespace ArchUnitNET.Domain.Dependencies
{
public class TypeReferenceDependency : MemberwiseEquatable<TypeReferenceDependency>, ITypeDependency
{
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,12 @@

using System;

namespace ArchUnitNET.ArchitectureExceptions
namespace ArchUnitNET.Domain.Exceptions
{
public class AssemblyDoesNotExistInArchitecture : Exception
{
public AssemblyDoesNotExistInArchitecture(string message) : base(message)
{
}

public AssemblyDoesNotExistInArchitecture(string message, Exception innerException) : base(message,
innerException)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

using System;

namespace ArchUnitNET.ArchitectureExceptions
namespace ArchUnitNET.Domain.Exceptions
{
public class InvalidStateException : Exception
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,12 @@

using System;

namespace ArchUnitNET.ArchitectureExceptions
namespace ArchUnitNET.Domain.Exceptions
{
public class MultipleOccurrencesInSequenceException : Exception
{
public MultipleOccurrencesInSequenceException(string message) : base(message)
{
}

public MultipleOccurrencesInSequenceException(string message, Exception innerException) : base(message,
innerException)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@

using System;

namespace ArchUnitNET.ArchitectureExceptions
namespace ArchUnitNET.Domain.Exceptions
{
public class TypeDoesNotExistInArchitecture : Exception
{
public TypeDoesNotExistInArchitecture(string message) : base(message)
{
}

public TypeDoesNotExistInArchitecture(string message, Exception innerException) : base(message, innerException)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
// SPDX-License-Identifier: Apache-2.0

using System;
using ArchUnitNET.ArchitectureExceptions;
using ArchUnitNET.Domain;
using ArchUnitNET.Domain.Exceptions;
using JetBrains.Annotations;
using Attribute = ArchUnitNET.Domain.Attribute;

namespace ArchUnitNET.Fluent.Extensions
namespace ArchUnitNET.Domain.Extensions
{
public static class ArchitectureExtensions
{
Expand Down
Loading