Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
calculator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
PIERRON Laurent
calculator
Commits
2b897535
Commit
2b897535
authored
2 years ago
by
Noah Mandler
Browse files
Options
Downloads
Patches
Plain Diff
Correction du bug de la calculatrice + tous les tests passent
parent
d60d0ff0
No related branches found
No related tags found
No related merge requests found
Pipeline
#10585
passed
2 years ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/fr/nancy/iut/CalcEngine.java
+3
-3
3 additions, 3 deletions
src/main/java/fr/nancy/iut/CalcEngine.java
src/test/java/fr/nancy/iut/CalcEngineTest.java
+9
-6
9 additions, 6 deletions
src/test/java/fr/nancy/iut/CalcEngineTest.java
with
12 additions
and
9 deletions
src/main/java/fr/nancy/iut/CalcEngine.java
+
3
−
3
View file @
2b897535
...
...
@@ -69,11 +69,11 @@ public class CalcEngine
*/
public
void
equals
()
{
if
(
previousOperator
==
'
+
'
)
{
displayValue
=
leftOperand
+
displayValue
;
if
(
previousOperator
==
'
-
'
)
{
displayValue
=
leftOperand
-
displayValue
;
}
else
{
displayValue
=
leftOperand
-
displayValue
;
displayValue
=
leftOperand
+
displayValue
;
}
leftOperand
=
0
;
}
...
...
This diff is collapsed.
Click to expand it.
src/test/java/fr/nancy/iut/CalcEngineTest.java
+
9
−
6
View file @
2b897535
...
...
@@ -6,14 +6,9 @@ import org.junit.jupiter.api.Test;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
public
class
CalcEngineTest
{
private
CalcEngine
engine
;
@BeforeEach
void
setUp
()
{
engine
=
new
CalcEngine
();
}
@Test
void
testClear
()
{
CalcEngine
engine
=
new
CalcEngine
();
engine
.
numberPressed
(
1
);
engine
.
numberPressed
(
2
);
engine
.
numberPressed
(
3
);
...
...
@@ -24,6 +19,7 @@ public class CalcEngineTest {
@Test
void
testEquals
()
{
CalcEngine
engine
=
new
CalcEngine
();
engine
.
numberPressed
(
1
);
engine
.
numberPressed
(
2
);
engine
.
numberPressed
(
3
);
...
...
@@ -34,26 +30,31 @@ public class CalcEngineTest {
@Test
void
testGetAuthor
()
{
CalcEngine
engine
=
new
CalcEngine
();
assertEquals
(
"Hacker T. Largebrain"
,
engine
.
getAuthor
());
}
@Test
void
testGetDisplayValue
()
{
CalcEngine
engine
=
new
CalcEngine
();
assertEquals
(
0
,
engine
.
getDisplayValue
());
}
@Test
void
testGetTitle
()
{
CalcEngine
engine
=
new
CalcEngine
();
assertEquals
(
"Super Calculator"
,
engine
.
getTitle
());
}
@Test
void
testGetVersion
()
{
CalcEngine
engine
=
new
CalcEngine
();
assertEquals
(
"version 0.2"
,
engine
.
getVersion
());
}
@Test
void
testMinus
()
{
CalcEngine
engine
=
new
CalcEngine
();
engine
.
numberPressed
(
1
);
engine
.
numberPressed
(
2
);
engine
.
numberPressed
(
3
);
...
...
@@ -70,6 +71,7 @@ public class CalcEngineTest {
@Test
void
testNumberPressed
()
{
CalcEngine
engine
=
new
CalcEngine
();
assertEquals
(
0
,
engine
.
getDisplayValue
());
engine
.
numberPressed
(
1
);
assertEquals
(
1
,
engine
.
getDisplayValue
());
...
...
@@ -81,6 +83,7 @@ public class CalcEngineTest {
@Test
void
testPlus
()
{
CalcEngine
engine
=
new
CalcEngine
();
engine
.
numberPressed
(
1
);
engine
.
numberPressed
(
2
);
engine
.
numberPressed
(
3
);
...
...
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