Skip to content

Commit

Permalink
use Expect for EOmalloc$EOof$EOallocated$EOread
Browse files Browse the repository at this point in the history
  • Loading branch information
asmirnov-backend committed Jan 26, 2025
1 parent 6c6cae8 commit a0b7456
Show file tree
Hide file tree
Showing 7 changed files with 248 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.eolang.Atom;
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.Expect;
import org.eolang.PhDefault;
import org.eolang.Phi;
import org.eolang.XmirObject;
Expand All @@ -58,9 +58,9 @@ public final class EOmalloc$EOof$EOallocated$EOread extends PhDefault implements
public Phi lambda() {
return new Data.ToPhi(
Heaps.INSTANCE.read(
new Dataized(this.take(Attr.RHO).take("id")).asNumber().intValue(),
new Dataized(this.take("offset")).asNumber().intValue(),
new Dataized(this.take("length")).asNumber().intValue()
new Expect.Int(Expect.at(this.take(Attr.RHO), "id")).it(),
new Expect.Int(Expect.at(this, "offset")).it(),
new Expect.Int(Expect.at(this, "length")).it()
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.eolang.AtVoid;
import org.eolang.Atom;
import org.eolang.Attr;
import org.eolang.Dataized;
import org.eolang.Expect;
import org.eolang.PhDefault;
import org.eolang.Phi;
Expand All @@ -56,16 +55,8 @@ public final class EOmalloc$EOof$EOallocated$EOresized extends PhDefault impleme
@Override
public Phi lambda() {
final Phi rho = this.take(Attr.RHO);
final int id = Expect.at(rho, "id")
.that(phi -> new Dataized(phi).asNumber())
.otherwise("must be a number")
.that(Double::intValue)
.it();
final int size = Expect.at(this, "new-size")
.that(phi -> new Dataized(phi).asNumber())
.otherwise("must be a number")
.that(Double::intValue)
.it();
final int id = new Expect.Int(Expect.at(rho, "id")).it();
final int size = new Expect.Int(Expect.at(this, "new-size")).it();
Heaps.INSTANCE.resize(id, size);
return rho;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.eolang.Atom;
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.Expect;
import org.eolang.PhDefault;
import org.eolang.Phi;
import org.eolang.XmirObject;
Expand All @@ -48,7 +48,7 @@ public final class EOmalloc$EOof$EOallocated$EOsize extends PhDefault implements
public Phi lambda() {
return new Data.ToPhi(
Heaps.INSTANCE.size(
new Dataized(this.take(Attr.RHO).take("id")).asNumber().intValue()
new Expect.Int(Expect.at(this.take(Attr.RHO), "id")).it()
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.Expect;
import org.eolang.PhDefault;
import org.eolang.Phi;
import org.eolang.XmirObject;
Expand All @@ -57,8 +58,8 @@ public final class EOmalloc$EOof$EOallocated$EOwrite extends PhDefault implement
@Override
public Phi lambda() {
Heaps.INSTANCE.write(
new Dataized(this.take(Attr.RHO).take("id")).asNumber().intValue(),
new Dataized(this.take("offset")).asNumber().intValue(),
new Expect.Int(Expect.at(this.take(Attr.RHO), "id")).it(),
new Expect.Int(Expect.at(this, "offset")).it(),
new Dataized(this.take("data")).take()
);
return new Data.ToPhi(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.Expect;
import org.eolang.PhDefault;
import org.eolang.Phi;
import org.eolang.XmirObject;
Expand All @@ -48,7 +49,7 @@ public final class EOmalloc$EOof$EOφ extends PhDefault implements Atom {
public Phi lambda() {
final Phi rho = this.take(Attr.RHO);
final int identifier = Heaps.INSTANCE.malloc(
this, new Dataized(rho.take("size")).asNumber().intValue()
this, new Expect.Int(Expect.at(rho, "size")).it()
);
final Phi res;
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2025 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

/*
* @checkstyle PackageNameCheck (4 lines)
* @checkstyle TrailingCommentCheck (3 lines)
*/
package EOorg.EOeolang;

import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Dataized;
import org.eolang.ExAbstract;
import org.eolang.PhWith;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

/**
* Test case for {@link EOmalloc$EOof$EOallocated$EOread}.
*
* @since 0.51.2
*/
@SuppressWarnings("PMD.AvoidDollarSigns")
final class EOmalloc$EOof$EOallocated$EOreadTest {

@Test
void throwsCorrectErrorForOffsetAttrNaN() {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
new PhWith(
new EOmalloc$EOof$EOallocated$EOread(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(42)
)
),
"offset",
new Data.ToPhi(true)
)
).take(),
"put TRUE in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'offset' attribute must be a number")
);
}

@Test
void throwsCorrectErrorForOffsetAttrNotAnInt() {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
new PhWith(
new EOmalloc$EOof$EOallocated$EOread(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(42)
)
),
"offset",
new Data.ToPhi(42.42)
)
).take(),
"put double in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'offset' attribute (42.42) must be an integer")
);
}

@Test
void throwsCorrectErrorForLengthAttrNaN() {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
new PhWith(
new PhWith(
new EOmalloc$EOof$EOallocated$EOread(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(42)
)
),
"offset",
new Data.ToPhi(42)
),
"length",
new Data.ToPhi(true)
)
).take(),
"put TRUE in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'length' attribute must be a number")
);
}

@Test
void throwsCorrectErrorForLengthAttrNotAnInt() {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
new PhWith(
new PhWith(
new EOmalloc$EOof$EOallocated$EOread(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(42)
)
),
"offset",
new Data.ToPhi(42)
),
"length",
new Data.ToPhi(42.42)
)
).take(),
"put double in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'length' attribute (42.42) must be an integer")
);
}

}
70 changes: 70 additions & 0 deletions eo-runtime/src/test/java/EOorg/EOeolang/EOmallocTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@
import org.eolang.PhDefault;
import org.eolang.PhWith;
import org.eolang.Phi;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

/**
* Test case for {@link EOmalloc}.
Expand Down Expand Up @@ -98,6 +102,58 @@ private static Phi allocated(final Phi obj, final Phi dummy) {
return malloc;
}

@ParameterizedTest
@ValueSource(classes = {
EOmalloc$EOof$EOallocated$EOread.class,
})
void throwsCorrectErrorForIdAttrNaN(final Class<?> cls) {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
(Phi) cls.getDeclaredConstructor().newInstance(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(true)
)
)
).take(),
"put TRUE in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'id' attribute must be a number")
);
}

@ParameterizedTest
@ValueSource(classes = {
EOmalloc$EOof$EOallocated$EOread.class,
})
void throwsCorrectErrorForIdAttrNotAnInt(final Class<?> cls) {
MatcherAssert.assertThat(
"the message in the error is correct",
Assertions.assertThrows(
ExAbstract.class,
() -> new Dataized(
new PhWith(
(Phi) cls.getDeclaredConstructor().newInstance(),
Attr.RHO,
new PhWith(
new EOmallocTest.IdDummy(),
"id",
new Data.ToPhi(42.42)
)
)
).take(),
"put double in int attr fails with a proper message that explains what happened"
).getMessage(),
Matchers.equalTo("the 'id' attribute (42.42) must be an integer")
);
}

/**
* Dummy.
* @since 0.37.0
Expand Down Expand Up @@ -129,6 +185,19 @@ private static class Dummy extends PhDefault {
}
}

/**
* Dummy with id attr.
* @since 0.51.2
*/
static class IdDummy extends PhDefault {
/**
* Ctor.
*/
IdDummy() {
this.add("id", new AtVoid("id"));
}
}

/**
* Dummy that throws an exception.
* @since 0.36.0
Expand Down Expand Up @@ -164,4 +233,5 @@ private static class ErrorDummy extends PhDefault {
);
}
}

}

0 comments on commit a0b7456

Please sign in to comment.