Update to version 3.2

This commit is contained in:
2026-03-18 14:56:42 +01:00
parent f593487c77
commit 44609d367f
49 changed files with 12657 additions and 3668 deletions

View File

@@ -6,6 +6,7 @@ SET(TESTS
datetime_time.cpp
endianess.cpp
mseedpacket.cpp
url.cpp
)
FOREACH(testSrc ${TESTS})

View File

@@ -17,7 +17,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/datetime.h>
#include <string>

View File

@@ -17,7 +17,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/datetime.h>
@@ -146,9 +146,9 @@ BOOST_AUTO_TEST_CASE(construction) {
// date
gc::Time date(1971,1,3,1,1,4,6544);
double dayInSeconds = 86400;
double yearInSeconds = 31536000;
BOOST_WARN_CLOSE(double(date), dayInSeconds*2 + yearInSeconds,0.3);
double secondsPerDay = 86400;
double secondsPerYear = 31536000;
BOOST_WARN_CLOSE(double(date), secondsPerDay*2 + secondsPerYear,0.3);
}
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -393,13 +393,14 @@ BOOST_AUTO_TEST_CASE(setAndGet) {
BOOST_CHECK_EQUAL(year, 1965);
BOOST_CHECK_EQUAL(yday , 0);
gc::Time before1900;
day = 28, month = 2, year = 1900;
before1900.set(year,month,day,h,min,sec,uSec);
BOOST_CHECK(before1900.get(&year,&month,&day,&h,&min,&sec,&uSec) == true);
BOOST_CHECK_EQUAL(year , 1900);
BOOST_CHECK_EQUAL(day , 28);
BOOST_CHECK_EQUAL(month, 2);
// Won't work on 32-bit systems
// gc::Time before1900;
// day = 28, month = 2, year = 1900;
// before1900.set(year,month,day,h,min,sec,uSec);
// BOOST_CHECK(before1900.get(&year,&month,&day,&h,&min,&sec,&uSec) == true);
// BOOST_CHECK_EQUAL(year , 1900);
// BOOST_CHECK_EQUAL(day , 28);
// BOOST_CHECK_EQUAL(month, 2);
gc::Time pure;
pure.get(&year,&month,&day,&h,&min,&sec,&uSec);
@@ -409,12 +410,12 @@ BOOST_AUTO_TEST_CASE(setAndGet) {
pure.get(&year,&month,&day,&h,&min,&sec,&uSec);
BOOST_CHECK_EQUAL(year, 1969);
day = 50, month = 4, year = 1566;
before1900.set(year,month,day,h,min,sec,uSec);
BOOST_CHECK(before1900.get(&year,&month,&day,&h,&min,&sec,&uSec) == true);
BOOST_CHECK_EQUAL(year , 1566);
BOOST_CHECK_EQUAL(day , 20);
BOOST_CHECK_EQUAL(month, 5);
// day = 50, month = 4, year = 1566;
// before1900.set(year,month,day,h,min,sec,uSec);
// BOOST_CHECK(before1900.get(&year,&month,&day,&h,&min,&sec,&uSec) == true);
// BOOST_CHECK_EQUAL(year , 1566);
// BOOST_CHECK_EQUAL(day , 20);
// BOOST_CHECK_EQUAL(month, 5);
}
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -477,9 +478,9 @@ BOOST_AUTO_TEST_CASE(localTime) {
BOOST_CHECK_EQUAL(check1, check2);
gc::Time yearDay = yearDay.FromYearDay(1971, 3);
double dayInSeconds = 86400;
double yearInSeconds = 31536000;
BOOST_CHECK_EQUAL(double(yearDay),dayInSeconds*2 + yearInSeconds);
double secondsPerDay = 86400;
double secondsPerYear = 31536000;
BOOST_CHECK_EQUAL(double(yearDay),secondsPerDay*2 + secondsPerYear);
}
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

View File

@@ -17,7 +17,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/endianess.h>
#include <gempa/caps/rawpacket.cpp>

View File

@@ -19,7 +19,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include "test_utils.h"
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/mseedpacket.h>
#include <gempa/caps/rawpacket.cpp>
@@ -27,10 +27,8 @@
#include <gempa/caps/datetime.h>
#include <fstream>
#include <iostream>
#include <math.h>
#include <string>
#include <streambuf>
#include <cmath>
namespace bu = boost::unit_test;

View File

@@ -17,7 +17,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/packet.h>
#include <gempa/caps/rawpacket.cpp>

View File

@@ -23,7 +23,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include "test_utils.h"
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/rawpacket.cpp>
#include <gempa/caps/mseedpacket.cpp>

View File

@@ -0,0 +1,101 @@
/***************************************************************************
* Copyright (C) 2021 by gempa GmbH *
* *
* All Rights Reserved. *
* *
* NOTICE: All information contained herein is, and remains *
* the property of gempa GmbH and its suppliers, if any. The intellectual *
* and technical concepts contained herein are proprietary to gempa GmbH *
* and its suppliers. *
* Dissemination of this information or reproduction of this material *
* is strictly forbidden unless prior written permission is obtained *
* from gempa GmbH. *
***************************************************************************/
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/url.h>
namespace gc = Gempa::CAPS;
namespace bu = boost::unit_test;
using namespace gc;
using namespace std;
BOOST_AUTO_TEST_SUITE(gempa_common_caps_url)
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
BOOST_AUTO_TEST_CASE(url_construct) {
Url url;
BOOST_CHECK_EQUAL(url.host, "");
BOOST_CHECK_EQUAL(url.user, "");
BOOST_CHECK_EQUAL(url.password, "");
BOOST_CHECK_EQUAL(url.port, 0);
BOOST_CHECK_EQUAL(url.protocol, "");
}
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
BOOST_AUTO_TEST_CASE(url_parse) {
{
Url url;
BOOST_CHECK(url.parse("localhost"));
BOOST_CHECK_EQUAL(url.host, "localhost");
BOOST_CHECK_EQUAL(url.port, 18002);
}
{
Url url;
BOOST_CHECK(url.parse("localhost:18003"));
BOOST_CHECK_EQUAL(url.host, "localhost");
BOOST_CHECK_EQUAL(url.port, 18003);
BOOST_CHECK_EQUAL(url.protocol, "caps");
}
{
Url url;
BOOST_CHECK(!url.parse("localhost:65536"));
BOOST_CHECK(!url.parse("localhost:-1"));
BOOST_CHECK(!url.parse("localhost:0"));
}
{
Url url;
BOOST_CHECK(url.parse("caps:gempa@localhost:18003"));
BOOST_CHECK_EQUAL(url.host, "localhost");
BOOST_CHECK_EQUAL(url.user, "caps");
BOOST_CHECK_EQUAL(url.password, "gempa");
BOOST_CHECK_EQUAL(url.port, 18003);
BOOST_CHECK_EQUAL(url.protocol, "caps");
}
{
Url url;
BOOST_CHECK(url.parse("capss://guest:guest@caps.gempa.de:18008"));
BOOST_CHECK_EQUAL(url.host, "caps.gempa.de");
BOOST_CHECK_EQUAL(url.user, "guest");
BOOST_CHECK_EQUAL(url.password, "guest");
BOOST_CHECK_EQUAL(url.port, 18008);
BOOST_CHECK_EQUAL(url.protocol, "capss");
}
}
//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
BOOST_AUTO_TEST_SUITE_END()

View File

@@ -17,7 +17,7 @@
#define SEISCOMP_TEST_MODULE gempa
#include <seiscomp3/unittest/unittests.h>
#include <seiscomp/unittest/unittests.h>
#include <gempa/caps/utils.h>