Skip to content

Commit 1975122

Browse files
etrange02etrange02
authored
squash! Dependency update (#2)
* Add package generation for Ivet.Model * Improve documentation * Update dependencies + Ivet package * Fix Gremlinq API changements * Code improvement * Remove useless conf
1 parent 9c0e07f commit 1975122

37 files changed

+343
-215
lines changed

‎Ivet.Model/AbstractEdge.cs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Ivet.Model
2+
{
3+
public abstract class AbstractEdge
4+
{
5+
public long? Id { get; set; }
6+
}
7+
}

‎Ivet.Model/AbstractVertex.cs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Ivet.Model
2+
{
3+
public abstract class AbstractVertex
4+
{
5+
public long? Id { get; set; }
6+
}
7+
}

‎Ivet.Model/Ivet.Model.csproj

+16
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8+
<Authors>david.lecoconnier</Authors>
9+
<Version>1.1.0</Version>
10+
<Title>Ivet.Model</Title>
11+
<PackageProjectUrl>https://github.com/etrange02/Ivet</PackageProjectUrl>
12+
<PackageReadmeFile>Readme.md</PackageReadmeFile>
13+
<RepositoryUrl>https://github.com/etrange02/Ivet</RepositoryUrl>
14+
<Description>Ivet's attributes. Tag your code with these classes then use Ivet to generate and update your Janusgraph schema</Description>
15+
<PackageLicenseExpression>CECILL-B</PackageLicenseExpression>
716
</PropertyGroup>
817

18+
<ItemGroup>
19+
<None Include="..\Readme.md">
20+
<Pack>True</Pack>
21+
<PackagePath>\</PackagePath>
22+
</None>
23+
</ItemGroup>
24+
925
</Project>

‎Ivet.TestFramework/RandomGenerator.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
{
33
public class RandomGenerator
44
{
5-
private static Random _random = new Random();
5+
private static readonly Random _random = new();
66

7-
public string RandomString() => Guid.NewGuid().ToString();
8-
public int RandomInt() => _random.Next();
9-
public int RandomInt(int max) => _random.Next() % (max + 1);
10-
public int RandomInt(int min, int max) => (_random.Next() + min) % (max + 1);
11-
public double RandomDouble() => _random.NextDouble();
12-
public bool RandomBool() => RandomInt() % 2 == 0;
13-
public Guid RandomGuid() => Guid.NewGuid();
14-
public T RandomEnum<T>() where T : Enum
7+
public static string RandomString() => Guid.NewGuid().ToString();
8+
public static int RandomInt() => _random.Next();
9+
public static int RandomInt(int max) => _random.Next() % (max + 1);
10+
public static int RandomInt(int min, int max) => (_random.Next() + min) % (max + 1);
11+
public static double RandomDouble() => _random.NextDouble();
12+
public static bool RandomBool() => RandomInt() % 2 == 0;
13+
public static Guid RandomGuid() => Guid.NewGuid();
14+
public static T RandomEnum<T>() where T : Enum
1515
{
1616
var enumValues = Enum.GetValues(typeof(T));
1717
return (T)enumValues.GetValue(_random.Next(enumValues.Length));

‎Ivet.TestModel/Vertex1.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public class Vertex1
1010
public string Id { get; set; }
1111

1212
[EdgeProperty]
13-
public List<Vertex3> vertex3s { get; private set; } = new List<Vertex3>();
13+
public List<Vertex3> Vertex3s { get; private set; } = new List<Vertex3>();
1414

1515
[EdgeProperty]
16-
public Vertex3[] array_vertex3s { get; private set; }
16+
public Vertex3[] ArrayVertex3s { get; private set; } = Array.Empty<Vertex3>();
1717
}
1818
}

‎Ivet.Tests/Ivet.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13-
<PackageReference Include="Moq" Version="4.20.69" />
14-
<PackageReference Include="xunit" Version="2.6.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13+
<PackageReference Include="Moq" Version="4.20.70" />
14+
<PackageReference Include="xunit" Version="2.7.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.1">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

‎Ivet.Tests/Services/Comparers/CompositeIndexComparerTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void EqualsTest_SameName()
1414
{
1515
// Arrange
1616
var sut = new CompositeIndexComparer();
17-
var name = _randomGenerator.RandomString();
17+
var name = RandomGenerator.RandomString();
1818
var a = new MetaCompositeIndex { Name = name };
1919
var b = new MetaCompositeIndex { Name = name };
2020

@@ -30,8 +30,8 @@ public void EqualsTest_DifferentName()
3030
{
3131
// Arrange
3232
var sut = new CompositeIndexComparer();
33-
var a = new MetaCompositeIndex { Name = _randomGenerator.RandomString() };
34-
var b = new MetaCompositeIndex { Name = _randomGenerator.RandomString() };
33+
var a = new MetaCompositeIndex { Name = RandomGenerator.RandomString() };
34+
var b = new MetaCompositeIndex { Name = RandomGenerator.RandomString() };
3535

3636
// Act
3737
var result = sut.Equals(a, b);

‎Ivet.Tests/Services/Comparers/ConnectionComparerTests.cs

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public void EqualsTest_AllPropertiesEquals()
1414
{
1515
// Arrange
1616
var sut = new ConnectionComparer();
17-
var edge = _randomGenerator.RandomString();
18-
var ingoing = _randomGenerator.RandomString();
19-
var outgoing = _randomGenerator.RandomString();
17+
var edge = RandomGenerator.RandomString();
18+
var ingoing = RandomGenerator.RandomString();
19+
var outgoing = RandomGenerator.RandomString();
2020
var a = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = outgoing };
2121
var b = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = outgoing };
2222

@@ -32,10 +32,10 @@ public void EqualsTest_EdgeDifferent()
3232
{
3333
// Arrange
3434
var sut = new ConnectionComparer();
35-
var ingoing = _randomGenerator.RandomString();
36-
var outgoing = _randomGenerator.RandomString();
37-
var a = new MetaConnection { Edge = _randomGenerator.RandomString(), Ingoing = ingoing, Outgoing = outgoing };
38-
var b = new MetaConnection { Edge = _randomGenerator.RandomString(), Ingoing = ingoing, Outgoing = outgoing };
35+
var ingoing = RandomGenerator.RandomString();
36+
var outgoing = RandomGenerator.RandomString();
37+
var a = new MetaConnection { Edge = RandomGenerator.RandomString(), Ingoing = ingoing, Outgoing = outgoing };
38+
var b = new MetaConnection { Edge = RandomGenerator.RandomString(), Ingoing = ingoing, Outgoing = outgoing };
3939

4040
// Act
4141
var result = sut.Equals(a, b);
@@ -49,10 +49,10 @@ public void EqualsTest_IngoingDifferent()
4949
{
5050
// Arrange
5151
var sut = new ConnectionComparer();
52-
var edge = _randomGenerator.RandomString();
53-
var outgoing = _randomGenerator.RandomString();
54-
var a = new MetaConnection { Edge = edge, Ingoing = _randomGenerator.RandomString(), Outgoing = outgoing };
55-
var b = new MetaConnection { Edge = edge, Ingoing = _randomGenerator.RandomString(), Outgoing = outgoing };
52+
var edge = RandomGenerator.RandomString();
53+
var outgoing = RandomGenerator.RandomString();
54+
var a = new MetaConnection { Edge = edge, Ingoing = RandomGenerator.RandomString(), Outgoing = outgoing };
55+
var b = new MetaConnection { Edge = edge, Ingoing = RandomGenerator.RandomString(), Outgoing = outgoing };
5656

5757
// Act
5858
var result = sut.Equals(a, b);
@@ -66,10 +66,10 @@ public void EqualsTest_OutgoingDifferent()
6666
{
6767
// Arrange
6868
var sut = new ConnectionComparer();
69-
var edge = _randomGenerator.RandomString();
70-
var ingoing = _randomGenerator.RandomString();
71-
var a = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = _randomGenerator.RandomString() };
72-
var b = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = _randomGenerator.RandomString() };
69+
var edge = RandomGenerator.RandomString();
70+
var ingoing = RandomGenerator.RandomString();
71+
var a = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = RandomGenerator.RandomString() };
72+
var b = new MetaConnection { Edge = edge, Ingoing = ingoing, Outgoing = RandomGenerator.RandomString() };
7373

7474
// Act
7575
var result = sut.Equals(a, b);

‎Ivet.Tests/Services/Comparers/IndexBindingComparerTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void EqualsTest_AllPropertiesEquals()
1414
{
1515
// Arrange
1616
var sut = new IndexBindingComparer();
17-
var indexName = _randomGenerator.RandomString();
18-
var propertyName = _randomGenerator.RandomString();
17+
var indexName = RandomGenerator.RandomString();
18+
var propertyName = RandomGenerator.RandomString();
1919
var a = new MetaIndexBinding { IndexName = indexName, PropertyName = propertyName };
2020
var b = new MetaIndexBinding { IndexName = indexName, PropertyName = propertyName };
2121

@@ -31,9 +31,9 @@ public void EqualsTest_EdgeDifferent()
3131
{
3232
// Arrange
3333
var sut = new IndexBindingComparer();
34-
var indexName = _randomGenerator.RandomString();
35-
var a = new MetaIndexBinding { IndexName = indexName, PropertyName = _randomGenerator.RandomString() };
36-
var b = new MetaIndexBinding { IndexName = indexName, PropertyName = _randomGenerator.RandomString() };
34+
var indexName = RandomGenerator.RandomString();
35+
var a = new MetaIndexBinding { IndexName = indexName, PropertyName = RandomGenerator.RandomString() };
36+
var b = new MetaIndexBinding { IndexName = indexName, PropertyName = RandomGenerator.RandomString() };
3737

3838
// Act
3939
var result = sut.Equals(a, b);
@@ -47,9 +47,9 @@ public void EqualsTest_PropertyNameDifferent()
4747
{
4848
// Arrange
4949
var sut = new IndexBindingComparer();
50-
var indexName = _randomGenerator.RandomString();
51-
var a = new MetaIndexBinding { IndexName = indexName, PropertyName = _randomGenerator.RandomString() };
52-
var b = new MetaIndexBinding { IndexName = indexName, PropertyName = _randomGenerator.RandomString() };
50+
var indexName = RandomGenerator.RandomString();
51+
var a = new MetaIndexBinding { IndexName = indexName, PropertyName = RandomGenerator.RandomString() };
52+
var b = new MetaIndexBinding { IndexName = indexName, PropertyName = RandomGenerator.RandomString() };
5353

5454
// Act
5555
var result = sut.Equals(a, b);

‎Ivet.Tests/Services/Comparers/MixedIndexComparerTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void EqualsTest_SameName()
1414
{
1515
// Arrange
1616
var sut = new MixedIndexComparer();
17-
var name = _randomGenerator.RandomString();
17+
var name = RandomGenerator.RandomString();
1818
var a = new MetaMixedIndex { Name = name };
1919
var b = new MetaMixedIndex { Name = name };
2020

@@ -30,8 +30,8 @@ public void EqualsTest_DifferentName()
3030
{
3131
// Arrange
3232
var sut = new MixedIndexComparer();
33-
var a = new MetaMixedIndex { Name = _randomGenerator.RandomString() };
34-
var b = new MetaMixedIndex { Name = _randomGenerator.RandomString() };
33+
var a = new MetaMixedIndex { Name = RandomGenerator.RandomString() };
34+
var b = new MetaMixedIndex { Name = RandomGenerator.RandomString() };
3535

3636
// Act
3737
var result = sut.Equals(a, b);

‎Ivet.Tests/Services/Comparers/PropertyBindingComparerTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void EqualsTest_AllPropertiesEquals()
1414
{
1515
// Arrange
1616
var sut = new PropertyBindingComparer();
17-
var entity = _randomGenerator.RandomString();
18-
var name = _randomGenerator.RandomString();
17+
var entity = RandomGenerator.RandomString();
18+
var name = RandomGenerator.RandomString();
1919
var a = new MetaPropertyBinding { Entity = entity, Name = name };
2020
var b = new MetaPropertyBinding { Entity = entity, Name = name };
2121

@@ -31,9 +31,9 @@ public void EqualsTest_EntityDifferent()
3131
{
3232
// Arrange
3333
var sut = new PropertyBindingComparer();
34-
var name = _randomGenerator.RandomString();
35-
var a = new MetaPropertyBinding { Entity = _randomGenerator.RandomString(), Name = name };
36-
var b = new MetaPropertyBinding { Entity = _randomGenerator.RandomString(), Name = name };
34+
var name = RandomGenerator.RandomString();
35+
var a = new MetaPropertyBinding { Entity = RandomGenerator.RandomString(), Name = name };
36+
var b = new MetaPropertyBinding { Entity = RandomGenerator.RandomString(), Name = name };
3737

3838
// Act
3939
var result = sut.Equals(a, b);
@@ -47,9 +47,9 @@ public void EqualsTest_NameDifferent()
4747
{
4848
// Arrange
4949
var sut = new PropertyBindingComparer();
50-
var entity = _randomGenerator.RandomString();
51-
var a = new MetaPropertyBinding { Entity = entity, Name = _randomGenerator.RandomString() };
52-
var b = new MetaPropertyBinding { Entity = entity, Name = _randomGenerator.RandomString() };
50+
var entity = RandomGenerator.RandomString();
51+
var a = new MetaPropertyBinding { Entity = entity, Name = RandomGenerator.RandomString() };
52+
var b = new MetaPropertyBinding { Entity = entity, Name = RandomGenerator.RandomString() };
5353

5454
// Act
5555
var result = sut.Equals(a, b);

‎Ivet.Tests/Services/Converters/DatabaseToSchemaConverterTests.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void ConvertTest_Empty()
3636
public void ConvertTest_Vertex()
3737
{
3838
// Arrange
39-
var entity = new Vertex { Name = _random.RandomString(), Partitioned = _random.RandomBool(), Static = _random.RandomBool() };
39+
var entity = new Model.Database.Vertex { Name = RandomGenerator.RandomString(), Partitioned = RandomGenerator.RandomBool(), Static = RandomGenerator.RandomBool() };
4040
var schema = new Schema
4141
{
4242
Vertices = { entity }
@@ -65,7 +65,7 @@ public void ConvertTest_Vertex()
6565
public void ConvertTest_Edge()
6666
{
6767
// Arrange
68-
var entity = new Edge { Name = _random.RandomString(), Directed = _random.RandomBool(), Multiplicity = _random.RandomEnum<Multiplicity>(), Unidirected = _random.RandomBool() };
68+
var entity = new Model.Database.Edge { Name = RandomGenerator.RandomString(), Directed = RandomGenerator.RandomBool(), Multiplicity = RandomGenerator.RandomEnum<Multiplicity>(), Unidirected = RandomGenerator.RandomBool() };
6969
var schema = new Schema
7070
{
7171
Edges = { entity }
@@ -93,7 +93,7 @@ public void ConvertTest_Edge()
9393
public void ConvertTest_Connection()
9494
{
9595
// Arrange
96-
var entity = new Connection { Edge = _random.RandomString(), Ingoing = _random.RandomString(), Outgoing = _random.RandomString() };
96+
var entity = new Connection { Edge = RandomGenerator.RandomString(), Ingoing = RandomGenerator.RandomString(), Outgoing = RandomGenerator.RandomString() };
9797
var schema = new Schema
9898
{
9999
Connections = { entity }
@@ -122,7 +122,7 @@ public void ConvertTest_Connection()
122122
public void ConvertTest_PropertyKey()
123123
{
124124
// Arrange
125-
var entity = new PropertyKey { Name = _random.RandomString(), DataType = _random.RandomString(), Cardinality = _random.RandomEnum<Cardinality>() };
125+
var entity = new PropertyKey { Name = RandomGenerator.RandomString(), DataType = RandomGenerator.RandomString(), Cardinality = RandomGenerator.RandomEnum<Cardinality>() };
126126
var schema = new Schema
127127
{
128128
PropertyKeys = { entity }
@@ -151,7 +151,7 @@ public void ConvertTest_PropertyKey()
151151
public void ConvertTest_EdgePropertyKeyBinding()
152152
{
153153
// Arrange
154-
var entity = new PropertyBinding { Name = _random.RandomString(), Entity = _random.RandomString() };
154+
var entity = new PropertyBinding { Name = RandomGenerator.RandomString(), Entity = RandomGenerator.RandomString() };
155155
var schema = new Schema
156156
{
157157
EdgesPropertyBindings = { entity }
@@ -179,7 +179,7 @@ public void ConvertTest_EdgePropertyKeyBinding()
179179
public void ConvertTest_VertexPropertyKeyBinding()
180180
{
181181
// Arrange
182-
var entity = new PropertyBinding { Name = _random.RandomString(), Entity = _random.RandomString() };
182+
var entity = new PropertyBinding { Name = RandomGenerator.RandomString(), Entity = RandomGenerator.RandomString() };
183183
var schema = new Schema
184184
{
185185
VertexPropertyBindings = { entity }
@@ -207,7 +207,7 @@ public void ConvertTest_VertexPropertyKeyBinding()
207207
public void ConvertTest_MixedIndices()
208208
{
209209
// Arrange
210-
var entity = new Model.Database.Index { Name = _random.RandomString(), BackendIndex = _random.RandomString(), IndexedElement = _random.RandomString(), IsUnique = _random.RandomBool(), IsCompositeIndex = false, IsMixedIndex = true };
210+
var entity = new Model.Database.Index { Name = RandomGenerator.RandomString(), BackendIndex = RandomGenerator.RandomString(), IndexedElement = RandomGenerator.RandomString(), IsUnique = RandomGenerator.RandomBool(), IsCompositeIndex = false, IsMixedIndex = true };
211211
var schema = new Schema
212212
{
213213
Indices = { entity }
@@ -237,7 +237,7 @@ public void ConvertTest_MixedIndices()
237237
public void ConvertTest_CompositeIndices()
238238
{
239239
// Arrange
240-
var entity = new Model.Database.Index { Name = _random.RandomString(), BackendIndex = _random.RandomString(), IndexedElement = _random.RandomString(), IsUnique = _random.RandomBool(), IsCompositeIndex = true, IsMixedIndex = false };
240+
var entity = new Model.Database.Index { Name = RandomGenerator.RandomString(), BackendIndex = RandomGenerator.RandomString(), IndexedElement = RandomGenerator.RandomString(), IsUnique = RandomGenerator.RandomBool(), IsCompositeIndex = true, IsMixedIndex = false };
241241
var schema = new Schema
242242
{
243243
Indices = { entity }
@@ -267,7 +267,7 @@ public void ConvertTest_CompositeIndices()
267267
public void ConvertTest_IndexBindings()
268268
{
269269
// Arrange
270-
var entity = new IndexBinding { IndexName = _random.RandomString(), Parameter = _random.RandomString(), PropertyName = _random.RandomString() };
270+
var entity = new IndexBinding { IndexName = RandomGenerator.RandomString(), Parameter = RandomGenerator.RandomString(), PropertyName = RandomGenerator.RandomString() };
271271
var schema = new Schema
272272
{
273273
IndexBindings = { entity }

0 commit comments

Comments
 (0)