Skip to content

Commit 5db689b

Browse files
msohailhussainmsohailhussain
authored
fix: Renaming optimizely json to OptimizelyJSON (#226)
* renaming optimizely json * added optimizelyjson at root like other projects
1 parent 8fa5cfb commit 5db689b

File tree

10 files changed

+62
-62
lines changed

10 files changed

+62
-62
lines changed

‎OptimizelySDK.Net35/OptimizelySDK.Net35.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<Compile Include="..\OptimizelySDK\Entity\IdKeyEntity.cs">
9898
<Link>Entity\IdKeyEntity.cs</Link>
9999
</Compile>
100-
<Compile Include="..\OptimizelySDK\OptimizelyJson.cs">
101-
<Link>OptimizelyJson.cs</Link>
100+
<Compile Include="..\OptimizelySDK\OptimizelyJSON.cs">
101+
<Link>OptimizelyJSON.cs</Link>
102102
</Compile>
103103
<Compile Include="..\OptimizelySDK\Entity\TrafficAllocation.cs">
104104
<Link>Entity\TrafficAllocation.cs</Link>

‎OptimizelySDK.Net40/OptimizelySDK.Net40.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
<Compile Include="..\OptimizelySDK\Entity\IdKeyEntity.cs">
100100
<Link>Entity\IdKeyEntity.cs</Link>
101101
</Compile>
102-
<Compile Include="..\OptimizelySDK\OptimizelyJson.cs">
103-
<Link>OptimizelyJson.cs</Link>
102+
<Compile Include="..\OptimizelySDK\OptimizelyJSON.cs">
103+
<Link>OptimizelyJSON.cs</Link>
104104
</Compile>
105105
<Compile Include="..\OptimizelySDK\Entity\TrafficAllocation.cs">
106106
<Link>Entity\TrafficAllocation.cs</Link>

‎OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Compile Include="..\OptimizelySDK\Entity\ForcedVariation.cs" />
3232
<Compile Include="..\OptimizelySDK\Entity\Group.cs" />
3333
<Compile Include="..\OptimizelySDK\Entity\IdKeyEntity.cs" />
34-
<Compile Include="..\OptimizelySDK\OptimizelyJson.cs" />
34+
<Compile Include="..\OptimizelySDK\OptimizelyJSON.cs" />
3535
<Compile Include="..\OptimizelySDK\Entity\TrafficAllocation.cs" />
3636
<Compile Include="..\OptimizelySDK\Entity\UserAttributes.cs" />
3737
<Compile Include="..\OptimizelySDK\Entity\Variation.cs" />

‎OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
<Compile Include="..\OptimizelySDK\Entity\IdKeyEntity.cs">
116116
<Link>Entity\IdKeyEntity.cs</Link>
117117
</Compile>
118-
<Compile Include="..\OptimizelySDK\OptimizelyJson.cs">
119-
<Link>Entity\OptimizelyJson.cs</Link>
118+
<Compile Include="..\OptimizelySDK\OptimizelyJSON.cs">
119+
<Link>OptimizelyJSON.cs</Link>
120120
</Compile>
121121
<Compile Include="..\OptimizelySDK\Entity\Rollout.cs">
122122
<Link>Entity\Rollout.cs</Link>

‎OptimizelySDK.Tests/OptimizelyJsonTest.cs renamed to ‎OptimizelySDK.Tests/OptimizelyJSONTest.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class InnerField2 : List<object> { }
5151

5252

5353
[TestFixture]
54-
public class OptimizelyJsonTest
54+
public class OptimizelyJSONTest
5555
{
5656
private string Payload;
5757
private Dictionary<string, object> Map;
@@ -86,8 +86,8 @@ public void Initialize()
8686
[Test]
8787
public void TestOptimizelyJsonObjectIsValid()
8888
{
89-
var optimizelyJSONUsingMap = new OptimizelyJson(Map, ErrorHandlerMock.Object, LoggerMock.Object);
90-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
89+
var optimizelyJSONUsingMap = new OptimizelyJSON(Map, ErrorHandlerMock.Object, LoggerMock.Object);
90+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
9191

9292
Assert.IsNotNull(optimizelyJSONUsingMap);
9393
Assert.IsNotNull(optimizelyJSONUsingString);
@@ -103,7 +103,7 @@ public void TestToStringReturnValidString()
103103
}
104104
}
105105
};
106-
var optimizelyJSONUsingMap = new OptimizelyJson(map, ErrorHandlerMock.Object, LoggerMock.Object);
106+
var optimizelyJSONUsingMap = new OptimizelyJSON(map, ErrorHandlerMock.Object, LoggerMock.Object);
107107
string str = optimizelyJSONUsingMap.ToString();
108108
string expectedStringObj = "{\"strField\":\"john doe\",\"intField\":12,\"objectField\":{\"inner_field_int\":3}}";
109109
Assert.AreEqual(expectedStringObj, str);
@@ -112,15 +112,15 @@ public void TestToStringReturnValidString()
112112
[Test]
113113
public void TestGettingErrorUponInvalidJsonString()
114114
{
115-
var optimizelyJSONUsingString = new OptimizelyJson("{\"invalid\":}", ErrorHandlerMock.Object, LoggerMock.Object);
115+
var optimizelyJSONUsingString = new OptimizelyJSON("{\"invalid\":}", ErrorHandlerMock.Object, LoggerMock.Object);
116116
LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Provided string could not be converted to map."), Times.Once);
117117
ErrorHandlerMock.Verify(er => er.HandleError(It.IsAny<InvalidJsonException>()), Times.Once);
118118
}
119119

120120
[Test]
121121
public void TestOptimizelyJsonGetVariablesWhenSetUsingMap()
122122
{
123-
var optimizelyJSONUsingMap = new OptimizelyJson(Map, ErrorHandlerMock.Object, LoggerMock.Object);
123+
var optimizelyJSONUsingMap = new OptimizelyJSON(Map, ErrorHandlerMock.Object, LoggerMock.Object);
124124

125125
Assert.AreEqual(optimizelyJSONUsingMap.GetValue<string>("strField"), "john doe");
126126
Assert.AreEqual(optimizelyJSONUsingMap.GetValue<int>("intField"), 12);
@@ -136,7 +136,7 @@ public void TestOptimizelyJsonGetVariablesWhenSetUsingMap()
136136
[Test]
137137
public void TestOptimizelyJsonGetVariablesWhenSetUsingString()
138138
{
139-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
139+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
140140

141141
Assert.AreEqual(optimizelyJSONUsingString.GetValue<long>("field1"), 1);
142142
Assert.AreEqual(optimizelyJSONUsingString.GetValue<double>("field2"), 2.5);
@@ -148,7 +148,7 @@ public void TestOptimizelyJsonGetVariablesWhenSetUsingString()
148148
[Test]
149149
public void TestGetValueReturnsEntireDictWhenJsonPathIsEmptyAndTypeIsValid()
150150
{
151-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
151+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
152152
var actualDict = optimizelyJSONUsingString.ToDictionary();
153153
var expectedValue = optimizelyJSONUsingString.GetValue<Dictionary<string, object>>("");
154154
Assert.NotNull(expectedValue);
@@ -159,7 +159,7 @@ public void TestGetValueReturnsEntireDictWhenJsonPathIsEmptyAndTypeIsValid()
159159
public void TestGetValueReturnsDefaultValueWhenJsonIsInvalid()
160160
{
161161
var payload = "{ \"field1\" : {1:\"Csharp\", 2:\"Java\"} }";
162-
var optimizelyJSONUsingString = new OptimizelyJson(payload, ErrorHandlerMock.Object, LoggerMock.Object);
162+
var optimizelyJSONUsingString = new OptimizelyJSON(payload, ErrorHandlerMock.Object, LoggerMock.Object);
163163
var expectedValue = optimizelyJSONUsingString.GetValue<Dictionary<float, string>>("field1");
164164
// Even though above given JSON is not valid, newtonsoft is parsing it so
165165
Assert.IsNotNull(expectedValue);
@@ -169,23 +169,23 @@ public void TestGetValueReturnsDefaultValueWhenJsonIsInvalid()
169169
public void TestGetValueReturnsDefaultValueWhenTypeIsInvalid()
170170
{
171171
var payload = "{ \"field1\" : {\"1\":\"Csharp\",\"2\":\"Java\"} }";
172-
var optimizelyJSONUsingString = new OptimizelyJson(payload, ErrorHandlerMock.Object, LoggerMock.Object);
172+
var optimizelyJSONUsingString = new OptimizelyJSON(payload, ErrorHandlerMock.Object, LoggerMock.Object);
173173
var expectedValue = optimizelyJSONUsingString.GetValue<Dictionary<float, string>>("field1");
174174
Assert.IsNotNull(expectedValue);
175175
}
176176

177177
[Test]
178178
public void TestGetValueReturnsNullWhenJsonPathIsEmptyAndTypeIsOfObject()
179179
{
180-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
180+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
181181
var expectedValue = optimizelyJSONUsingString.GetValue<object>("");
182182
Assert.NotNull(expectedValue);
183183
}
184184

185185
[Test]
186186
public void TestGetValueReturnsDefaultValueWhenJsonPathIsEmptyAndTypeIsNotValid()
187187
{
188-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
188+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
189189
var expectedValue = optimizelyJSONUsingString.GetValue<string>("");
190190
Assert.IsNull(expectedValue);
191191
LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Value for path could not be assigned to provided type."), Times.Once);
@@ -195,7 +195,7 @@ public void TestGetValueReturnsDefaultValueWhenJsonPathIsEmptyAndTypeIsNotValid(
195195
[Test]
196196
public void TestGetValueReturnsDefaultValueWhenJsonPathIsInvalid()
197197
{
198-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
198+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
199199
var expectedValue = optimizelyJSONUsingString.GetValue<string>("field11");
200200
Assert.IsNull(expectedValue);
201201
LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Value for JSON key not found."), Times.Once);
@@ -205,7 +205,7 @@ public void TestGetValueReturnsDefaultValueWhenJsonPathIsInvalid()
205205
[Test]
206206
public void TestGetValueReturnsDefaultValueWhenJsonPath1IsInvalid()
207207
{
208-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
208+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
209209
var expectedValue = optimizelyJSONUsingString.GetValue<string>("field4.");
210210
Assert.IsNull(expectedValue);
211211
LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Value for JSON key not found."), Times.Once);
@@ -215,7 +215,7 @@ public void TestGetValueReturnsDefaultValueWhenJsonPath1IsInvalid()
215215
[Test]
216216
public void TestGetValueReturnsDefaultValueWhenJsonPath2IsInvalid()
217217
{
218-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
218+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
219219
var expectedValue = optimizelyJSONUsingString.GetValue<string>("field4..inner_field1");
220220
Assert.IsNull(expectedValue);
221221
LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Value for JSON key not found."), Times.Once);
@@ -225,7 +225,7 @@ public void TestGetValueReturnsDefaultValueWhenJsonPath2IsInvalid()
225225
[Test]
226226
public void TestGetValueObjectNotModifiedIfCalledTwice()
227227
{
228-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
228+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
229229
var expectedValue = optimizelyJSONUsingString.GetValue<string>("field4.inner_field1");
230230
var expectedValue2 = optimizelyJSONUsingString.GetValue<string>("field4.inner_field1");
231231

@@ -235,7 +235,7 @@ public void TestGetValueObjectNotModifiedIfCalledTwice()
235235
[Test]
236236
public void TestGetValueReturnsUsingGivenClassType()
237237
{
238-
var optimizelyJSONUsingString = new OptimizelyJson(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
238+
var optimizelyJSONUsingString = new OptimizelyJSON(Payload, ErrorHandlerMock.Object, LoggerMock.Object);
239239
var expectedValue = optimizelyJSONUsingString.GetValue<Field4>("field4");
240240

241241
Assert.AreEqual(expectedValue.inner_field1, 3);
@@ -245,7 +245,7 @@ public void TestGetValueReturnsUsingGivenClassType()
245245
[Test]
246246
public void TestGetValueReturnsCastedObject()
247247
{
248-
var optimizelyJson = new OptimizelyJson(Map, ErrorHandlerMock.Object, LoggerMock.Object);
248+
var optimizelyJson = new OptimizelyJSON(Map, ErrorHandlerMock.Object, LoggerMock.Object);
249249
var expectedValue = optimizelyJson.ToDictionary();
250250
var actualValue = optimizelyJson.GetValue<ParentJson>(null);
251251

‎OptimizelySDK.Tests/OptimizelySDK.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<Compile Include="ConfigTest\FallbackProjectConfigManagerTest.cs" />
7878
<Compile Include="DecisionServiceTest.cs" />
7979
<Compile Include="DefaultErrorHandlerTest.cs" />
80-
<Compile Include="OptimizelyJsonTest.cs" />
80+
<Compile Include="OptimizelyJSONTest.cs" />
8181
<Compile Include="EventTests\BatchEventProcessorTest.cs" />
8282
<Compile Include="EventTests\DefaultEventDispatcherTest.cs" />
8383
<Compile Include="EventTests\EventBuilderTest.cs" />

0 commit comments

Comments
 (0)