Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
3e5d1a0d
Verified
Commit
3e5d1a0d
authored
May 02, 2018
by
Julian Dehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix testdata creation:
* Create at least one contact
parent
1833efa5
Pipeline
#1442
passed with stage
in 7 minutes and 22 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
118 additions
and
37 deletions
+118
-37
briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java
...org/briarproject/briar/android/test/TestDataActivity.java
+113
-35
briar-android/src/main/res/layout/activity_test_data.xml
briar-android/src/main/res/layout/activity_test_data.xml
+1
-1
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
...java/org/briarproject/briar/api/test/TestDataCreator.java
+1
-1
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
...java/org/briarproject/briar/test/TestDataCreatorImpl.java
+3
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java
View file @
3e5d1a0d
...
...
@@ -23,8 +23,20 @@ public class TestDataActivity extends BriarActivity {
@Inject
TestDataCreator
testDataCreator
;
private
TextView
[]
textViews
=
new
TextView
[
5
];
private
SeekBar
[]
seekBars
=
new
SeekBar
[
5
];
private
TextView
contactsTextView
;
private
SeekBar
contactsSeekBar
;
private
TextView
messagesTextView
;
private
SeekBar
messagesSeekBar
;
private
TextView
blogPostsTextView
;
private
SeekBar
blogPostsSeekBar
;
private
TextView
forumsTextView
;
private
SeekBar
forumsSeekBar
;
private
TextView
forumPostsTextView
;
private
SeekBar
forumPostsSeekBar
;
@Override
public
void
onCreate
(
Bundle
bundle
)
{
...
...
@@ -37,45 +49,111 @@ public class TestDataActivity extends BriarActivity {
}
setContentView
(
R
.
layout
.
activity_test_data
);
textViews
[
0
]
=
findViewById
(
R
.
id
.
textViewContactsSb
);
textViews
[
1
]
=
findViewById
(
R
.
id
.
textViewMessagesSb
);
textViews
[
2
]
=
findViewById
(
R
.
id
.
TextViewBlogPostsSb
);
textViews
[
3
]
=
findViewById
(
R
.
id
.
TextViewForumsSb
);
textViews
[
4
]
=
findViewById
(
R
.
id
.
TextViewForumMessagesSb
);
seekBars
[
0
]
=
findViewById
(
R
.
id
.
seekBarContacts
);
seekBars
[
1
]
=
findViewById
(
R
.
id
.
seekBarMessages
);
seekBars
[
2
]
=
findViewById
(
R
.
id
.
seekBarBlogPosts
);
seekBars
[
3
]
=
findViewById
(
R
.
id
.
seekBarForums
);
seekBars
[
4
]
=
findViewById
(
R
.
id
.
seekBarForumMessages
);
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
final
TextView
textView
=
textViews
[
i
];
seekBars
[
i
].
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
textView
.
setText
(
String
.
valueOf
(
progress
));
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
}
contactsTextView
=
findViewById
(
R
.
id
.
textViewContactsSb
);
messagesTextView
=
findViewById
(
R
.
id
.
textViewMessagesSb
);
blogPostsTextView
=
findViewById
(
R
.
id
.
TextViewBlogPostsSb
);
forumsTextView
=
findViewById
(
R
.
id
.
TextViewForumsSb
);
forumPostsTextView
=
findViewById
(
R
.
id
.
TextViewForumMessagesSb
);
contactsSeekBar
=
findViewById
(
R
.
id
.
seekBarContacts
);
messagesSeekBar
=
findViewById
(
R
.
id
.
seekBarMessages
);
blogPostsSeekBar
=
findViewById
(
R
.
id
.
seekBarBlogPosts
);
forumsSeekBar
=
findViewById
(
R
.
id
.
seekBarForums
);
forumPostsSeekBar
=
findViewById
(
R
.
id
.
seekBarForumMessages
);
contactsSeekBar
.
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
contactsTextView
.
setText
(
String
.
valueOf
(
progress
+
1
));
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
messagesSeekBar
.
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
messagesTextView
.
setText
(
String
.
valueOf
(
progress
));
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
blogPostsSeekBar
.
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
blogPostsTextView
.
setText
(
String
.
valueOf
(
progress
));
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
forumsSeekBar
.
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
forumsTextView
.
setText
(
String
.
valueOf
(
progress
));
forumPostsSeekBar
.
setEnabled
(
progress
>
0
);
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
forumPostsSeekBar
.
setOnSeekBarChangeListener
(
new
OnSeekBarChangeListener
()
{
@Override
public
void
onProgressChanged
(
SeekBar
seekBar
,
int
progress
,
boolean
fromUser
)
{
forumPostsTextView
.
setText
(
String
.
valueOf
(
progress
));
}
@Override
public
void
onStartTrackingTouch
(
SeekBar
seekBar
)
{
}
@Override
public
void
onStopTrackingTouch
(
SeekBar
seekBar
)
{
}
});
findViewById
(
R
.
id
.
buttonCreateTestData
).
setOnClickListener
(
v
->
createTestData
());
}
private
void
createTestData
()
{
testDataCreator
.
createTestData
(
seekBars
[
0
].
getProgress
()
,
seekBars
[
1
].
getProgress
(),
seekBars
[
2
]
.
getProgress
(),
seekBars
[
3
].
getProgress
(),
seekBars
[
4
]
.
getProgress
());
testDataCreator
.
createTestData
(
contactsSeekBar
.
getProgress
()
+
1
,
messagesSeekBar
.
getProgress
(),
blogPostsSeekBar
.
getProgress
(),
forumsSeekBar
.
getProgress
(),
forumPostsSeekBar
.
getProgress
());
Intent
intent
=
new
Intent
(
this
,
NavDrawerActivity
.
class
);
intent
.
addFlags
(
FLAG_ACTIVITY_CLEAR_TOP
);
startActivity
(
intent
);
...
...
briar-android/src/main/res/layout/activity_test_data.xml
View file @
3e5d1a0d
...
...
@@ -28,7 +28,7 @@
android:id=
"@+id/seekBarContacts"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:max=
"
50
"
android:max=
"
49
"
android:progress=
"20"
app:layout_constraintEnd_toStartOf=
"@+id/textViewContactsSb"
app:layout_constraintStart_toStartOf=
"parent"
...
...
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
View file @
3e5d1a0d
...
...
@@ -8,7 +8,7 @@ public interface TestDataCreator {
/**
* Create fake test data on the DatabaseExecutor
*
* @param numContacts Number of contacts to create.
* @param numContacts Number of contacts to create.
Must be >= 1
* @param numPrivateMsgs Number of private messages to create for each
* contact.
* @param numBlogPosts Number of blog posts to create.
...
...
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
View file @
3e5d1a0d
...
...
@@ -115,6 +115,9 @@ public class TestDataCreatorImpl implements TestDataCreator {
public
void
createTestData
(
int
numContacts
,
int
numPrivateMsgs
,
int
numBlogPosts
,
int
numForums
,
int
numForumPosts
)
{
if
(
numContacts
==
0
)
throw
new
IllegalArgumentException
(
"Number of contacts must be >= 1"
);
ioExecutor
.
execute
(()
->
{
try
{
createTestDataOnIoExecutor
(
numContacts
,
numPrivateMsgs
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment