Compare commits

...

5 Commits

Author SHA1 Message Date
amadoubahaa68134
becdc0e088 bring TestOne zum laufem amk! 2018-11-22 15:48:55 +01:00
amadoubahaa68134
1b02d17585 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/HelloWorld.java
2018-11-22 15:43:44 +01:00
amadoubahaa68134
2f1561939b bring TestOne zum laufem amk! 2018-11-22 15:43:02 +01:00
amadoubahaa68134
d4398ff5e9 Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/korndoerferpi67188/ChareSWE
# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
2018-11-22 15:05:27 +01:00
amadoubahaa68134
334c45e723 Namenänderung 2018-11-22 15:04:55 +01:00
3 changed files with 54 additions and 0 deletions

1
.idea/ChareSWE.iml generated
View File

@ -7,5 +7,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jars" level="project" />
</component>
</module>

6
src/HelloWorld.java Normal file
View File

@ -0,0 +1,6 @@
public class HelloWorld {
public static void main(String[] args) {
System.out.println("Hallo Welt");
}
}

47
src/Testamadoubahaa.java Normal file
View File

@ -0,0 +1,47 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class Testamadoubahaa {
@Test
public void testTrue(){
assertTrue(1==1);
assertEquals(4, 2*2);
}
@Test
public void testMultiply(){
// Arrange
int i = 2;
// Act
int result = i * 2;
// Assert
assertEquals(4, result);
}
@Test
public void testOne(){
//
int j = 23 ;
int a = 38;
// Act
int res = j + a;
// Assert
assertEquals(100, res);
//
//
}
}