Merge branch 'hot-fix-common-tests' into 'development'
common tests fix See merge request wesign/unity-application!61
This commit was merged in pull request #61.
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -72,4 +72,5 @@ crashlytics-build.properties
|
|||||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class BackButtonTests
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class CourseActivityTests
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class CourseMenuScreenTest
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class ListCoursesScreenTest
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class MainMenuScreenTests
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class MiniGameActivityScreenTests
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class StartGamesTests
|
|||||||
[UnityTest]
|
[UnityTest]
|
||||||
public IEnumerator BootWithUsersTest()
|
public IEnumerator BootWithUsersTest()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
@@ -62,7 +62,7 @@ public class StartGamesTests
|
|||||||
public IEnumerator BootWithoutUsersTest()
|
public IEnumerator BootWithoutUsersTest()
|
||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{}";
|
var oneUser = "{}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class UserButtonTests
|
|||||||
[UnitySetUp]
|
[UnitySetUp]
|
||||||
public IEnumerator SetupFunction()
|
public IEnumerator SetupFunction()
|
||||||
{
|
{
|
||||||
string path = Path.Combine("Assets", "users.json");
|
string path = $"{Application.persistentDataPath}/users.json";
|
||||||
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
var oneUser = "{\"currentUserIndex\": 0,\"storedUsers\": [{\"username\": \"TEST\",\"avatar\": {\"instanceID\": 40848},\"playtime\": 0.0,\"courses\": [],\"minigames\": []}]}";
|
||||||
|
|
||||||
using (StreamWriter writer = new StreamWriter(path))
|
using (StreamWriter writer = new StreamWriter(path))
|
||||||
|
|||||||
@@ -222,21 +222,4 @@ QualitySettings:
|
|||||||
resolutionScalingFixedDPIFactor: 1
|
resolutionScalingFixedDPIFactor: 1
|
||||||
customRenderPipeline: {fileID: 0}
|
customRenderPipeline: {fileID: 0}
|
||||||
excludedTargetPlatforms: []
|
excludedTargetPlatforms: []
|
||||||
m_PerPlatformDefaultQuality:
|
m_PerPlatformDefaultQuality: {}
|
||||||
Android: 2
|
|
||||||
EmbeddedLinux: 5
|
|
||||||
GameCoreScarlett: 5
|
|
||||||
GameCoreXboxOne: 5
|
|
||||||
LinuxHeadlessSimulation: 5
|
|
||||||
Lumin: 5
|
|
||||||
Nintendo Switch: 5
|
|
||||||
PS4: 5
|
|
||||||
PS5: 5
|
|
||||||
Server: 5
|
|
||||||
Stadia: 5
|
|
||||||
Standalone: 5
|
|
||||||
WebGL: 3
|
|
||||||
Windows Store Apps: 5
|
|
||||||
XboxOne: 5
|
|
||||||
iPhone: 2
|
|
||||||
tvOS: 2
|
|
||||||
|
|||||||
Reference in New Issue
Block a user