Skip to content

Commit 0dc7145

Browse files
mediumTajmediumTaj
committed
test(Unit tests): Update unit tests to add mock apikey, correct misspelled namespace
1 parent 5e92275 commit 0dc7145

File tree

19 files changed

+127
-64
lines changed

19 files changed

+127
-64
lines changed

‎IBM.Watson.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v1.Uni
9191
EndProject
9292
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.LanguageTranslator.v3.UnitTests", "test\LanguageTranslator.v3.UnitTests\IBM.Watson.LanguageTranslator.v3.UnitTests.csproj", "{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}"
9393
EndProject
94-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests", "test\NaturalLangaugeUnderstanding.v1.UnitTests\IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests.csproj", "{415AADD4-CC05-4B77-8E57-C1B079421875}"
95-
EndProject
9694
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.ToneAnalyzer.v3.UnitTests", "test\ToneAnalyzer.v3.UnitTests\IBM.Watson.ToneAnalyzer.v3.UnitTests.csproj", "{28F5A68C-CF5B-4691-A5E5-9135C99470A0}"
9795
EndProject
9896
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Assistant.v1.Examples", "examples\IBM.Watson.Assistant.v1.Examples\IBM.Watson.Assistant.v1.Examples.csproj", "{66BE9211-8888-41AC-B521-54C2603F795F}"
@@ -149,6 +147,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognitio
149147
EndProject
150148
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v2.Examples", "examples\IBM.Watson.Discovery.v2.Examples\IBM.Watson.Discovery.v2.Examples.csproj", "{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}"
151149
EndProject
150+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests", "test\NaturalLanguageUnderstanding.v1.UnitTests\IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests.csproj", "{41D9E469-B1B5-415E-9F13-7780F321FD62}"
151+
EndProject
152152
Global
153153
GlobalSection(SolutionConfigurationPlatforms) = preSolution
154154
Debug|Any CPU = Debug|Any CPU
@@ -279,10 +279,6 @@ Global
279279
{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
280280
{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
281281
{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Release|Any CPU.Build.0 = Release|Any CPU
282-
{415AADD4-CC05-4B77-8E57-C1B079421875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
283-
{415AADD4-CC05-4B77-8E57-C1B079421875}.Debug|Any CPU.Build.0 = Debug|Any CPU
284-
{415AADD4-CC05-4B77-8E57-C1B079421875}.Release|Any CPU.ActiveCfg = Release|Any CPU
285-
{415AADD4-CC05-4B77-8E57-C1B079421875}.Release|Any CPU.Build.0 = Release|Any CPU
286282
{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
287283
{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
288284
{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -387,6 +383,10 @@ Global
387383
{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
388384
{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
389385
{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Release|Any CPU.Build.0 = Release|Any CPU
386+
{41D9E469-B1B5-415E-9F13-7780F321FD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
387+
{41D9E469-B1B5-415E-9F13-7780F321FD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
388+
{41D9E469-B1B5-415E-9F13-7780F321FD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
389+
{41D9E469-B1B5-415E-9F13-7780F321FD62}.Release|Any CPU.Build.0 = Release|Any CPU
390390
EndGlobalSection
391391
GlobalSection(SolutionProperties) = preSolution
392392
HideSolutionNode = FALSE
@@ -422,7 +422,6 @@ Global
422422
{14E2BB2F-FE6F-43D9-AC5E-727E1E327FE9} = {B368DCF7-FB57-4302-8467-4EB142394A29}
423423
{DADD6C25-5ED6-48B9-9A33-397228F392E6} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
424424
{57C7F28F-822A-4C52-909A-F9DB6A0CFA51} = {65D78D49-E54F-4952-A1D4-7C8D0EDAA1B3}
425-
{415AADD4-CC05-4B77-8E57-C1B079421875} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
426425
{28F5A68C-CF5B-4691-A5E5-9135C99470A0} = {C7873F44-7188-49BE-84C5-532BE4E07147}
427426
{66BE9211-8888-41AC-B521-54C2603F795F} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
428427
{D5F8C28F-1295-4510-B3EB-A9B367256B51} = {90E09BF8-A647-43B8-B721-05CAECFADD72}
@@ -449,6 +448,7 @@ Global
449448
{12108388-6DAD-492F-80BC-080163F4FAAB} = {A86D4D5B-AECE-49F2-A2BC-F6897B3EB2E8}
450449
{6BFCB413-77F6-494D-9381-08CB39D79316} = {A1BC3262-1837-40D9-A530-DCFE679927C2}
451450
{2197FF1E-EE63-4CA0-9742-140B49EBC0AF} = {9A62662C-AB8A-4683-B251-B9B8B95B5F49}
451+
{41D9E469-B1B5-415E-9F13-7780F321FD62} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
452452
EndGlobalSection
453453
GlobalSection(ExtensibilityGlobals) = postSolution
454454
SolutionGuid = {B9D9D17B-1C17-402F-B701-DC671528690A}

‎appveyor.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ install:
4747
4848
before_build:
4949
- ps: >-
50-
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
50+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
51+
{
52+
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
53+
}
5154
5255
dotnet restore
5356

‎test/Assistant.v1.UnitTests/AssistantServiceGeneratedUnitTests.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("ASSISTANT_APIKEY");
57+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", "apikey");
5658
AssistantService service = Substitute.For<AssistantService>("versionDate");
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]
@@ -80,11 +83,14 @@ public void ConstructorNoVersion()
8083
[TestMethod]
8184
public void ConstructorNoUrl()
8285
{
86+
var apikey = System.Environment.GetEnvironmentVariable("ASSISTANT_APIKEY");
87+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", "apikey");
8388
var url = System.Environment.GetEnvironmentVariable("ASSISTANT_SERVICE_URL");
8489
System.Environment.SetEnvironmentVariable("ASSISTANT_SERVICE_URL", null);
8590
AssistantService service = Substitute.For<AssistantService>("versionDate");
8691
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/assistant/api");
8792
System.Environment.SetEnvironmentVariable("ASSISTANT_SERVICE_URL", url);
93+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", apikey);
8894
}
8995
#endregion
9096

‎test/Assistant.v2.UnitTests/AssistantServiceGeneratedUnitTests.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("ASSISTANT_APIKEY");
57+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", "apikey");
5658
AssistantService service = Substitute.For<AssistantService>("versionDate");
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]
@@ -80,11 +83,14 @@ public void ConstructorNoVersion()
8083
[TestMethod]
8184
public void ConstructorNoUrl()
8285
{
83-
var url = System.Environment.GetEnvironmentVariable("ASSISTANT_SERVICE_URL");
84-
System.Environment.SetEnvironmentVariable("ASSISTANT_SERVICE_URL", null);
86+
var url = System.Environment.GetEnvironmentVariable("ASSISTANT_URL");
87+
var apikey = System.Environment.GetEnvironmentVariable("ASSISTANT_APIKEY");
88+
System.Environment.SetEnvironmentVariable("ASSISTANT_URL", null);
89+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", "apikey");
8590
AssistantService service = Substitute.For<AssistantService>("versionDate");
8691
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/assistant/api");
87-
System.Environment.SetEnvironmentVariable("ASSISTANT_SERVICE_URL", url);
92+
System.Environment.SetEnvironmentVariable("ASSISTANT_URL", url);
93+
System.Environment.SetEnvironmentVariable("ASSISTANT_APIKEY", apikey);
8894
}
8995
#endregion
9096

‎test/CompareComply.v1.UnitTests/CompareComplyServiceGeneratedUnitTests.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("COMPARE_COMPLY_APIKEY");
57+
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_APIKEY", "apikey");
5658
CompareComplyService service = Substitute.For<CompareComplyService>("versionDate");
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]
@@ -80,11 +83,13 @@ public void ConstructorNoVersion()
8083
[TestMethod]
8184
public void ConstructorNoUrl()
8285
{
83-
var url = System.Environment.GetEnvironmentVariable("COMPARE_COMPLY_SERVICE_URL");
84-
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_SERVICE_URL", null);
86+
var apikey = System.Environment.GetEnvironmentVariable("COMPARE_COMPLY_APIKEY");
87+
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_APIKEY", "apikey");
88+
var url = System.Environment.GetEnvironmentVariable("COMPARE_COMPLY_URL");
89+
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_URL", null);
8590
CompareComplyService service = Substitute.For<CompareComplyService>("versionDate");
8691
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/compare-comply/api");
87-
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_SERVICE_URL", url);
92+
System.Environment.SetEnvironmentVariable("COMPARE_COMPLY_URL", url);
8893
}
8994
#endregion
9095

‎test/Discovery.v1.UnitTests/DiscoveryServiceGeneratedUnitTests.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ public void ConstructorHttpClient()
5454
[TestMethod]
5555
public void ConstructorExternalConfig()
5656
{
57+
var apikey = System.Environment.GetEnvironmentVariable("DISCOVERY_APIKEY");
58+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", "apikey");
5759
DiscoveryService service = Substitute.For<DiscoveryService>("versionDate");
5860
Assert.IsNotNull(service);
61+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", apikey);
5962
}
6063

6164
[TestMethod]
@@ -81,11 +84,13 @@ public void ConstructorNoVersion()
8184
[TestMethod]
8285
public void ConstructorNoUrl()
8386
{
84-
var url = System.Environment.GetEnvironmentVariable("DISCOVERY_SERVICE_URL");
85-
System.Environment.SetEnvironmentVariable("DISCOVERY_SERVICE_URL", null);
87+
var apikey = System.Environment.GetEnvironmentVariable("DISCOVERY_APIKEY");
88+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", "apikey");
89+
var url = System.Environment.GetEnvironmentVariable("DISCOVERY_URL");
90+
System.Environment.SetEnvironmentVariable("DISCOVERY_URL", null);
8691
DiscoveryService service = Substitute.For<DiscoveryService>("versionDate");
8792
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/discovery/api");
88-
System.Environment.SetEnvironmentVariable("DISCOVERY_SERVICE_URL", url);
93+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", apikey);
8994
}
9095
#endregion
9196

‎test/Discovery.v2.UnitTests/DiscoveryServiceGeneratedUnitTests.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("DISCOVERY_APIKEY");
57+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", "apikey");
5658
DiscoveryService service = Substitute.For<DiscoveryService>("versionDate");
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("DISCOVERY_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]

‎test/LanguageTranslator.v3.UnitTests/LanguageTranslatorServiceGeneratedUnitTests.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY");
57+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY", "apikey");
5658
LanguageTranslatorService service = Substitute.For<LanguageTranslatorService>("versionDate");
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]
@@ -80,11 +83,14 @@ public void ConstructorNoVersion()
8083
[TestMethod]
8184
public void ConstructorNoUrl()
8285
{
83-
var url = System.Environment.GetEnvironmentVariable("LANGUAGE_TRANSLATOR_SERVICE_URL");
84-
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_SERVICE_URL", null);
86+
var apikey = System.Environment.GetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY");
87+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY", "apikey");
88+
var url = System.Environment.GetEnvironmentVariable("LANGUAGE_TRANSLATOR_URL");
89+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_URL", null);
8590
LanguageTranslatorService service = Substitute.For<LanguageTranslatorService>("versionDate");
8691
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/language-translator/api");
87-
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_SERVICE_URL", url);
92+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_URL", url);
93+
System.Environment.SetEnvironmentVariable("LANGUAGE_TRANSLATOR_APIKEY", apikey);
8894
}
8995
#endregion
9096

‎test/NaturalLangaugeUnderstanding.v1.UnitTests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎test/NaturalLanguageClassifier.v1.UnitTests/NaturalLanguageClassifierServiceGeneratedUnitTests.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ public void ConstructorHttpClient()
5353
[TestMethod]
5454
public void ConstructorExternalConfig()
5555
{
56+
var apikey = System.Environment.GetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY");
57+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY", "apikey");
5658
NaturalLanguageClassifierService service = Substitute.For<NaturalLanguageClassifierService>();
5759
Assert.IsNotNull(service);
60+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY", apikey);
5861
}
5962

6063
[TestMethod]
@@ -74,11 +77,14 @@ public void ConstructorAuthenticator()
7477
[TestMethod]
7578
public void ConstructorNoUrl()
7679
{
77-
var url = System.Environment.GetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_SERVICE_URL");
78-
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_SERVICE_URL", null);
80+
var apikey = System.Environment.GetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY");
81+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY", "apikey");
82+
var url = System.Environment.GetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_URL");
83+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_URL", null);
7984
NaturalLanguageClassifierService service = Substitute.For<NaturalLanguageClassifierService>();
8085
Assert.IsTrue(service.ServiceUrl == "https://gateway.watsonplatform.net/natural-language-classifier/api");
81-
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_SERVICE_URL", url);
86+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_URL", url);
87+
System.Environment.SetEnvironmentVariable("NATURAL_LANGUAGE_CLASSIFIER_APIKEY", apikey);
8288
}
8389
#endregion
8490

0 commit comments

Comments
 (0)