Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
ohj2
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
lainejee
ohj2
Commits
e110efbc
Commit
e110efbc
authored
1 month ago
by
Jesse Laine
Browse files
Options
Downloads
Patches
Plain Diff
Rekisteröintiä lisätty.
parent
d6a029e5
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
taidegalleria/Taiteilija.java
+39
-2
39 additions, 2 deletions
taidegalleria/Taiteilija.java
taidegalleria/test/TaiteilijaTest.java
+31
-0
31 additions, 0 deletions
taidegalleria/test/TaiteilijaTest.java
with
70 additions
and
2 deletions
taidegalleria/Taiteilija.java
+
39
−
2
View file @
e110efbc
package
taidegalleria
;
import
java.io.OutputStream
;
import
java.io.PrintStream
;
/**
...
...
@@ -35,6 +36,8 @@ public class Taiteilija {
private
String
kansalaisuus
=
""
;
private
String
tyylisuunta
=
""
;
public
static
int
seuraavaId
=
1
;
/**
* Muodostaa tyhjnä taiteilijan.
...
...
@@ -55,13 +58,47 @@ public class Taiteilija {
}
/** Ei tarvita vielä: */
// public void tulosta(OutputStream os) { tulosta(new PrintStream(os)); }
/**
* Antaa taiteilijalle seuraavan id:n.
* @return taiteilijan uusi tunnusId
* @example
* <pre name="test">
* Taiteilija a1 = new Taiteilija();
* a1.getId() === 0;
* a1.rekisteroi();
* Taiteilija a2 = new Taiteilija();
* a2.rekisteroi();
* int n1 = a1.getId();
* int n2 = a2.getId();
* n1 === n2-1;
* </pre>
*/
public
int
rekisteroi
()
{
this
.
id
=
seuraavaId
;
seuraavaId
++;
return
this
.
id
;
}
/**
* Palauttaa taiteilijan id:n.
* @return taiteilijan id
*/
public
int
getId
()
{
return
id
;
}
public
static
void
main
(
String
[]
args
)
{
Taiteilija
hiroshige
=
new
Taiteilija
();
Taiteilija
edward
=
new
Taiteilija
();
//
hiroshige.rekisteroi();
//
edward.rekisteroi();
hiroshige
.
rekisteroi
();
edward
.
rekisteroi
();
hiroshige
.
tulosta
(
System
.
out
);
edward
.
tulosta
(
System
.
out
);
...
...
This diff is collapsed.
Click to expand it.
taidegalleria/test/TaiteilijaTest.java
0 → 100644
+
31
−
0
View file @
e110efbc
package
taidegalleria.test
;
// Generated by ComTest BEGIN
import
static
org
.
junit
.
Assert
.*;
import
org.junit.*
;
import
taidegalleria.*
;
// Generated by ComTest END
/**
* Test class made by ComTest
* @version 2025.02.24 16:09:25 // Generated by ComTest
*
*/
@SuppressWarnings
({
"PMD"
})
public
class
TaiteilijaTest
{
// Generated by ComTest BEGIN
/** testRekisteroi69 */
@Test
public
void
testRekisteroi69
()
{
// Taiteilija: 69
Taiteilija
a1
=
new
Taiteilija
();
assertEquals
(
"From: Taiteilija line: 71"
,
0
,
a1
.
getId
());
a1
.
rekisteroi
();
Taiteilija
a2
=
new
Taiteilija
();
a2
.
rekisteroi
();
int
n1
=
a1
.
getId
();
int
n2
=
a2
.
getId
();
assertEquals
(
"From: Taiteilija line: 77"
,
n2
-
1
,
n1
);
}
// Generated by ComTest END
}
\ No newline at end of file
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