Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
medialibrary
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Lamot
medialibrary
Commits
89a69bcf
Commit
89a69bcf
authored
1 year ago
by
Alaric Senat
Committed by
Alaric Senat
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
test: Avoid 'medias' terminology
parent
8c2593bc
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/samples/Tester.cpp
+9
-9
9 additions, 9 deletions
test/samples/Tester.cpp
test/unittest/MovieTests.cpp
+10
-10
10 additions, 10 deletions
test/unittest/MovieTests.cpp
with
19 additions
and
19 deletions
test/samples/Tester.cpp
+
9
−
9
View file @
89a69bcf
...
...
@@ -537,23 +537,23 @@ void Tests::checkSubscriptions( const rapidjson::Value& expectedSubscriptions,
}
}
void
Tests
::
checkMedias
(
const
rapidjson
::
Value
&
expectedMedia
s
)
void
Tests
::
checkMedias
(
const
rapidjson
::
Value
&
expectedMedia
List
)
{
ASSERT_TRUE
(
expectedMedia
s
.
IsArray
()
);
auto
media
s
=
m_ml
->
audioFiles
(
nullptr
)
->
all
();
ASSERT_TRUE
(
expectedMedia
List
.
IsArray
()
);
auto
media
_list
=
m_ml
->
audioFiles
(
nullptr
)
->
all
();
auto
videos
=
m_ml
->
videoFiles
(
nullptr
)
->
all
();
media
s
.
insert
(
begin
(
media
s
),
begin
(
videos
),
end
(
videos
)
);
for
(
auto
i
=
0u
;
i
<
expectedMedia
s
.
Size
();
++
i
)
media
_list
.
insert
(
begin
(
media
_list
),
begin
(
videos
),
end
(
videos
)
);
for
(
auto
i
=
0u
;
i
<
expectedMedia
List
.
Size
();
++
i
)
{
const
auto
&
expectedMedia
=
expectedMedia
s
[
i
];
const
auto
&
expectedMedia
=
expectedMedia
List
[
i
];
ASSERT_TRUE
(
expectedMedia
.
HasMember
(
"title"
)
);
const
auto
expectedTitle
=
expectedMedia
[
"title"
].
GetString
();
auto
it
=
std
::
find_if
(
begin
(
media
s
),
end
(
media
s
),
[
expectedTitle
](
const
MediaPtr
&
m
)
{
auto
it
=
std
::
find_if
(
begin
(
media
_list
),
end
(
media
_list
),
[
expectedTitle
](
const
MediaPtr
&
m
)
{
return
strcasecmp
(
expectedTitle
,
m
->
title
().
c_str
()
)
==
0
;
});
ASSERT_TRUE
(
end
(
media
s
)
!=
it
);
ASSERT_TRUE
(
end
(
media
_list
)
!=
it
);
const
auto
media
=
*
it
;
media
s
.
erase
(
it
);
media
_list
.
erase
(
it
);
if
(
expectedMedia
.
HasMember
(
"nbVideoTracks"
)
||
expectedMedia
.
HasMember
(
"videoTracks"
)
)
{
auto
videoTracks
=
media
->
videoTracks
()
->
all
();
...
...
This diff is collapsed.
Click to expand it.
test/unittest/MovieTests.cpp
+
10
−
10
View file @
89a69bcf
...
...
@@ -101,18 +101,18 @@ static void SortByAlpha( Tests* T )
auto
m3
=
T
->
ml
->
createMovie
(
*
media3
);
QueryParameters
params
{
SortingCriteria
::
Alpha
,
false
};
auto
media
s
=
T
->
ml
->
movies
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
media
s
.
size
()
);
ASSERT_EQ
(
m
->
id
(),
media
s
[
0
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
media
s
[
1
]
->
id
()
);
ASSERT_EQ
(
m2
->
id
(),
media
s
[
2
]
->
id
()
);
auto
all_
media
=
T
->
ml
->
movies
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
all_
media
.
size
()
);
ASSERT_EQ
(
m
->
id
(),
all_
media
[
0
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
all_
media
[
1
]
->
id
()
);
ASSERT_EQ
(
m2
->
id
(),
all_
media
[
2
]
->
id
()
);
params
.
desc
=
true
;
media
s
=
T
->
ml
->
movies
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
media
s
.
size
()
);
ASSERT_EQ
(
m2
->
id
(),
media
s
[
0
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
media
s
[
1
]
->
id
()
);
ASSERT_EQ
(
m
->
id
(),
media
s
[
2
]
->
id
()
);
all_
media
=
T
->
ml
->
movies
(
&
params
)
->
all
();
ASSERT_EQ
(
3u
,
all_
media
.
size
()
);
ASSERT_EQ
(
m2
->
id
(),
all_
media
[
0
]
->
id
()
);
ASSERT_EQ
(
m3
->
id
(),
all_
media
[
1
]
->
id
()
);
ASSERT_EQ
(
m
->
id
(),
all_
media
[
2
]
->
id
()
);
}
static
void
SetShortSummary
(
Tests
*
T
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment