Skip to content

Commit cd1ee6f

Browse files
authored
Merge pull request #4 from angshuman/dev
Fix Continuation warning. Run test in Dockerfile
2 parents 6593541 + a5e79c1 commit cd1ee6f

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ RUN dotnet restore
1010

1111
COPY . ./
1212

13+
RUN apt-get update && apt-get install -y libcap2-bin libsnappy1v5 && \
14+
ln -s /lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so && \
15+
ln -s /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc.so && \
16+
rm -rf /var/lib/apt/lists/*
17+
18+
RUN dotnet test Hexastore.Test
19+
1320
# Copy everything else and build
1421
RUN dotnet publish -c Release ./Hexastore.Web -o /app/out
1522

Hexastore.Test/Hexastore.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

Hexastore.Test/StoreProcessorTest.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text;
5-
using System.Text.Json.Serialization;
65
using Hexastore.Parser;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87
using Newtonsoft.Json;
@@ -133,7 +132,7 @@ public void Json_Read_Write_Relationship_Returns()
133132
}
134133

135134
[TestMethod]
136-
public void Patch_Returns_With_Relationship()
135+
public void Patch_With_Relationship_Returns()
137136
{
138137
var patch = new
139138
{
@@ -173,7 +172,7 @@ public void Patch_Returns_With_Relationship()
173172
}
174173

175174
[TestMethod]
176-
public void Patch_Returns_With_Values()
175+
public void Patch_With_Values_Returns()
177176
{
178177
var doc = new
179178
{

Hexastore/Query/ObjectQueryModel.cs

+5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ public override bool Equals(object obj)
5656
}
5757
return t.S.Equals(S) && t.P.Equals(P) && t.O.CompareTo(O) == 0 && t.IsId == IsId;
5858
}
59+
60+
public override int GetHashCode()
61+
{
62+
return (S + P + O + IsId.ToString()).GetHashCode();
63+
}
5964
}
6065

6166
public class QueryUnit

0 commit comments

Comments
 (0)