Compare commits

..

No commits in common. "e5d3a789e6f19db59f894aa6068c5292f5f28137" and "b587d1a40160c698674aa71cf66a00b9581e8673" have entirely different histories.

9 changed files with 18 additions and 67 deletions

12
.idea/ChareSWE.iml generated Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jars" level="project" />
</component>
</module>

4
.idea/misc.xml generated
View File

@ -3,7 +3,7 @@
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="true" project-jdk-name="10" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/../gitchareswe" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
<output url="file://$USER_HOME$/gitchareswe" />
</component>
</project>

2
.idea/modules.xml generated
View File

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ChareSWE.iml" filepath="$PROJECT_DIR$/ChareSWE.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/ChareSWE.iml" filepath="$PROJECT_DIR$/.idea/ChareSWE.iml" />
</modules>
</component>
</project>

View File

@ -2,14 +2,10 @@ public class Account {
public Person owner;
public String email;
Account(Person owner, String email){
this.owner = owner;
this.email = email;
}
public void accountErstellen(Person p, String e_email){
this.owner = p;
this.email = e_email;
}

View File

@ -16,7 +16,7 @@ public class CredentialsTest{
public void testTwo(){
Credentials c = new Credentials("hofmannol", "GERONIMO");
assertEquals("hofmannol", c.login);
assertTrue(c.valid());
}
@Test

View File

@ -6,7 +6,6 @@ public class Person {
public int age;
Person(String name, String vname, int age){
this.name = name;
this.vname = vname;
this.age = age;

View File

@ -3,20 +3,17 @@ public class Spender extends Person{
private int amount;
public Spender (String fname, String lname, int age, int summe){
super(fname, lname, age);
this.amount = summe;
}
public void betragSetzen(int summe){
if(summe > 0){
amount = summe;
}
}
public int getAmount(){
return amount;
}

View File

@ -1,52 +0,0 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class TestAccount {
@Test
public void test1(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals("Georg", a.owner.vname);
}
@Test
public void testM2(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals("Georg", a.owner.vname);
}
@Test
public void test3(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals(12, a.owner.age);
}
}

View File

@ -12,5 +12,4 @@ public class TestKorndoerfer {
}
}