Skip to content

Commit 9fc9df1

Browse files
committed
Rename langauge translator tests and examples, add integration tests for discovery credentials
1 parent 5c8f873 commit 9fc9df1

File tree

5 files changed

+61
-5
lines changed

5 files changed

+61
-5
lines changed

IBM.WatsonDeveloperCloud.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LanguageTranslatorV3", "Lan
113113
EndProject
114114
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v3", "src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj", "{CF4DDE0B-F484-49EB-A78B-10772AB458C2}"
115115
EndProject
116-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests", "test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests.csproj", "{0A0E29F3-02D1-4824-A523-AC0EA962CB91}"
116+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests", "test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests.csproj", "{0A0E29F3-02D1-4824-A523-AC0EA962CB91}"
117117
EndProject
118-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests", "test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests.csproj", "{A979FF0A-063D-4D96-A9B2-81E7A483E2AC}"
118+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests", "test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests.csproj", "{A979FF0A-063D-4D96-A9B2-81E7A483E2AC}"
119119
EndProject
120-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example", "examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example.csproj", "{E70682E0-EE89-4FEE-82F2-01ED0990E2E2}"
120+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example", "examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example.csproj", "{E70682E0-EE89-4FEE-82F2-01ED0990E2E2}"
121121
EndProject
122122
Global
123123
GlobalSection(SolutionConfigurationPlatforms) = preSolution

test/IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests/DiscoveryIntegrationTests.cs

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class DiscoveryIntegrationTests
3737
private static string _username;
3838
private static string _password;
3939
private static string credentials = string.Empty;
40-
private static string version = "2017-11-07";
40+
private static string version = "2018-03-05";
4141

4242
private static string _environmentId;
4343
private static string _createdConfigurationId;
@@ -99,7 +99,6 @@ public void Setup()
9999
_service = new DiscoveryService(_username, _password, version);
100100
_service.SetEndpoint(_endpoint);
101101

102-
103102
var environments = ListEnvironments();
104103
_environmentId = environments.Environments[1].EnvironmentId;
105104

@@ -510,6 +509,63 @@ public void TestTrainingData()
510509
}
511510
#endregion
512511

512+
#region Credentials
513+
[TestMethod]
514+
public void TestCredentials_Success()
515+
{
516+
var listCredentialsResult = ListCredentials(_environmentId);
517+
518+
Credentials credentials = new Credentials()
519+
{
520+
SourceType = Credentials.SourceTypeEnum.BOX,
521+
CredentialDetails = new CredentialDetails()
522+
{
523+
CredentialType = CredentialDetails.CredentialTypeEnum.OAUTH2,
524+
EnterpriseId = "myEnterpriseId",
525+
ClientId = "myClientId",
526+
ClientSecret = "myClientSecret",
527+
PublicKeyId = "myPublicIdKey",
528+
Passphrase = "myPassphrase",
529+
PrivateKey = "myPrivateKey"
530+
}
531+
};
532+
533+
var createCredentialsResult = CreateCredentials(_environmentId, credentials);
534+
string credentialId = createCredentialsResult.CredentialId;
535+
536+
var getCredentialResult = GetCredentials(_environmentId, credentialId);
537+
538+
Credentials updatedCredentials = new Credentials()
539+
{
540+
CredentialDetails = new CredentialDetails()
541+
{
542+
EnterpriseId = "boxEnterpriseIdUpdated"
543+
}
544+
};
545+
546+
var updateCredentialResult = UpdateCredentials(_environmentId, credentialId, updatedCredentials);
547+
548+
var deleteCredentialsResult = DeleteCredentials(_environmentId, credentialId);
549+
550+
Assert.IsNotNull(listCredentialsResult);
551+
Assert.IsTrue(!string.IsNullOrEmpty(listCredentialsResult.ResponseJson));
552+
Assert.IsNotNull(createCredentialsResult);
553+
Assert.IsTrue(!string.IsNullOrEmpty(createCredentialsResult.CredentialId));
554+
Assert.IsTrue(createCredentialsResult.SourceType == Credentials.SourceTypeEnum.BOX);
555+
Assert.IsTrue(createCredentialsResult.CredentialDetails.CredentialType == CredentialDetails.CredentialTypeEnum.OAUTH2);
556+
Assert.IsTrue(createCredentialsResult.CredentialDetails.EnterpriseId == "box-enterprise-id");
557+
Assert.IsNotNull(getCredentialResult);
558+
Assert.IsTrue(getCredentialResult.SourceType == Credentials.SourceTypeEnum.BOX);
559+
Assert.IsTrue(getCredentialResult.CredentialDetails.CredentialType == CredentialDetails.CredentialTypeEnum.OAUTH2);
560+
Assert.IsTrue(getCredentialResult.CredentialDetails.EnterpriseId == "box-enterprise-id");
561+
Assert.IsNotNull(updateCredentialResult);
562+
Assert.IsTrue(updateCredentialResult.CredentialDetails.EnterpriseId == "box-enterprise-id-updated");
563+
Assert.IsNotNull(deleteCredentialsResult);
564+
Assert.IsTrue(deleteCredentialsResult.CredentialId == credentialId);
565+
Assert.IsTrue(deleteCredentialsResult.Status == Model.DeleteCredentials.StatusEnum.DELETED);
566+
}
567+
#endregion
568+
513569
#region IsEnvironmentReady
514570
private void IsEnvironmentReady(string environmentId)
515571
{

0 commit comments

Comments
 (0)