Commit 3922fa97 authored by Uwe Peuker's avatar Uwe Peuker
Browse files

Zeittest unabhängig von lokaler Systemzeit

parent 39de9d01

gradlew

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

src/main/assembly/swe.xml

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
<assembly

	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">



	<id>swe</id>



	<includeBaseDirectory>false</includeBaseDirectory>



	<formats>

		<format>zip</format>

	</formats>



	<fileSets>

		<fileSet>

			<directory>src/main/dist</directory>

			<outputDirectory>${project.artifactId}</outputDirectory>

		</fileSet>

		<fileSet>

			<directory>${project.build.directory}/dependencies</directory>

			<outputDirectory>${project.artifactId}/lib</outputDirectory>

			<includes>

				<include>*</include>

			</includes>

			<excludes>

				<exclude>de.bsvrz.*</exclude>

			</excludes>

		</fileSet>

	</fileSets>



	<files>

		<file>

			<source>${project.build.directory}/${artifactId}-runtime.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}.jar</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-doc-api-javadoc.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-doc-api.zip</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-doc-design-javadoc.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-doc-design.zip</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-sources.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-src.zip</destName>

		</file>

		<file>

			<source>LICENSE.txt</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-Lizenz.txt</destName>

		</file>

		<file>

			<source>README.txt</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-Build-Report.txt</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-tests.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-test.jar</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-doc-api-test-javadoc.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-test-doc-api.zip</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-doc-design-test-javadoc.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-test-doc-design.zip</destName>

		</file>

		<file>

			<source>${project.build.directory}/${artifactId}-${version}-test-sources.jar</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-test-src.zip</destName>

		</file>

		<file>

			<source>LICENSE.txt</source>

			<outputDirectory>${artifactId}</outputDirectory>

			<destName>${artifactId}-test-Lizenz.txt</destName>

		</file>

	</files>



</assembly>

src/test/java/de/bsvrz/kex/lmstic3/ZeitTest.java

+8 −3
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import java.text.ParseException; 
import java.text.SimpleDateFormat;

import java.util.Calendar;

import java.util.GregorianCalendar;

import java.util.TimeZone;

import java.util.concurrent.TimeUnit;



import org.junit.Assert;

import org.junit.Test;
@@ -90,7 +92,10 @@ public class ZeitTest { 
			cal.setTimeInMillis(zeit);

			final DateFormat formatter = new SimpleDateFormat();

			System.out.println("Systemzeit:  " + formatter.format(cal.getTime()));

			Assert.assertEquals(cal.get(Calendar.HOUR), 10);



			int offset = TimeZone.getDefault().getOffset(cal.get(Calendar.YEAR / 100), cal.get(Calendar.YEAR % 100), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.DAY_OF_WEEK), 0);

			Assert.assertEquals(cal.get(Calendar.HOUR), 8 + TimeUnit.MILLISECONDS.toHours(offset));



		} catch (final ParseException e) {

			e.printStackTrace();

			Assert.fail();