Refactor models package and assertions

src/test/java/dicontainer/dictionary/DiDictionaryTest.java

@@ -6,11 +6,6 @@
 import org.junit.jupiter.api.Test;
 
 import dicontainer.ConstructionPolicy;
-import dicontainer.auxiliary.basic.ClassBasicAbstract;
-import dicontainer.auxiliary.basic.ClassBasicInheritsFromAbstract;
-import dicontainer.auxiliary.basic.ClassBasicStringGetter;
-import dicontainer.auxiliary.basic.InterfaceBasic;
-import dicontainer.auxiliary.register.*;
 import dicontainer.dictionary.exception.AbstractTypeException;
 import dicontainer.dictionary.exception.AnnotatedTypeRegistrationException;
 import dicontainer.dictionary.exception.MixingPoliciesException;
@@ -19,6 +14,11 @@
 import dicontainer.dictionary.valuetypes.Instance;
 import dicontainer.dictionary.valuetypes.NullInstanceException;
 import dicontainer.dictionary.valuetypes.Subtype;
+import dicontainer.models.basic.ClassBasicAbstract;
+import dicontainer.models.basic.ClassBasicInheritsFromAbstract;
+import dicontainer.models.basic.ClassBasicStringGetter;
+import dicontainer.models.basic.InterfaceBasic;
+import dicontainer.models.register.*;
 
 public class DiDictionaryTest
 {
@@ -165,6 +165,7 @@ public void addType_WhenRegisteredInstance_ThenRegistrationException()
         ClassBasicStringGetter instance = new ClassBasicStringGetter(string);
 
         testObject.addInstance(type, instance);
+        // then
         Assertions.assertThatThrownBy(() -> testObject.addType(type))
                   .isInstanceOf(RegistrationException.class);
     }
@@ -208,6 +209,7 @@ public void addInstance_WhenRegisteredType_ThenRegistrationException()
         ClassBasicStringGetter instance = new ClassBasicStringGetter(string);
 
         testObject.addType(type);
+        // then
         Assertions.assertThatThrownBy(() -> testObject.addInstance(type, instance))
                   .isInstanceOf(RegistrationException.class);
     }
@@ -286,6 +288,7 @@ public void findType_WhenDifferentPolicy_ThenMixingPoliciesException()
                            ConstructionPolicy.CONSTRUCT);
         testObject.addType(ClassBasicAbstract.class, ClassBasicInheritsFromAbstract.class,
                            ConstructionPolicy.SINGLETON);
+        // then
         Assertions.assertThatThrownBy(() -> testObject.findType(InterfaceBasic.class))
                   .isInstanceOf(MixingPoliciesException.class);
     }

src/test/java/dicontainer/auxiliary/basic/ClassBasicAbstract.java → src/test/java/dicontainer/models/basic/ClassBasicAbstract.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 public abstract class ClassBasicAbstract
         implements InterfaceBasic

src/test/java/dicontainer/auxiliary/basic/ClassBasicComplexDependency.java → src/test/java/dicontainer/models/basic/ClassBasicComplexDependency.java

@@ -1,7 +1,7 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 import dicontainer.annotation.Dependency;
-import dicontainer.auxiliary.diamond.InterfaceDiamondLeft;
+import dicontainer.models.diamond.InterfaceDiamondLeft;
 
 public class ClassBasicComplexDependency
         implements InterfaceBasicComplexDependency
@@ -11,8 +11,8 @@ public class ClassBasicComplexDependency
     private InterfaceBasic basicObject;
 
     @Dependency
-    public ClassBasicComplexDependency(InterfaceDiamondLeft firstObject,
-                                       InterfaceBasicStringGetter secondObject)
+    public ClassBasicComplexDependency(
+            InterfaceDiamondLeft firstObject, InterfaceBasicStringGetter secondObject)
     {
         this.firstObject = firstObject;
         this.secondObject = secondObject;

src/test/java/dicontainer/auxiliary/basic/ClassBasicInheritsFromAbstract.java → src/test/java/dicontainer/models/basic/ClassBasicInheritsFromAbstract.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 public class ClassBasicInheritsFromAbstract
         extends ClassBasicAbstract

src/test/java/dicontainer/auxiliary/basic/ClassBasicStringGetter.java → src/test/java/dicontainer/models/basic/ClassBasicStringGetter.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 public class ClassBasicStringGetter
         implements InterfaceBasicStringGetter

src/test/java/dicontainer/auxiliary/basic/InterfaceBasic.java → src/test/java/dicontainer/models/basic/InterfaceBasic.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 public interface InterfaceBasic
 {

src/test/java/dicontainer/auxiliary/basic/InterfaceBasicComplexDependency.java → src/test/java/dicontainer/models/basic/InterfaceBasicComplexDependency.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
-import dicontainer.auxiliary.setter.InterfaceSetter;
+import dicontainer.models.setter.InterfaceSetter;
 
 public interface InterfaceBasicComplexDependency
         extends InterfaceBasicSimpleDependency, InterfaceSetter

src/test/java/dicontainer/auxiliary/basic/InterfaceBasicSimpleDependency.java → src/test/java/dicontainer/models/basic/InterfaceBasicSimpleDependency.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
-import dicontainer.auxiliary.diamond.InterfaceDiamondLeft;
+import dicontainer.models.diamond.InterfaceDiamondLeft;
 
 public interface InterfaceBasicSimpleDependency
 {

src/test/java/dicontainer/auxiliary/basic/InterfaceBasicStringGetter.java → src/test/java/dicontainer/models/basic/InterfaceBasicStringGetter.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.basic;
+package dicontainer.models.basic;
 
 public interface InterfaceBasicStringGetter
 {

src/test/java/dicontainer/auxiliary/circular/ClassCircularDependency.java → src/test/java/dicontainer/models/circular/ClassCircularDependency.java

@@ -1,15 +1,15 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
-import dicontainer.auxiliary.basic.InterfaceBasicStringGetter;
+import dicontainer.models.basic.InterfaceBasicStringGetter;
 
 public class ClassCircularDependency
         implements InterfaceCircularDependency
 {
     InterfaceCircularLeft circular;
     InterfaceBasicStringGetter nonCircular;
 
-    public ClassCircularDependency(InterfaceCircularLeft circular,
-                                   InterfaceBasicStringGetter nonCircular)
+    public ClassCircularDependency(
+            InterfaceCircularLeft circular, InterfaceBasicStringGetter nonCircular)
     {
         this.circular = circular;
         this.nonCircular = nonCircular;

src/test/java/dicontainer/auxiliary/circular/ClassCircularLeft.java → src/test/java/dicontainer/models/circular/ClassCircularLeft.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
 public class ClassCircularLeft
         implements InterfaceCircularLeft

src/test/java/dicontainer/auxiliary/circular/ClassCircularRight.java → src/test/java/dicontainer/models/circular/ClassCircularRight.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
 public class ClassCircularRight
         implements InterfaceCircularRight

src/test/java/dicontainer/auxiliary/circular/InterfaceCircularDependency.java → src/test/java/dicontainer/models/circular/InterfaceCircularDependency.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
-import dicontainer.auxiliary.basic.InterfaceBasicStringGetter;
+import dicontainer.models.basic.InterfaceBasicStringGetter;
 
 public interface InterfaceCircularDependency
 {

src/test/java/dicontainer/auxiliary/circular/InterfaceCircularLeft.java → src/test/java/dicontainer/models/circular/InterfaceCircularLeft.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
 public interface InterfaceCircularLeft
 {

src/test/java/dicontainer/auxiliary/circular/InterfaceCircularRight.java → src/test/java/dicontainer/models/circular/InterfaceCircularRight.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.circular;
+package dicontainer.models.circular;
 
 public interface InterfaceCircularRight
 {

src/test/java/dicontainer/auxiliary/comparator/ClassComparatorConstructor.java → src/test/java/dicontainer/models/comparator/ClassComparatorConstructor.java

@@ -1,12 +1,12 @@
-package dicontainer.auxiliary.comparator;
+package dicontainer.models.comparator;
 
 import java.util.Arrays;
 import java.util.List;
 
 import dicontainer.annotation.Dependency;
-import dicontainer.auxiliary.basic.ClassBasicInheritsFromAbstract;
-import dicontainer.auxiliary.basic.ClassBasicStringGetter;
-import dicontainer.auxiliary.basic.InterfaceBasic;
+import dicontainer.models.basic.ClassBasicInheritsFromAbstract;
+import dicontainer.models.basic.ClassBasicStringGetter;
+import dicontainer.models.basic.InterfaceBasic;
 
 public class ClassComparatorConstructor
 {
@@ -16,9 +16,12 @@ public class ClassComparatorConstructor
     InterfaceBasic interfaceBasic;
     ClassBasicStringGetter classBasicStringGetter;
 
-    public ClassComparatorConstructor(int number, String string, List<Double> doubles,
-                                      InterfaceBasic interfaceBasic,
-                                      ClassBasicStringGetter classBasicStringGetter)
+    public ClassComparatorConstructor(
+            int number,
+            String string,
+            List<Double> doubles,
+            InterfaceBasic interfaceBasic,
+            ClassBasicStringGetter classBasicStringGetter)
     {
         this.number = number;
         this.string = string;
@@ -27,8 +30,8 @@ public ClassComparatorConstructor(int number, String string, List<Double> double
         this.classBasicStringGetter = classBasicStringGetter;
     }
 
-    public ClassComparatorConstructor(int number, String string, List<Double> doubles,
-                                      InterfaceBasic interfaceBasic)
+    public ClassComparatorConstructor(
+            int number, String string, List<Double> doubles, InterfaceBasic interfaceBasic)
     {
         this.number = number;
         this.string = string;

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorAnnotatedDefault.java → src/test/java/dicontainer/models/constructor/ClassConstructorAnnotatedDefault.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 import dicontainer.annotation.Dependency;
 

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorAnnotatedWithDependency.java → src/test/java/dicontainer/models/constructor/ClassConstructorAnnotatedWithDependency.java

@@ -1,9 +1,9 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 import dicontainer.annotation.Dependency;
-import dicontainer.auxiliary.basic.InterfaceBasicSimpleDependency;
-import dicontainer.auxiliary.basic.InterfaceBasicStringGetter;
-import dicontainer.auxiliary.diamond.InterfaceDiamondLeft;
+import dicontainer.models.basic.InterfaceBasicSimpleDependency;
+import dicontainer.models.basic.InterfaceBasicStringGetter;
+import dicontainer.models.diamond.InterfaceDiamondLeft;
 
 public class ClassConstructorAnnotatedWithDependency
         implements InterfaceBasicSimpleDependency
@@ -12,8 +12,8 @@ public class ClassConstructorAnnotatedWithDependency
     private InterfaceBasicStringGetter secondObject;
 
     @Dependency
-    public ClassConstructorAnnotatedWithDependency(InterfaceDiamondLeft firstObject,
-                                                   InterfaceBasicStringGetter secondObject)
+    public ClassConstructorAnnotatedWithDependency(
+            InterfaceDiamondLeft firstObject, InterfaceBasicStringGetter secondObject)
     {
         this.firstObject = firstObject;
         this.secondObject = secondObject;

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorDefault.java → src/test/java/dicontainer/models/constructor/ClassConstructorDefault.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
-import dicontainer.auxiliary.basic.InterfaceBasic;
+import dicontainer.models.basic.InterfaceBasic;
 
 public class ClassConstructorDefault
         implements InterfaceBasic

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorDefaultAndParameterized.java → src/test/java/dicontainer/models/constructor/ClassConstructorDefaultAndParameterized.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
-import dicontainer.auxiliary.basic.InterfaceBasic;
+import dicontainer.models.basic.InterfaceBasic;
 
 public class ClassConstructorDefaultAndParameterized
         implements InterfaceBasic

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorExceptionThrown.java → src/test/java/dicontainer/models/constructor/ClassConstructorExceptionThrown.java

@@ -1,7 +1,7 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 import dicontainer.annotation.Dependency;
-import dicontainer.auxiliary.basic.InterfaceBasic;
+import dicontainer.models.basic.InterfaceBasic;
 
 public class ClassConstructorExceptionThrown
         implements InterfaceBasic

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorMultipleAnnotated.java → src/test/java/dicontainer/models/constructor/ClassConstructorMultipleAnnotated.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 import dicontainer.annotation.Dependency;
 

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorNotAnnotatedWithDependency.java → src/test/java/dicontainer/models/constructor/ClassConstructorNotAnnotatedWithDependency.java

@@ -1,8 +1,8 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
-import dicontainer.auxiliary.basic.InterfaceBasicSimpleDependency;
-import dicontainer.auxiliary.basic.InterfaceBasicStringGetter;
-import dicontainer.auxiliary.diamond.InterfaceDiamondLeft;
+import dicontainer.models.basic.InterfaceBasicSimpleDependency;
+import dicontainer.models.basic.InterfaceBasicStringGetter;
+import dicontainer.models.diamond.InterfaceDiamondLeft;
 
 public class ClassConstructorNotAnnotatedWithDependency
         implements InterfaceBasicSimpleDependency
@@ -16,8 +16,8 @@ public ClassConstructorNotAnnotatedWithDependency(InterfaceDiamondLeft firstObje
         secondObject = null;
     }
 
-    public ClassConstructorNotAnnotatedWithDependency(InterfaceDiamondLeft firstObject,
-                                                      InterfaceBasicStringGetter secondObject)
+    public ClassConstructorNotAnnotatedWithDependency(
+            InterfaceDiamondLeft firstObject, InterfaceBasicStringGetter secondObject)
     {
         this.firstObject = firstObject;
         this.secondObject = secondObject;

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorParameterized.java → src/test/java/dicontainer/models/constructor/ClassConstructorParameterized.java

@@ -1,6 +1,6 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
-import dicontainer.auxiliary.basic.InterfaceBasic;
+import dicontainer.models.basic.InterfaceBasic;
 
 public class ClassConstructorParameterized
         implements InterfaceBasic

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorPrivate.java → src/test/java/dicontainer/models/constructor/ClassConstructorPrivate.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 public final class ClassConstructorPrivate
 {

src/test/java/dicontainer/auxiliary/constructor/ClassConstructorSuperParameterized.java → src/test/java/dicontainer/models/constructor/ClassConstructorSuperParameterized.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.constructor;
+package dicontainer.models.constructor;
 
 public class ClassConstructorSuperParameterized
         extends ClassConstructorParameterized

src/test/java/dicontainer/auxiliary/diamond/ClassDiamondBottom.java → src/test/java/dicontainer/models/diamond/ClassDiamondBottom.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 import dicontainer.annotation.Dependency;
 

src/test/java/dicontainer/auxiliary/diamond/ClassDiamondLeft.java → src/test/java/dicontainer/models/diamond/ClassDiamondLeft.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public class ClassDiamondLeft
         implements InterfaceDiamondLeft

src/test/java/dicontainer/auxiliary/diamond/ClassDiamondRight.java → src/test/java/dicontainer/models/diamond/ClassDiamondRight.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public class ClassDiamondRight
         implements InterfaceDiamondRight

src/test/java/dicontainer/auxiliary/diamond/ClassDiamondTop.java → src/test/java/dicontainer/models/diamond/ClassDiamondTop.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public class ClassDiamondTop
         implements InterfaceDiamondTop

src/test/java/dicontainer/auxiliary/diamond/InterfaceDiamondBottom.java → src/test/java/dicontainer/models/diamond/InterfaceDiamondBottom.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public interface InterfaceDiamondBottom
 {

src/test/java/dicontainer/auxiliary/diamond/InterfaceDiamondLeft.java → src/test/java/dicontainer/models/diamond/InterfaceDiamondLeft.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public interface InterfaceDiamondLeft
 {

src/test/java/dicontainer/auxiliary/diamond/InterfaceDiamondRight.java → src/test/java/dicontainer/models/diamond/InterfaceDiamondRight.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public interface InterfaceDiamondRight
 {

src/test/java/dicontainer/auxiliary/diamond/InterfaceDiamondTop.java → src/test/java/dicontainer/models/diamond/InterfaceDiamondTop.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.diamond;
+package dicontainer.models.diamond;
 
 public interface InterfaceDiamondTop
 {

src/test/java/dicontainer/auxiliary/register/ClassRegisterAbstract.java → src/test/java/dicontainer/models/register/ClassRegisterAbstract.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.register;
+package dicontainer.models.register;
 
 import dicontainer.annotation.Register;
 

src/test/java/dicontainer/auxiliary/register/ClassRegisterAbstractIncorrect.java → src/test/java/dicontainer/models/register/ClassRegisterAbstractIncorrect.java

@@ -1,4 +1,4 @@
-package dicontainer.auxiliary.register;
+package dicontainer.models.register;
 
 import dicontainer.annotation.Register;