Skip to content

Commit 4260495

Browse files
committed
format travis scripts
1 parent 4b9abca commit 4260495

File tree

2 files changed

+78
-61
lines changed

2 files changed

+78
-61
lines changed

Travis/TravisBuild.cs

100644100755
Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,50 @@
1-
#if UNITY_EDITOR
1+
/**
2+
* Copyright 2015 IBM Corp. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
18+
#if UNITY_EDITOR
219
using UnityEditor;
320
using UnityEngine;
421

522
public static class RunTravisBuild
623
{
7-
public static string[] BuildScenes = {
8-
"Assets/Watson/Scenes/UnitTests/Main.unity",
9-
"Assets/Watson/Scenes/UnitTests/TestMic.unity",
10-
"Assets/Watson/Scenes/UnitTests/TestNaturalLanguageClassifier.unity",
11-
"Assets/Watson/Scenes/UnitTests/TestSpeechToText.unity",
12-
"Assets/Watson/Scenes/UnitTests/TestTextToSpeech.unity",
13-
"Assets/Watson/Scenes/UnitTests/UnitTests.unity",
14-
"Assets/Watson/Examples/WidgetExamples/ExampleDialog.unity",
15-
"Assets/Watson/Examples/WidgetExamples/ExampleLanguageTranslator.unity"
16-
};
24+
public static string[] BuildScenes = {
25+
"Assets/Watson/Scenes/UnitTests/Main.unity",
26+
"Assets/Watson/Scenes/UnitTests/TestMic.unity",
27+
"Assets/Watson/Scenes/UnitTests/TestNaturalLanguageClassifier.unity",
28+
"Assets/Watson/Scenes/UnitTests/TestSpeechToText.unity",
29+
"Assets/Watson/Scenes/UnitTests/TestTextToSpeech.unity",
30+
"Assets/Watson/Scenes/UnitTests/UnitTests.unity",
31+
"Assets/Watson/Examples/WidgetExamples/ExampleDialog.unity",
32+
"Assets/Watson/Examples/WidgetExamples/ExampleLanguageTranslator.unity"
33+
};
1734

18-
static public void OSX()
19-
{
20-
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSXIntel64, BuildOptions.None);
21-
}
35+
static public void OSX()
36+
{
37+
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildOSX", BuildTarget.StandaloneOSXIntel64, BuildOptions.None);
38+
}
2239

23-
static public void Windows()
24-
{
25-
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildWindows", BuildTarget.StandaloneWindows64, BuildOptions.None);
26-
}
40+
static public void Windows()
41+
{
42+
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildWindows", BuildTarget.StandaloneWindows64, BuildOptions.None);
43+
}
2744

28-
static public void Linux()
29-
{
30-
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildLinux", BuildTarget.StandaloneLinux64, BuildOptions.None);
31-
}
45+
static public void Linux()
46+
{
47+
BuildPipeline.BuildPlayer(BuildScenes, Application.dataPath + "TestBuildLinux", BuildTarget.StandaloneLinux64, BuildOptions.None);
48+
}
3249
}
3350
#endif

Travis/TravisIntegrationTests.cs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,50 @@
2323

2424
namespace IBM.Watson.DeveloperCloud.Editor
2525
{
26-
/// <summary>
27-
/// This class is executed from batch mode during Travis continuous integration.
28-
/// </summary>
29-
public class TravisIntegrationTests : MonoBehaviour
26+
/// <summary>
27+
/// This class is executed from batch mode during Travis continuous integration.
28+
/// </summary>
29+
public class TravisIntegrationTests : MonoBehaviour
30+
{
31+
public static void RunTests()
3032
{
31-
public static void RunTests()
32-
{
33-
Log.Debug("TravisIntegrationTests", "***** Running Integration tests!");
33+
Log.Debug("TravisIntegrationTests", "***** Running Integration tests!");
3434

3535
#if UNITY_EDITOR
36-
Runnable.EnableRunnableInEditor();
36+
Runnable.EnableRunnableInEditor();
3737
#endif
38-
string ProjectToTest = "";
39-
string[] args = Environment.GetCommandLineArgs();
40-
for (int i = 0; i < args.Length; ++i)
41-
{
42-
if (args[i] == "-packageOptions" && (i + 1) < args.Length)
43-
{
44-
string[] options = args[i + 1].Split(',');
45-
foreach (string option in options)
46-
{
47-
if (string.IsNullOrEmpty(option))
48-
continue;
38+
string ProjectToTest = "";
39+
string[] args = Environment.GetCommandLineArgs();
40+
for (int i = 0; i < args.Length; ++i)
41+
{
42+
if (args[i] == "-packageOptions" && (i + 1) < args.Length)
43+
{
44+
string[] options = args[i + 1].Split(',');
45+
foreach (string option in options)
46+
{
47+
if (string.IsNullOrEmpty(option))
48+
continue;
4949

50-
string[] kv = option.Split('=');
51-
if (kv[0] == "ProjectName")
52-
{
53-
ProjectToTest = kv.Length > 1 ? kv[1] : "";
54-
Log.Status("RunUnitTest", "AutoLunchOptions ProjectToTest:{0}", ProjectToTest);
55-
break;
56-
}
57-
}
58-
}
50+
string[] kv = option.Split('=');
51+
if (kv[0] == "ProjectName")
52+
{
53+
ProjectToTest = kv.Length > 1 ? kv[1] : "";
54+
Log.Status("RunUnitTest", "AutoLunchOptions ProjectToTest:{0}", ProjectToTest);
55+
break;
5956
}
60-
61-
IBM.Watson.DeveloperCloud.Editor.UnitTestManager.ProjectToTest = ProjectToTest;
62-
IBM.Watson.DeveloperCloud.Editor.UnitTestManager instance = IBM.Watson.DeveloperCloud.Editor.UnitTestManager.Instance;
63-
instance.QuitOnTestsComplete = true;
64-
instance.OnTestCompleteCallback = OnTravisIntegrationTestsComplete;
65-
instance.QueueTests(Utility.FindAllDerivedTypes(typeof(UnitTest)), true);
66-
}
67-
static void OnTravisIntegrationTestsComplete()
68-
{
69-
Log.Debug("TravisIntegrationTests", " ***** Integration tests complete!");
57+
}
7058
}
59+
}
60+
61+
UnitTestManager.ProjectToTest = ProjectToTest;
62+
UnitTestManager instance = UnitTestManager.Instance;
63+
instance.QuitOnTestsComplete = true;
64+
instance.OnTestCompleteCallback = OnTravisIntegrationTestsComplete;
65+
instance.QueueTests(Utility.FindAllDerivedTypes(typeof(UnitTest)), true);
66+
}
67+
static void OnTravisIntegrationTestsComplete()
68+
{
69+
Log.Debug("TravisIntegrationTests", " ***** Integration tests complete!");
7170
}
71+
}
7272
}

0 commit comments

Comments
 (0)