Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
Code style (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dluc
dluc authored Nov 7, 2017
1 parent c455cab commit 76c1d22
Show file tree
Hide file tree
Showing 19 changed files with 242 additions and 246 deletions.
186 changes: 93 additions & 93 deletions Services.Test/DocumentDbKeyValueContainerTest.cs
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions Services.Test/Services.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@
<!-- "Service Include" required by IntelliJ Rider -->
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<ItemGroup>
<Folder Include="IntegrationTests" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Services.Test/helpers/Constants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ namespace Services.Test.helpers
/// </summary>
public class Constants
{
public const string Type = "Type";
public const string UnitTest = "UnitTest";
public const string IntegrationTest = "IntegrationTest";
public const string TYPE = "Type";
public const string UNIT_TEST = "UnitTest";
public const string INTEGRATION_TEST = "IntegrationTest";

public const string Speed = "Speed";
public const string SlowTest = "SlowTest";
public const string SPEED = "Speed";
public const string SLOW_TEST = "SlowTest";
}
}
2 changes: 1 addition & 1 deletion Services.Test/helpers/MockFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public MockFactory(Mock<T> mock)

public T Create()
{
return mock.Object;
return this.mock.Object;
}
}
}
8 changes: 4 additions & 4 deletions Services/KeyValueDocument.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ internal sealed class KeyValueDocument : Resource

public KeyValueDocument(string collectionId, string key, string data)
{
Id = DocumentIdHelper.GenerateId(collectionId, key);
CollectionId = collectionId;
Key = key;
Data = data;
this.Id = DocumentIdHelper.GenerateId(collectionId, key);
this.CollectionId = collectionId;
this.Key = key;
this.Data = data;
}
}
}
6 changes: 3 additions & 3 deletions Services/Wrappers/DocumentClientFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ public DocumentClientFactory(IServicesConfig config, ILogger logger)
throw new InvalidConfigurationException(message);
}

docDbEndpoint = new Uri(match.Groups["endpoint"].Value);
docDbKey = match.Groups["key"].Value;
this.docDbEndpoint = new Uri(match.Groups["endpoint"].Value);
this.docDbKey = match.Groups["key"].Value;
}

public IDocumentClient Create()
{
return new DocumentClient(docDbEndpoint, docDbKey);
return new DocumentClient(this.docDbEndpoint, this.docDbKey);
}
}
}
156 changes: 78 additions & 78 deletions WebService.Test/Controllers/KeyValueControllerTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ public class KeyValueControllerTest

public KeyValueControllerTest()
{
mockContainer = new Mock<IKeyValueContainer>();
mockGenerator = new Mock<IKeyGenerator>();
this.mockContainer = new Mock<IKeyValueContainer>();
this.mockGenerator = new Mock<IKeyGenerator>();

controller = new ValuesController(
mockContainer.Object,
mockGenerator.Object,
this.controller = new ValuesController(
this.mockContainer.Object,
this.mockGenerator.Object,
new Logger("UnitTest", LogLevel.Debug));
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task GetTest()
{
var collectionId = rand.NextString();
var key = rand.NextString();
var data = rand.NextString();
var etag = rand.NextString();
var timestamp = rand.NextDateTimeOffset();
var collectionId = this.rand.NextString();
var key = this.rand.NextString();
var data = this.rand.NextString();
var etag = this.rand.NextString();
var timestamp = this.rand.NextDateTimeOffset();

var model = new ValueServiceModel
{
Expand All @@ -53,13 +53,13 @@ public async Task GetTest()
Timestamp = timestamp
};

mockContainer
this.mockContainer
.Setup(x => x.GetAsync(
It.IsAny<string>(),
It.IsAny<string>()))
.ReturnsAsync(model);

var result = await controller.Get(collectionId, key);
var result = await this.controller.Get(collectionId, key);

Assert.Equal(result.Key, key);
Assert.Equal(result.Data, data);
Expand All @@ -68,52 +68,52 @@ public async Task GetTest()
Assert.Equal(result.Metadata["$modified"], timestamp.ToString(CultureInfo.InvariantCulture));
Assert.Equal(result.Metadata["$uri"], $"/v1/collections/{collectionId}/values/{key}");

mockContainer
this.mockContainer
.Verify(x => x.GetAsync(
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key)),
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key)),
Times.Once);
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task GetAllTest()
{
var collectionId = rand.NextString();
var collectionId = this.rand.NextString();

var models = new[]
{
new ValueServiceModel
{
CollectionId = collectionId,
Key = rand.NextString(),
Data = rand.NextString(),
ETag = rand.NextString(),
Timestamp = rand.NextDateTimeOffset()
Key = this.rand.NextString(),
Data = this.rand.NextString(),
ETag = this.rand.NextString(),
Timestamp = this.rand.NextDateTimeOffset()
},
new ValueServiceModel
{
CollectionId = collectionId,
Key = rand.NextString(),
Data = rand.NextString(),
ETag = rand.NextString(),
Timestamp = rand.NextDateTimeOffset()
Key = this.rand.NextString(),
Data = this.rand.NextString(),
ETag = this.rand.NextString(),
Timestamp = this.rand.NextDateTimeOffset()
},
new ValueServiceModel
{
CollectionId = collectionId,
Key = rand.NextString(),
Data = rand.NextString(),
ETag = rand.NextString(),
Timestamp = rand.NextDateTimeOffset()
Key = this.rand.NextString(),
Data = this.rand.NextString(),
ETag = this.rand.NextString(),
Timestamp = this.rand.NextDateTimeOffset()
}
};

mockContainer
this.mockContainer
.Setup(x => x.GetAllAsync(
It.IsAny<string>()))
.ReturnsAsync(models);

var result = await controller.Get(collectionId);
var result = await this.controller.Get(collectionId);

var jsonResponse = JObject.FromObject(result);
Assert.True(jsonResponse.TryGetValue("Items", out JToken value));
Expand All @@ -131,19 +131,19 @@ public async Task GetAllTest()
Assert.Equal(result.Metadata["$type"], "ValueList;1");
Assert.Equal(result.Metadata["$uri"], $"/v1/collections/{collectionId}/values");

mockContainer
this.mockContainer
.Verify(x => x.GetAllAsync(
It.Is<string>(s => s == collectionId)));
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task PostTest()
{
var collectionId = rand.NextString();
var collectionId = this.rand.NextString();
var key = Guid.NewGuid().ToString();
var data = rand.NextString();
var etag = rand.NextString();
var timestamp = rand.NextDateTimeOffset();
var data = this.rand.NextString();
var etag = this.rand.NextString();
var timestamp = this.rand.NextDateTimeOffset();

var modelIn = new ValueServiceModel
{
Expand All @@ -159,18 +159,18 @@ public async Task PostTest()
Timestamp = timestamp
};

mockGenerator
this.mockGenerator
.Setup(x => x.Generate())
.Returns(key);

mockContainer
this.mockContainer
.Setup(x => x.CreateAsync(
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<ValueServiceModel>()))
.ReturnsAsync(modelOut);

var result = await controller.Post(collectionId, modelIn);
var result = await this.controller.Post(collectionId, modelIn);

Assert.Equal(result.Key, key);
Assert.Equal(result.Data, data);
Expand All @@ -179,21 +179,21 @@ public async Task PostTest()
Assert.Equal(result.Metadata["$modified"], modelOut.Timestamp.ToString(CultureInfo.InvariantCulture));
Assert.Equal(result.Metadata["$uri"], $"/v1/collections/{collectionId}/values/{key}");

mockContainer
this.mockContainer
.Verify(x => x.CreateAsync(
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key),
It.Is<ValueServiceModel>(m => m.Equals(modelIn))));
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task PutNewTest()
{
var collectionId = rand.NextString();
var key = rand.NextString();
var data = rand.NextString();
var etag = rand.NextString();
var timestamp = rand.NextDateTimeOffset();
var collectionId = this.rand.NextString();
var key = this.rand.NextString();
var data = this.rand.NextString();
var etag = this.rand.NextString();
var timestamp = this.rand.NextDateTimeOffset();

var modelIn = new ValueServiceModel
{
Expand All @@ -209,14 +209,14 @@ public async Task PutNewTest()
Timestamp = timestamp
};

mockContainer
this.mockContainer
.Setup(x => x.CreateAsync(
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<ValueServiceModel>()))
.ReturnsAsync(modelOut);

var result = await controller.Put(collectionId, key, modelIn);
var result = await this.controller.Put(collectionId, key, modelIn);

Assert.Equal(result.Key, key);
Assert.Equal(result.Data, data);
Expand All @@ -225,23 +225,23 @@ public async Task PutNewTest()
Assert.Equal(result.Metadata["$modified"], modelOut.Timestamp.ToString(CultureInfo.InvariantCulture));
Assert.Equal(result.Metadata["$uri"], $"/v1/collections/{collectionId}/values/{key}");

mockContainer
this.mockContainer
.Verify(x => x.CreateAsync(
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key),
It.Is<ValueServiceModel>(m => m.Equals(modelIn))),
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key),
It.Is<ValueServiceModel>(m => m.Equals(modelIn))),
Times.Once);
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task PutUpdateTest()
{
var collectionId = rand.NextString();
var key = rand.NextString();
var data = rand.NextString();
var etagOld = rand.NextString();
var etagNew = rand.NextString();
var timestamp = rand.NextDateTimeOffset();
var collectionId = this.rand.NextString();
var key = this.rand.NextString();
var data = this.rand.NextString();
var etagOld = this.rand.NextString();
var etagNew = this.rand.NextString();
var timestamp = this.rand.NextDateTimeOffset();

var modelIn = new ValueServiceModel
{
Expand All @@ -258,14 +258,14 @@ public async Task PutUpdateTest()
Timestamp = timestamp
};

mockContainer
this.mockContainer
.Setup(x => x.UpsertAsync(
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<ValueServiceModel>()))
.ReturnsAsync(modelOut);

var result = await controller.Put(collectionId, key, modelIn);
var result = await this.controller.Put(collectionId, key, modelIn);

Assert.Equal(result.Key, key);
Assert.Equal(result.Data, data);
Expand All @@ -274,43 +274,43 @@ public async Task PutUpdateTest()
Assert.Equal(result.Metadata["$modified"], modelOut.Timestamp.ToString(CultureInfo.InvariantCulture));
Assert.Equal(result.Metadata["$uri"], $"/v1/collections/{collectionId}/values/{key}");

mockContainer
this.mockContainer
.Verify(x => x.UpsertAsync(
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key),
It.Is<ValueServiceModel>(m => m.Equals(modelIn))),
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key),
It.Is<ValueServiceModel>(m => m.Equals(modelIn))),
Times.Once);
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task DeleteTest()
{
var collectionId = rand.NextString();
var key = rand.NextString();
var collectionId = this.rand.NextString();
var key = this.rand.NextString();

mockContainer
this.mockContainer
.Setup(x => x.DeleteAsync(
It.IsAny<string>(),
It.IsAny<string>()))
.Returns(Task.FromResult(0));

await controller.Delete(collectionId, key);
await this.controller.Delete(collectionId, key);

mockContainer
this.mockContainer
.Verify(x => x.DeleteAsync(
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key)),
It.Is<string>(s => s == collectionId),
It.Is<string>(s => s == key)),
Times.Once);
}

[Fact, Trait(Constants.Type, Constants.UnitTest)]
[Fact, Trait(Constants.TYPE, Constants.UNIT_TEST)]
public async Task ValidateKeyTest()
{
await Assert.ThrowsAsync<BadRequestException>(async () =>
await controller.Delete("collection", "*"));
await this.controller.Delete("collection", "*"));

await Assert.ThrowsAsync<BadRequestException>(async () =>
await controller.Delete("collection", new string('a', 256)));
await this.controller.Delete("collection", new string('a', 256)));
}
}
}
Loading

0 comments on commit 76c1d22

Please sign in to comment.